pinokiod 5.0.4 → 5.0.5

package/kernel/api/index.js

@@ -1498,9 +1498,14 @@ class Api {
 //    let keypath = path.resolve(this.kernel.homedir, "key.json")
 //    this.kernel.keys = (await this.loader.load(keypath)).resolved
 
-    // ensure gitconfig carries required defaults before any shell commands run
-    if (this.kernel.git && typeof this.kernel.git.ensureDefaults === "function") {
-      await this.kernel.git.ensureDefaults()
+    // ensure gitconfig defaults and clear stale git locks 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/git.js

@@ -105,6 +105,22 @@ 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")
+    try {
+      await fs.promises.access(lockPath, fs.constants.F_OK)
+    } catch (_) {
+      return
+    }
+    // best-effort: if no other git op is active, remove the stale lock
+    try {
+      await fs.promises.unlink(lockPath)
+    } catch (_) {
+      // ignore
+    }
+  }
   async findGitDirs(dir, results = []) {
     const entries = await fs.promises.readdir(dir, { withFileTypes: true });
     for (const entry of entries) {

package/package.json

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