npm - stashes - Versions diffs - 0.1.10 → 0.1.11 - Mend

stashes 0.1.10 → 0.1.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/cli.js +28 -4
package/dist/mcp.js +28 -4
package/dist/web/assets/{index-R4H2ja1O.js → index-CGt4isEz.js} +12 -12
package/dist/web/assets/{index-BjonyU1P.css → index-YiFrDapH.css} +1 -1
package/dist/web/index.html +2 -2
package/package.json +1 -1

package/dist/cli.js CHANGED Viewed

@@ -312,7 +312,29 @@ class WorktreeManager {
       await this.git.raw(["worktree", "prune"]);
     }
     logger.info("worktree", `creating pool preview: ${stashId}`, { branch, path: previewPath });
-    await this.git.raw(["worktree", "add", previewPath, branch]);
+    try {
+      await this.git.raw(["worktree", "add", previewPath, branch]);
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      if (msg.includes("is already used by worktree")) {
+        logger.warn("worktree", `branch ${branch} locked by stale worktree, cleaning up`);
+        const staleDir = join3(this.projectPath, ".stashes", "worktrees", stashId);
+        const legacyPreview = join3(this.projectPath, ".stashes", "preview");
+        for (const dir of [staleDir, legacyPreview]) {
+          if (existsSync3(dir)) {
+            try {
+              await this.git.raw(["worktree", "remove", "--force", dir]);
+            } catch {
+              rmSync(dir, { recursive: true, force: true });
+            }
+          }
+        }
+        await this.git.raw(["worktree", "prune"]);
+        await this.git.raw(["worktree", "add", previewPath, branch]);
+      } else {
+        throw err;
+      }
+    }
     this.symlinkDeps(previewPath);
     logger.info("worktree", `pool preview created: ${stashId}`);
     return previewPath;
@@ -1407,9 +1429,11 @@ function createWebSocketHandler(projectPath, userDevPort, appProxyPort) {
             break;
         }
       } catch (err) {
-        logger.error("ws", `handler failed for ${event.type}`, {
-          error: err instanceof Error ? err.message : String(err)
-        });
+        const errorMsg = err instanceof Error ? err.message : String(err);
+        logger.error("ws", `handler failed for ${event.type}`, { error: errorMsg });
+        if ("stashId" in event && event.stashId) {
+          broadcast({ type: "stash:error", stashId: event.stashId, error: errorMsg });
+        }
       }
     },
     close(ws) {

package/dist/mcp.js CHANGED Viewed

@@ -248,7 +248,29 @@ class WorktreeManager {
       await this.git.raw(["worktree", "prune"]);
     }
     logger.info("worktree", `creating pool preview: ${stashId}`, { branch, path: previewPath });
-    await this.git.raw(["worktree", "add", previewPath, branch]);
+    try {
+      await this.git.raw(["worktree", "add", previewPath, branch]);
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      if (msg.includes("is already used by worktree")) {
+        logger.warn("worktree", `branch ${branch} locked by stale worktree, cleaning up`);
+        const staleDir = join2(this.projectPath, ".stashes", "worktrees", stashId);
+        const legacyPreview = join2(this.projectPath, ".stashes", "preview");
+        for (const dir of [staleDir, legacyPreview]) {
+          if (existsSync2(dir)) {
+            try {
+              await this.git.raw(["worktree", "remove", "--force", dir]);
+            } catch {
+              rmSync(dir, { recursive: true, force: true });
+            }
+          }
+        }
+        await this.git.raw(["worktree", "prune"]);
+        await this.git.raw(["worktree", "add", previewPath, branch]);
+      } else {
+        throw err;
+      }
+    }
     this.symlinkDeps(previewPath);
     logger.info("worktree", `pool preview created: ${stashId}`);
     return previewPath;
@@ -1537,9 +1559,11 @@ function createWebSocketHandler(projectPath, userDevPort, appProxyPort) {
             break;
         }
       } catch (err) {
-        logger.error("ws", `handler failed for ${event.type}`, {
-          error: err instanceof Error ? err.message : String(err)
-        });
+        const errorMsg = err instanceof Error ? err.message : String(err);
+        logger.error("ws", `handler failed for ${event.type}`, { error: errorMsg });
+        if ("stashId" in event && event.stashId) {
+          broadcast({ type: "stash:error", stashId: event.stashId, error: errorMsg });
+        }
       }
     },
     close(ws) {