@bakapiano/ccsm 0.15.3 → 0.15.4

package/lib/workspace.js

@@ -95,8 +95,11 @@ function nextWorkspaceName(existing) {
   throw new Error('Could not allocate workspace name');
 }
 
-async function findOrCreateWorkspace({ workDir, repos, requireUnused = true }) {
-  const all = await listWorkspaces({ workDir, repos });
+async function findOrCreateWorkspace({ workDir, repos, busyPaths = [], requireUnused = true }) {
+  // Without busyPaths, every workspace looks free → find() always
+  // returns ws-1 → every new session piles into ws-1. Callers must
+  // pass the cwds of currently-running persisted sessions.
+  const all = await listWorkspaces({ workDir, repos, busyPaths });
   if (requireUnused) {
     const free = all.find((w) => !w.inUse);
     if (free) return { workspace: free, created: false };
@@ -104,7 +107,7 @@ async function findOrCreateWorkspace({ workDir, repos, requireUnused = true }) {
   const name = nextWorkspaceName(all);
   const wsPath = path.join(workDir, name);
   await ensureDir(wsPath);
-  const ws = await describeWorkspace(wsPath, repos, []);
+  const ws = await describeWorkspace(wsPath, repos, busyPaths);
   return { workspace: ws, created: true };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakapiano/ccsm",
-  "version": "0.15.3",
+  "version": "0.15.4",
   "description": "Claude Code Session Manager — Windows web UI to manage many concurrent claude sessions: live list, snapshot/restore, focus existing window, new session in an isolated workspace with repo clones",
   "license": "MIT",
   "main": "server.js",

package/server.js

@@ -652,9 +652,17 @@ app.post('/api/sessions/new', async (req, res) => {
       workspace = all.find((w) => w.name === req.body.workspace);
       if (!workspace) return fail(`workspace ${req.body.workspace} not found`);
     } else {
+      // Collect cwds of currently-running persisted sessions so
+      // findOrCreateWorkspace can flag those workspaces as in-use and
+      // skip past ws-1 when it's already occupied.
+      const running = await persistedSessions.loadAll();
+      const busyPaths = running
+        .filter((s) => s.status === 'running')
+        .map((s) => s.cwd);
       const r = await findOrCreateWorkspace({
         workDir: cfg.workDir,
         repos: cfg.repos,
+        busyPaths,
         requireUnused: true,
       });
       workspace = r.workspace;