pinokiod 5.0.5 → 5.0.7

package/kernel/api/index.js

@@ -1498,14 +1498,11 @@ class Api {
 //    let keypath = path.resolve(this.kernel.homedir, "key.json")
 //    this.kernel.keys = (await this.loader.load(keypath)).resolved
 
-    // ensure gitconfig defaults and clear stale git locks before any shell commands run
+    // ensure gitconfig defaults before any shell commands run
     if (this.kernel.git) {
       if (typeof this.kernel.git.ensureDefaults === "function") {
         await this.kernel.git.ensureDefaults()
       }
-      if (typeof this.kernel.git.clearStaleLock === "function") {
-        await this.kernel.git.clearStaleLock()
-      }
     }
     // init shell before running just to make sure the environment variables are fresh
     await this.kernel.shell.init()

package/kernel/bin/git.js

@@ -52,8 +52,8 @@ class Git {
   async uninstall(req, ondata) {
     await this.kernel.bin.exec({ message: "conda remove git gh" }, ondata)
   }
-  env() {
-    let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
+  env(cwd) {
+    const gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
     return {
       GIT_CONFIG_GLOBAL: gitconfig_path,
       GH_CONFIG_DIR: this.kernel.path("config/gh")

package/kernel/git.js

@@ -40,6 +40,16 @@ class Git {
       const dest = path.resolve(this.kernel.homedir, `scripts/git/${name}.json`)
       return fs.promises.copyFile(src, dest)
     }))
+
+    // best-effort: clear any stale index.lock files across all known repos at startup
+    try {
+      const repos = await this.repos(this.kernel.path("api"))
+      for (const repo of repos) {
+        if (repo && repo.dir) {
+          await this.clearStaleLock(repo.dir)
+        }
+      }
+    } catch (_) {}
   }
   async ensureDefaults(homeOverride) {
     const home = homeOverride || this.kernel.homedir
@@ -105,10 +115,9 @@ class Git {
       await fs.promises.writeFile(gitconfigPath, ini.stringify(config))
     }
   }
-  async clearStaleLock(homeOverride) {
-    const home = homeOverride || this.kernel.homedir
-    if (!home) return
-    const lockPath = path.resolve(home, ".git", "index.lock")
+  async clearStaleLock(repoPath) {
+    if (!repoPath) return
+    const lockPath = path.resolve(repoPath, ".git", "index.lock")
     try {
       await fs.promises.access(lockPath, fs.constants.F_OK)
     } catch (_) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "5.0.5",
+  "version": "5.0.7",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -62,10 +62,22 @@ const Info = require("../kernel/info")
 
 const Setup = require("../kernel/bin/setup")
 
-function normalize(str) {
-  if (!str) return '';
-  return (str.endsWith('\n') ? str : str + '\n').replace(/\r\n/g, '\n');
-}
+    function normalize(str) {
+      if (!str) return '';
+      return (str.endsWith('\n') ? str : str + '\n').replace(/\r\n/g, '\n');
+    }
+
+    this.gitEnv = (repoPath) => {
+      const gitBin = this.kernel.bin && this.kernel.bin.git ? this.kernel.bin.git : null
+      if (gitBin && typeof gitBin.env === 'function') {
+        const env = gitBin.env(repoPath)
+        if (this.kernel.git && typeof this.kernel.git.clearStaleLock === "function" && repoPath) {
+          this.kernel.git.clearStaleLock(repoPath).catch(() => {})
+        }
+        return env
+      }
+      return {}
+    }
 
 class Server {
   constructor(config) {