@serviceme/devtools-core 0.3.3 → 0.4.0

package/dist/index.js

@@ -59,6 +59,7 @@ __export(src_exports, {
   EnvironmentInspector: () => EnvironmentInspector,
   FsIdentityFileBackend: () => FsIdentityFileBackend,
   FsToolboxFileBackend: () => FsToolboxFileBackend,
+  GIT_PROXY_PATH_SUFFIX: () => GIT_PROXY_PATH_SUFFIX,
   GitClient: () => GitClient,
   GitError: () => GitError,
   GitHubAuthProvider: () => GitHubAuthProvider,
@@ -125,6 +126,7 @@ __export(src_exports, {
   bootstrapPhase5Placeholders: () => bootstrapPhase5Placeholders,
   buildDefaultReposFile: () => buildDefaultReposFile,
   buildGitHubLocalEmail: () => buildGitHubLocalEmail,
+  buildGitProxyBase: () => buildGitProxyBase,
   buildSignedHeaders: () => buildSignedHeaders,
   copilotDoctor: () => copilotDoctor,
   copilotPrompt: () => copilotPrompt,
@@ -2185,6 +2187,7 @@ var FILE_MODE = 384;
 var LOCK_DIR_MODE = 448;
 var DEFAULT_LOCK_TIMEOUT_MS = 5e3;
 var DEFAULT_LOCK_RETRY_MS = 25;
+var LOCK_STALE_GRACE_MS = 200;
 var TMP_SUFFIX = ".tmp";
 var FsIdentityFileBackend = class {
   async exists(filePath) {
@@ -2289,14 +2292,20 @@ var FileLock = class {
     }
   }
   async isStaleLock() {
+    let pidStr;
     try {
-      const pidStr = await fsp.readFile(this.pidFilePath, "utf8");
-      const pid = Number.parseInt(pidStr.trim(), 10);
-      if (!Number.isFinite(pid) || pid <= 0) return true;
-      return !isProcessAlive(pid);
+      pidStr = await fsp.readFile(this.pidFilePath, "utf8");
     } catch {
-      return true;
+      try {
+        const stat7 = await fsp.stat(this.dirPath);
+        return Date.now() - stat7.mtimeMs > LOCK_STALE_GRACE_MS;
+      } catch {
+        return false;
+      }
     }
+    const pid = Number.parseInt(pidStr.trim(), 10);
+    if (!Number.isFinite(pid) || pid <= 0) return true;
+    return !isProcessAlive(pid);
   }
   async release() {
     if (!this.acquired) return;
@@ -2596,9 +2605,9 @@ var DraftsStore = class {
     const dir = resolveDraftDir(kind, id);
     const manifestFilename = kind === "skill" ? "SKILL.md" : "AGENT.md";
     const manifestPath = path6.join(dir, manifestFilename);
-    let stat5;
+    let stat7;
     try {
-      stat5 = await fs4.stat(manifestPath);
+      stat7 = await fs4.stat(manifestPath);
     } catch {
       return null;
     }
@@ -2617,7 +2626,7 @@ var DraftsStore = class {
       dir,
       name,
       description,
-      modifiedAt: stat5.mtime.toISOString()
+      modifiedAt: stat7.mtime.toISOString()
     };
   }
   /** Single draft detail (summary + all files). Throws when missing. */
@@ -2733,10 +2742,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(
@@ -2783,11 +2815,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);
@@ -2826,11 +2856,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();
@@ -2863,11 +2891,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 {
@@ -3054,7 +3080,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);
@@ -3090,7 +3118,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 }
@@ -3144,7 +3174,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);
     }
@@ -3159,7 +3191,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();
   }
@@ -3206,7 +3240,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;
   }
@@ -3218,6 +3256,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
 var fs5 = __toESM(require("fs/promises"));
@@ -4852,13 +4894,13 @@ var PidManager = class {
     fs13.writeFileSync(this.pidPath, String(pid), "utf-8");
   }
   readPid() {
-    let stat5;
+    let stat7;
     try {
-      stat5 = fs13.statSync(this.pidPath);
+      stat7 = fs13.statSync(this.pidPath);
     } catch {
       return null;
     }
-    if (!stat5.isFile()) return null;
+    if (!stat7.isFile()) return null;
     const raw = fs13.readFileSync(this.pidPath, "utf-8").trim();
     const pid = Number.parseInt(raw, 10);
     return Number.isNaN(pid) ? null : pid;
@@ -6989,6 +7031,7 @@ var FILE_MODE2 = 384;
 var LOCK_DIR_MODE2 = 448;
 var DEFAULT_LOCK_TIMEOUT_MS2 = 5e3;
 var DEFAULT_LOCK_RETRY_MS2 = 25;
+var LOCK_STALE_GRACE_MS2 = 200;
 var TMP_SUFFIX2 = ".tmp";
 var WORKSPACE_TOOLBOX_RELATIVE_PATH = path25.join(".github", ".serviceme-toolbox.json");
 var LEGACY_WORKSPACE_TOOLBOX_FILENAME = ".ms-devtools-toolbox.json";
@@ -7007,6 +7050,9 @@ async function migrateLegacyWorkspaceToolboxFile(filePath) {
   }
 }
 var FsToolboxFileBackend = class {
+  constructor() {
+    this.maxBackupCount = 5;
+  }
   async exists(filePath) {
     try {
       await fsp2.access(filePath);
@@ -7035,9 +7081,28 @@ var FsToolboxFileBackend = class {
     try {
       const backupPath = `${filePath}.corrupted.${Date.now()}.bak`;
       await fsp2.copyFile(filePath, backupPath);
+      await this.purgeExcessBackups(filePath);
     } catch {
     }
   }
+  async purgeExcessBackups(filePath) {
+    const dir = path25.dirname(filePath);
+    const base = path25.basename(filePath);
+    let entries;
+    try {
+      entries = await fsp2.readdir(dir);
+    } catch {
+      return;
+    }
+    const backups = entries.filter((n) => n.startsWith(base) && n.endsWith(".bak")).map((n) => ({ name: n, filePath: path25.join(dir, n) })).sort((a, b) => {
+      return a.name.localeCompare(b.name);
+    });
+    const excess = backups.length - this.maxBackupCount;
+    if (excess <= 0) return;
+    await Promise.all(
+      backups.slice(0, excess).map((b) => fsp2.rm(b.filePath).catch(() => void 0))
+    );
+  }
   async write(filePath, payload) {
     await fsp2.mkdir(path25.dirname(filePath), { recursive: true });
     const tmpPath = `${filePath}${TMP_SUFFIX2}`;
@@ -7110,14 +7175,20 @@ var ToolboxFileLock = class {
     }
   }
   async isStaleLock() {
+    let pidStr;
     try {
-      const pidStr = await fsp2.readFile(this.pidFilePath, "utf8");
-      const pid = Number.parseInt(pidStr.trim(), 10);
-      if (!Number.isFinite(pid) || pid <= 0) return true;
-      return !isProcessAlive2(pid);
+      pidStr = await fsp2.readFile(this.pidFilePath, "utf8");
     } catch {
-      return true;
+      try {
+        const stat7 = await fsp2.stat(this.dirPath);
+        return Date.now() - stat7.mtimeMs > LOCK_STALE_GRACE_MS2;
+      } catch {
+        return false;
+      }
     }
+    const pid = Number.parseInt(pidStr.trim(), 10);
+    if (!Number.isFinite(pid) || pid <= 0) return true;
+    return !isProcessAlive2(pid);
   }
   async release() {
     if (!this.acquired) return;
@@ -7398,6 +7469,7 @@ var ToolboxCore = class {
   EnvironmentInspector,
   FsIdentityFileBackend,
   FsToolboxFileBackend,
+  GIT_PROXY_PATH_SUFFIX,
   GitClient,
   GitError,
   GitHubAuthProvider,
@@ -7464,6 +7536,7 @@ var ToolboxCore = class {
   bootstrapPhase5Placeholders,
   buildDefaultReposFile,
   buildGitHubLocalEmail,
+  buildGitProxyBase,
   buildSignedHeaders,
   copilotDoctor,
   copilotPrompt,