@saadnvd1/agent-os 0.3.467 → 0.3.470

package/lib/worktrees.ts

@@ -14,6 +14,14 @@ import {
 } from "./git";
 import { installWorktreeHooks } from "./worktree-hooks";
 import { gitResult, isGitError, worktreeList } from "./git-exec";
+import {
+  markRemoving,
+  removalKey,
+  removalRunning,
+  removalSettled,
+  removals,
+  unmarkRemoving,
+} from "./worktree-removal";
 
 const git = (cwd: string, args: string[], timeout: number) =>
   gitResult(cwd, args, { timeout });
@@ -252,28 +260,10 @@ async function undoFailedAdd(
     await quiet(["branch", "-D", "--", branch]);
 }
 
-// Removals in progress, by path, with the branch each one's worktree was
-// on. `git worktree remove` takes seconds on a tree with cloned
-// dependencies, and a tree read halfway through looks like every file it
-// already deleted is an uncommitted change.
-const removing = new Map<
-  string,
-  { done: Promise<void>; branch: Promise<string | null> }
->();
-
-const removalKey = (p: string) => path.resolve(resolvePath(p));
-
-// Resolves once no removal of this worktree is running.
-export async function removalSettled(worktreePath: string): Promise<void> {
-  await removing.get(removalKey(worktreePath))?.done.catch(() => {});
-}
-
-export const removalRunning = (worktreePath: string) =>
-  removing.has(removalKey(worktreePath));
-
 /**
  * Delete a worktree and optionally its branch. A second call while one is
- * running joins it, and still deletes the branch when it asks to.
+ * running joins it, and still deletes the branch when it asks to; one
+ * another process is running is waited for first.
  */
 export function deleteWorktree(
   worktreePath: string,
@@ -282,22 +272,35 @@ export function deleteWorktree(
 ): Promise<void> {
   const key = removalKey(worktreePath);
   const repo = resolvePath(projectPath);
-  const running = removing.get(key);
+  const running = removals.get(key);
   if (running)
     return deleteBranch
       ? running.done.then(async () => dropBranch(repo, await running.branch))
       : running.done;
+  // One another process is running goes first, and keeps its own marker.
+  const foreign = removalRunning(key)
+    ? removalSettled(key, undefined, { foreignOnly: true })
+    : null;
   // Read before anything is removed.
-  const branch = git(key, ["rev-parse", "--abbrev-ref", "HEAD"], 5000).then(
-    ({ stdout }) => stdout.trim() || null,
-    () => null
-  );
+  const branch = (async () => {
+    await foreign;
+    return git(key, ["rev-parse", "--abbrev-ref", "HEAD"], 5000).then(
+      ({ stdout }) => stdout.trim() || null,
+      () => null
+    );
+  })();
+  let marker: string | null = null;
   const done = (async () => {
     await branch;
+    // Before anything is removed, so no reader catches it half-deleted.
+    marker = markRemoving(key);
     await removeWorktree(key, repo);
     if (deleteBranch) await dropBranch(repo, await branch);
-  })().finally(() => removing.delete(key));
-  removing.set(key, { done, branch });
+  })().finally(() => {
+    removals.delete(key);
+    if (marker) unmarkRemoving(key, marker);
+  });
+  removals.set(key, { done, branch });
   return done;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saadnvd1/agent-os",
-  "version": "0.3.467",
+  "version": "0.3.470",
   "description": "Self-hosted web UI for managing Claude Code sessions",
   "bin": {
     "agent-os": "scripts/agent-os"

package/stores/addProject.ts

@@ -1,15 +1,24 @@
 import { proxy } from "valtio";
+import { sidebarUi } from "./sidebarUi";
 
 export type AddProjectKind = "folder" | "clone" | "name";
 
-// The add-project form on show, once a machine and a way are picked.
+// The add-project form on show, once a machine and a way are picked. It
+// adds to the workspace the sidebar is on, changeable in the form.
 export const addProjectUi = proxy<{
-  open: { kind: AddProjectKind; hostId: string } | null;
+  open: {
+    kind: AddProjectKind;
+    hostId: string;
+    workspaceId: string | null;
+  } | null;
 }>({ open: null });
 
 export const addProjectActions = {
   show: (kind: AddProjectKind, hostId: string) => {
-    addProjectUi.open = { kind, hostId };
+    addProjectUi.open = { kind, hostId, workspaceId: sidebarUi.workspaceId };
+  },
+  setWorkspace: (workspaceId: string | null) => {
+    if (addProjectUi.open) addProjectUi.open.workspaceId = workspaceId;
   },
   close: () => {
     addProjectUi.open = null;