@serviceme/devtools-core 0.3.3 → 0.3.4

package/dist/index.mjs

@@ -2545,10 +2545,33 @@ var POSIX_LOGIN_SHELL_FALLBACK_TOOLS = /* @__PURE__ */ new Set([
 ]);
 var ERROR_CODE_NOT_FOUND = 127;
 var ERROR_CODE_TIMEOUT = "ETIMEDOUT";
+var NVM_FALLBACK_DIRS = [
+  "/opt/homebrew/opt/nvm",
+  "/usr/local/opt/nvm",
+  "$HOME/.nvm"
+];
+function resolveUserLoginShell(platform3, envShell) {
+  const shell = envShell?.trim();
+  if (shell && shell.length > 0) {
+    return shell;
+  }
+  return platform3 === "darwin" ? "/bin/zsh" : "/bin/bash";
+}
+function buildNvmSourcingSnippet() {
+  const fallbackList = NVM_FALLBACK_DIRS.map((dir) => `"${dir}"`).join(" ");
+  return `for d in $NVM_DIR ${fallbackList}; do [ -n "$d" ] && [ -s "$d/nvm.sh" ] && export NVM_DIR="$d" && . "$d/nvm.sh" && break; done`;
+}
+function posixLoginShellArgs(platform3, envShell, command) {
+  return {
+    command: resolveUserLoginShell(platform3, envShell),
+    args: ["-lc", `${buildNvmSourcingSnippet()}; ${command}`]
+  };
+}
 var EnvironmentInspector = class {
   constructor(options = {}) {
     this.runCommandFn = options.runCommand ?? runCommand;
     this.platform = options.platform ?? process.platform;
+    this.shell = options.shell ?? process.env.SHELL;
   }
   async checkEnvironment() {
     const results = await Promise.all(
@@ -2595,11 +2618,9 @@ var EnvironmentInspector = class {
   }
   async getToolPathFromLoginShell(toolName) {
     try {
-      const result = await this.runCommandFn("/bin/bash", {
-        args: [
-          "-lc",
-          'export NVM_DIR="$HOME/.nvm"; [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"; command -v ' + toolName
-        ],
+      const spawnArgs = posixLoginShellArgs(this.platform, this.shell, `command -v ${toolName}`);
+      const result = await this.runCommandFn(spawnArgs.command, {
+        args: spawnArgs.args,
         timeoutMs: this.getToolTimeout(toolName)
       });
       return result.stdout.split(/\r?\n/).map((line) => line.trim()).find((line) => line.length > 0);
@@ -2638,11 +2659,9 @@ var EnvironmentInspector = class {
       if (!this.shouldUsePosixLoginShellFallback(toolName)) {
         throw error;
       }
-      const fallbackResult = await this.runCommandFn("/bin/bash", {
-        args: [
-          "-lc",
-          `export NVM_DIR="$HOME/.nvm"; [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"; ${toolName} --version`
-        ],
+      const fallbackArgs = posixLoginShellArgs(this.platform, this.shell, `${toolName} --version`);
+      const fallbackResult = await this.runCommandFn(fallbackArgs.command, {
+        args: fallbackArgs.args,
         timeoutMs: this.getToolTimeout(toolName)
       });
       const fallbackOutput = (fallbackResult.stdout || fallbackResult.stderr).trim();
@@ -2675,11 +2694,9 @@ var EnvironmentInspector = class {
       }
     }
     try {
-      const result = await this.runCommandFn("/bin/bash", {
-        args: [
-          "-lc",
-          'export NVM_DIR="$HOME/.nvm"; [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"; nvm --version'
-        ],
+      const nvmArgs = posixLoginShellArgs(this.platform, this.shell, "nvm --version");
+      const result = await this.runCommandFn(nvmArgs.command, {
+        args: nvmArgs.args,
         timeoutMs: this.getToolTimeout("nvm")
       });
       return {
@@ -2866,7 +2883,9 @@ var GitClient = class {
     }
     const targetUrl = useProxy ? remoteUrl : originalUrl ?? remoteUrl;
     const proxyUrl = this.rewriteRemoteUrl(repoId, targetUrl, useProxy);
-    await this.runOrThrow(["remote", "set-url", "origin", proxyUrl], { cwd: localPath });
+    await this.runOrThrow(["remote", "set-url", "origin", proxyUrl], {
+      cwd: localPath
+    });
     const before = await this.safeRevParse(localPath);
     await this.runOrThrow(["fetch", "origin"], { cwd: localPath });
     const after = await this.safeRevParse(localPath);
@@ -2902,7 +2921,9 @@ var GitClient = class {
       throw new Error(`no 'origin' remote configured at ${localPath}`);
     }
     const proxyUrl = this.rewriteRemoteUrl(repoId, remoteUrl, useProxy);
-    await this.runOrThrow(["remote", "set-url", "origin", proxyUrl], { cwd: localPath });
+    await this.runOrThrow(["remote", "set-url", "origin", proxyUrl], {
+      cwd: localPath
+    });
     const result = await this.spawner.spawn(
       ["push", "origin", `refs/heads/${branch}:refs/heads/${branch}`],
       { cwd: localPath }
@@ -2956,7 +2977,9 @@ var GitClient = class {
     return { commitSha: sha };
   }
   async runOrThrow(args, opts) {
-    const result = await this.spawner.spawn(args, { cwd: opts.cwd ?? process.cwd() });
+    const result = await this.spawner.spawn(args, {
+      cwd: opts.cwd ?? process.cwd()
+    });
     if (result.code !== 0) {
       throw new GitError(args, result);
     }
@@ -2971,7 +2994,9 @@ var GitClient = class {
     return url.length > 0 ? url : void 0;
   }
   async safeRevParse(localPath) {
-    const result = await this.spawner.spawn(["rev-parse", "HEAD"], { cwd: localPath });
+    const result = await this.spawner.spawn(["rev-parse", "HEAD"], {
+      cwd: localPath
+    });
     if (result.code !== 0) return "";
     return result.stdout.trim();
   }
@@ -3018,7 +3043,11 @@ var StubGitSpawner = class {
     this.calls.push({ args, cwd: opts.cwd });
     const next = this.script.shift();
     if (!next) {
-      return { stdout: "", stderr: `stub: no scripted response for ${args.join(" ")}`, code: 1 };
+      return {
+        stdout: "",
+        stderr: `stub: no scripted response for ${args.join(" ")}`,
+        code: 1
+      };
     }
     return next;
   }
@@ -3030,6 +3059,10 @@ function toFileUrl(absolutePath) {
   }
   return `file://${normalized}`;
 }
+var GIT_PROXY_PATH_SUFFIX = "/git-proxy";
+function buildGitProxyBase(serverBaseUrl) {
+  return `${serverBaseUrl.replace(/\/+$/, "")}${GIT_PROXY_PATH_SUFFIX}`;
+}
 
 // src/image/imageTools.ts
 import * as fs5 from "fs/promises";
@@ -7222,6 +7255,7 @@ export {
   EnvironmentInspector,
   FsIdentityFileBackend,
   FsToolboxFileBackend,
+  GIT_PROXY_PATH_SUFFIX,
   GitClient,
   GitError,
   GitHubAuthProvider,
@@ -7288,6 +7322,7 @@ export {
   bootstrapPhase5Placeholders,
   buildDefaultReposFile,
   buildGitHubLocalEmail,
+  buildGitProxyBase,
   buildSignedHeaders,
   copilotDoctor,
   copilotPrompt,