@almadar/workspace 0.10.0 → 0.11.0

package/dist/index.js

@@ -1,6 +1,7 @@
 import path2 from 'path';
-import fs from 'fs';
+import fs, { existsSync } from 'fs';
 import { execFile } from 'child_process';
+import dugite from 'dugite';
 import { randomBytes, createHash } from 'crypto';
 import { EmbeddingClient } from '@almadar/llm';
 import os from 'os';
@@ -380,7 +381,10 @@ function createProjectOrbTemplate(projectName, appId) {
 function serializeJson(value) {
   return JSON.stringify(value, null, 2);
 }
-var GIT_BINARY = process.env.ALMADAR_GIT_BINARY || "git";
+var { gitLocation: BUNDLED_GIT, env: BUNDLED_GIT_ENV } = dugite.setupEnvironment({});
+var USE_BUNDLED = !process.env.ALMADAR_GIT_BINARY && existsSync(BUNDLED_GIT);
+var GIT_BINARY = process.env.ALMADAR_GIT_BINARY || (USE_BUNDLED ? BUNDLED_GIT : "git");
+var GIT_ENV = USE_BUNDLED ? { ...process.env, ...BUNDLED_GIT_ENV } : process.env;
 var GitClient = class {
   constructor(cwd, backend) {
     this.cwd = cwd;
@@ -506,7 +510,7 @@ var GitClient = class {
 };
 function execGit(args, cwd) {
   return new Promise((resolve, reject) => {
-    execFile(GIT_BINARY, args, { cwd, maxBuffer: 64 * 1024 * 1024 }, (err, stdout, stderr) => {
+    execFile(GIT_BINARY, args, { cwd, env: GIT_ENV, maxBuffer: 64 * 1024 * 1024 }, (err, stdout, stderr) => {
       if (err) {
         const message = stderr?.trim() || stdout?.trim() || err.message;
         reject(new Error(`git ${args[0]}: ${message}`));
@@ -2209,10 +2213,14 @@ var WorkspaceServiceImpl = class {
       await this.backend.rm(cloneDir, { recursive: true }).catch(() => {
       });
       await this.git.cloneBundle(bundlePath, cloneDir);
-      await this.backend.rm(this.workDir, { recursive: true });
-      await this.backend.rename(cloneDir, this.workDir);
+      const dotGit = path2.join(this.workDir, ".git");
+      await this.backend.rm(dotGit, { recursive: true }).catch(() => {
+      });
+      await this.backend.rename(path2.join(cloneDir, ".git"), dotGit);
       return true;
     } finally {
+      await this.backend.rm(cloneDir, { recursive: true }).catch(() => {
+      });
       await this.backend.rm(bundlePath).catch(() => {
       });
     }
@@ -2373,7 +2381,11 @@ async function openWorkspaceInternal(opts) {
   }
   let git;
   if (!bare && opts.backend !== "memory") {
-    git = await ensureGitInit(backend, resolved.workDir);
+    try {
+      git = await ensureGitInit(backend, resolved.workDir);
+    } catch {
+      git = void 0;
+    }
   }
   const service = new WorkspaceServiceImpl({
     workDir: resolved.workDir,