@bakapiano/ccsm 0.22.6 → 0.22.8

package/lib/folders.js

@@ -1,124 +1,124 @@
-'use strict';
-
-// User-curated folders. Sessions reference these by id. Order is
-// user-controlled (drag-reorder in sidebar). The store is a flat list
-// in $DATA_DIR/folders.json:
-//   [{ id, name, order, createdAt }]
-//
-// Top-level "Unsorted" is implicit — sessions with folderId === null
-// render under it. The user can't delete or rename it; we just synthesise
-// the bucket in the frontend.
-
-const path = require('node:path');
-const fs = require('node:fs/promises');
-const { DATA_DIR } = require('./config');
-const { atomicWriteJson, withFileLock } = require('./atomicJson');
-
-const FILE = path.join(DATA_DIR, 'folders.json');
-
-// Sentinel for the synthetic "Unsorted" folder. Sessions with
-// folderId === null render under it. We always materialize it in the
-// returned list so the sidebar can drag-reorder it like a real folder,
-// but create/update/delete refuse to touch it.
-const UNSORTED_ID = 'unsorted';
-function unsortedDefault(order) {
-  return { id: UNSORTED_ID, name: 'Unsorted', order, builtin: true };
-}
-
-async function loadAll() {
-  let list = [];
-  try {
-    const raw = await fs.readFile(FILE, 'utf8');
-    const j = JSON.parse(raw);
-    if (Array.isArray(j)) list = j;
-  } catch (e) {
-    if (e.code !== 'ENOENT') throw e;
-  }
-  // Ensure the synthetic Unsorted entry is present. New install: append
-  // at the end. Existing install pre-Unsorted-draggable: same.
-  if (!list.find((f) => f.id === UNSORTED_ID)) {
-    list = list.concat(unsortedDefault(list.length));
-  }
-  return list;
-}
-
-async function saveAll(list) {
-  await atomicWriteJson(FILE, list);
-}
-
-function genId() {
-  return 'folder-' + Date.now().toString(36) + '-' + Math.random().toString(36).slice(2, 8);
-}
-
-async function create({ name }) {
-  if (!name || typeof name !== 'string') throw new Error('name required');
-  return withFileLock(FILE, async () => {
-    const list = await loadAll();
-    const entry = {
-      id: genId(),
-      name: name.trim(),
-      order: list.length,
-      createdAt: Date.now(),
-    };
-    list.push(entry);
-    await saveAll(list);
-    return entry;
-  });
-}
-
-async function update(id, patch) {
-  if (id === UNSORTED_ID && typeof patch.name === 'string') {
-    throw new Error('cannot rename the Unsorted bucket');
-  }
-  return withFileLock(FILE, async () => {
-    const list = await loadAll();
-    const idx = list.findIndex((f) => f.id === id);
-    if (idx < 0) return null;
-    // Allow rename + reorder, ignore other keys.
-    const allowed = {};
-    if (id !== UNSORTED_ID && typeof patch.name === 'string') allowed.name = patch.name.trim();
-    if (typeof patch.order === 'number') allowed.order = patch.order;
-    list[idx] = { ...list[idx], ...allowed };
-    await saveAll(list);
-    return list[idx];
-  });
-}
-
-async function remove(id) {
-  if (id === UNSORTED_ID) throw new Error('cannot delete the Unsorted bucket');
-  return withFileLock(FILE, async () => {
-    const list = await loadAll();
-    const idx = list.findIndex((f) => f.id === id);
-    if (idx < 0) return false;
-    list.splice(idx, 1);
-    await saveAll(list);
-    return true;
-  });
-}
-
-async function reorder(idsInOrder) {
-  if (!Array.isArray(idsInOrder)) throw new Error('idsInOrder must be array');
-  return withFileLock(FILE, async () => {
-    const list = await loadAll();
-    const byId = new Map(list.map((f) => [f.id, f]));
-    const next = [];
-    idsInOrder.forEach((id, i) => {
-      const f = byId.get(id);
-      if (f) {
-        f.order = i;
-        next.push(f);
-        byId.delete(id);
-      }
-    });
-    // Append any folders not mentioned in the new order, preserving original
-    // relative order. Prevents accidentally dropping folders.
-    for (const f of byId.values()) {
-      f.order = next.length;
-      next.push(f);
-    }
-    await saveAll(next);
-    return next;
-  });
-}
-
-module.exports = { loadAll, create, update, remove, reorder, FILE };
+'use strict';
+
+// User-curated folders. Sessions reference these by id. Order is
+// user-controlled (drag-reorder in sidebar). The store is a flat list
+// in $DATA_DIR/folders.json:
+//   [{ id, name, order, createdAt }]
+//
+// Top-level "Unsorted" is implicit — sessions with folderId === null
+// render under it. The user can't delete or rename it; we just synthesise
+// the bucket in the frontend.
+
+const path = require('node:path');
+const fs = require('node:fs/promises');
+const { DATA_DIR } = require('./config');
+const { atomicWriteJson, withFileLock } = require('./atomicJson');
+
+const FILE = path.join(DATA_DIR, 'folders.json');
+
+// Sentinel for the synthetic "Unsorted" folder. Sessions with
+// folderId === null render under it. We always materialize it in the
+// returned list so the sidebar can drag-reorder it like a real folder,
+// but create/update/delete refuse to touch it.
+const UNSORTED_ID = 'unsorted';
+function unsortedDefault(order) {
+  return { id: UNSORTED_ID, name: 'Unsorted', order, builtin: true };
+}
+
+async function loadAll() {
+  let list = [];
+  try {
+    const raw = await fs.readFile(FILE, 'utf8');
+    const j = JSON.parse(raw);
+    if (Array.isArray(j)) list = j;
+  } catch (e) {
+    if (e.code !== 'ENOENT') throw e;
+  }
+  // Ensure the synthetic Unsorted entry is present. New install: append
+  // at the end. Existing install pre-Unsorted-draggable: same.
+  if (!list.find((f) => f.id === UNSORTED_ID)) {
+    list = list.concat(unsortedDefault(list.length));
+  }
+  return list;
+}
+
+async function saveAll(list) {
+  await atomicWriteJson(FILE, list);
+}
+
+function genId() {
+  return 'folder-' + Date.now().toString(36) + '-' + Math.random().toString(36).slice(2, 8);
+}
+
+async function create({ name }) {
+  if (!name || typeof name !== 'string') throw new Error('name required');
+  return withFileLock(FILE, async () => {
+    const list = await loadAll();
+    const entry = {
+      id: genId(),
+      name: name.trim(),
+      order: list.length,
+      createdAt: Date.now(),
+    };
+    list.push(entry);
+    await saveAll(list);
+    return entry;
+  });
+}
+
+async function update(id, patch) {
+  if (id === UNSORTED_ID && typeof patch.name === 'string') {
+    throw new Error('cannot rename the Unsorted bucket');
+  }
+  return withFileLock(FILE, async () => {
+    const list = await loadAll();
+    const idx = list.findIndex((f) => f.id === id);
+    if (idx < 0) return null;
+    // Allow rename + reorder, ignore other keys.
+    const allowed = {};
+    if (id !== UNSORTED_ID && typeof patch.name === 'string') allowed.name = patch.name.trim();
+    if (typeof patch.order === 'number') allowed.order = patch.order;
+    list[idx] = { ...list[idx], ...allowed };
+    await saveAll(list);
+    return list[idx];
+  });
+}
+
+async function remove(id) {
+  if (id === UNSORTED_ID) throw new Error('cannot delete the Unsorted bucket');
+  return withFileLock(FILE, async () => {
+    const list = await loadAll();
+    const idx = list.findIndex((f) => f.id === id);
+    if (idx < 0) return false;
+    list.splice(idx, 1);
+    await saveAll(list);
+    return true;
+  });
+}
+
+async function reorder(idsInOrder) {
+  if (!Array.isArray(idsInOrder)) throw new Error('idsInOrder must be array');
+  return withFileLock(FILE, async () => {
+    const list = await loadAll();
+    const byId = new Map(list.map((f) => [f.id, f]));
+    const next = [];
+    idsInOrder.forEach((id, i) => {
+      const f = byId.get(id);
+      if (f) {
+        f.order = i;
+        next.push(f);
+        byId.delete(id);
+      }
+    });
+    // Append any folders not mentioned in the new order, preserving original
+    // relative order. Prevents accidentally dropping folders.
+    for (const f of byId.values()) {
+      f.order = next.length;
+      next.push(f);
+    }
+    await saveAll(next);
+    return next;
+  });
+}
+
+module.exports = { loadAll, create, update, remove, reorder, FILE };

package/lib/persistedSessions.js

@@ -1,148 +1,188 @@
-'use strict';
-
-// ccsm-owned session records. Replaces the old "scan ~/.claude/sessions/
-// + tasklist" path entirely: we no longer try to enumerate every claude
-// process on the machine. Instead, every session ccsm starts (via the
-// web terminal) gets recorded here, and the user organises them in
-// folders.
-//
-// Each entry:
-//   {
-//     id: 'sess-...',          // ccsm's session id (matches webTerminal id)
-//     cliId: 'claude',         // which CLI from config.clis
-//     cwd: '...',              // absolute workspace path
-//     workspace: 'ws-3',       // basename of cwd (display)
-//     title: '',               // user-edited label (Configure / sidebar tree)
-//     folderId: null,          // nullable; null = "Unsorted" top-level
-//     repos: ['foo','bar'],    // names of repos cloned into cwd at launch
-//     createdAt: 1234,
-//     lastActiveAt: 1234,      // updated on attach/input; drives sort
-//     status: 'running'|'exited',
-//     exitedAt: null,
+'use strict';
+
+// ccsm-owned session records. Replaces the old "scan ~/.claude/sessions/
+// + tasklist" path entirely: we no longer try to enumerate every claude
+// process on the machine. Instead, every session ccsm starts (via the
+// web terminal) gets recorded here, and the user organises them in
+// folders.
+//
+// Each entry:
+//   {
+//     id: 'sess-...',          // ccsm's session id (matches webTerminal id)
+//     cliId: 'claude',         // which CLI from config.clis
+//     cwd: '...',              // absolute launch path (workspace or repo)
+//     workspace: 'ws-3',       // workspace display name
+//     title: '',               // user-edited label (Configure / sidebar tree)
+//     folderId: null,          // nullable; null = "Unsorted" top-level
+//     repos: ['foo','bar'],    // selected repo names cloned at launch
+//     createdAt: 1234,
+//     lastActiveAt: 1234,      // updated on attach/input; drives sort
+//     status: 'running'|'exited',
+//     exitedAt: null,
 //     exitCode: null,
 //     pid: null,               // current pid if running
-//     cliSessionId: null,      // upstream CLI's session UUID. Pre-assigned
-//                              //   at spawn time for CLIs with
-//                              //   newSessionIdArgs (claude, copilot); set
-//                              //   from disk for adopted sessions. Used
-//                              //   for precise --resume <id>.
 //     manualStopped: false,    // true only when the user explicitly stopped
 //                              //   it from ccsm; prevents auto-resume until
 //                              //   they press Resume.
 //   }
-
-const path = require('node:path');
-const fs = require('node:fs/promises');
-const { DATA_DIR } = require('./config');
-const { atomicWriteJson, withFileLock } = require('./atomicJson');
-
-const FILE = path.join(DATA_DIR, 'sessions.json');
-
-async function loadAll() {
-  try {
-    const raw = await fs.readFile(FILE, 'utf8');
-    const j = JSON.parse(raw);
-    return Array.isArray(j) ? j : [];
-  } catch (e) {
-    if (e.code === 'ENOENT') return [];
-    throw e;
-  }
-}
-
-async function saveAll(list) {
-  await atomicWriteJson(FILE, list);
-}
-
-function genId() {
-  return 'sess-' + Date.now().toString(36) + '-' + Math.random().toString(36).slice(2, 8);
-}
-
-async function create(opts) {
-  return withFileLock(FILE, async () => {
-    const { cliId, cwd, workspace, repos = [], folderId = null, title = '', status = 'running', cliSessionId = null } = opts;
-    const list = await loadAll();
-    const entry = {
-      id: genId(),
-      cliId,
-      cwd,
-      workspace,
-      title,
-      folderId,
-      repos,
-      createdAt: Date.now(),
-      lastActiveAt: Date.now(),
-      status,
-      exitedAt: status === 'exited' ? Date.now() : null,
-      exitCode: null,
-      pid: null,
-      cliSessionId,
-      manualStopped: false,
-    };
-    list.push(entry);
-    await saveAll(list);
-    return entry;
-  });
-}
-
-async function get(id) {
-  const list = await loadAll();
-  return list.find((s) => s.id === id) || null;
-}
-
-async function update(id, patch) {
-  return withFileLock(FILE, async () => {
-    const list = await loadAll();
-    const idx = list.findIndex((s) => s.id === id);
-    if (idx < 0) return null;
-    list[idx] = { ...list[idx], ...patch };
-    await saveAll(list);
-    return list[idx];
-  });
-}
-
-async function remove(id) {
-  return withFileLock(FILE, async () => {
-    const list = await loadAll();
-    const idx = list.findIndex((s) => s.id === id);
-    if (idx < 0) return false;
-    list.splice(idx, 1);
-    await saveAll(list);
-    return true;
-  });
-}
-
-// Convenience helpers used at runtime so callers don't have to do
-// load/find/update/save themselves.
+
+const path = require('node:path');
+const fs = require('node:fs/promises');
+const { DATA_DIR } = require('./config');
+const { atomicWriteJson, withFileLock } = require('./atomicJson');
+
+const FILE = path.join(DATA_DIR, 'sessions.json');
+
+function normalizeEntry(entry) {
+  if (!entry || typeof entry !== 'object') return entry;
+  const { cliSessionId, ...rest } = entry;
+  return rest;
+}
+
+async function loadAll() {
+  try {
+    const raw = await fs.readFile(FILE, 'utf8');
+    const j = JSON.parse(raw);
+    return Array.isArray(j) ? j.map(normalizeEntry) : [];
+  } catch (e) {
+    if (e.code === 'ENOENT') return [];
+    throw e;
+  }
+}
+
+async function saveAll(list) {
+  await atomicWriteJson(FILE, (list || []).map(normalizeEntry));
+}
+
+function genId() {
+  return 'sess-' + Date.now().toString(36) + '-' + Math.random().toString(36).slice(2, 8);
+}
+
+function cwdKey(cwd) {
+  return path.resolve(String(cwd || '')).toLowerCase();
+}
+
+function sameCliAndCwd(entry, cliId, cwd) {
+  return entry && entry.cliId === cliId && entry.cwd && cwdKey(entry.cwd) === cwdKey(cwd);
+}
+
+function buildEntry(opts) {
+  const { cliId, cwd, workspace, repos = [], folderId = null, title = '', status = 'running' } = opts;
+  return {
+    id: genId(),
+    cliId,
+    cwd,
+    workspace,
+    title,
+    folderId,
+    repos,
+    createdAt: Date.now(),
+    lastActiveAt: Date.now(),
+    status,
+    exitedAt: status === 'exited' ? Date.now() : null,
+    exitCode: null,
+    pid: null,
+    manualStopped: false,
+  };
+}
+
+async function create(opts) {
+  return withFileLock(FILE, async () => {
+    const list = await loadAll();
+    const entry = buildEntry(opts);
+    list.push(entry);
+    await saveAll(list);
+    return entry;
+  });
+}
+
+async function findByCliAndCwd(cliId, cwd) {
+  const list = await loadAll();
+  return list.find((s) => sameCliAndCwd(s, cliId, cwd)) || null;
+}
+
+async function createOrGetByCliAndCwd(opts) {
+  return withFileLock(FILE, async () => {
+    const list = await loadAll();
+    const existing = list.find((s) => sameCliAndCwd(s, opts.cliId, opts.cwd));
+    if (existing) return { entry: existing, created: false };
+    const entry = buildEntry(opts);
+    list.push(entry);
+    await saveAll(list);
+    return { entry, created: true };
+  });
+}
+
+async function get(id) {
+  const list = await loadAll();
+  return list.find((s) => s.id === id) || null;
+}
+
+async function update(id, patch) {
+  return withFileLock(FILE, async () => {
+    const list = await loadAll();
+    const idx = list.findIndex((s) => s.id === id);
+    if (idx < 0) return null;
+    list[idx] = { ...list[idx], ...patch };
+    await saveAll(list);
+    return list[idx];
+  });
+}
+
+async function remove(id) {
+  return withFileLock(FILE, async () => {
+    const list = await loadAll();
+    const idx = list.findIndex((s) => s.id === id);
+    if (idx < 0) return false;
+    list.splice(idx, 1);
+    await saveAll(list);
+    return true;
+  });
+}
+
+// Convenience helpers used at runtime so callers don't have to do
+// load/find/update/save themselves.
 async function markRunning(id, pid) {
   return update(id, { status: 'running', pid, exitedAt: null, exitCode: null, manualStopped: false, lastActiveAt: Date.now() });
 }
-
-async function markExited(id, exitCode) {
-  return update(id, { status: 'exited', exitCode: exitCode ?? null, exitedAt: Date.now(), pid: null });
-}
-
-async function touch(id) {
-  return update(id, { lastActiveAt: Date.now() });
-}
-
-async function setFolder(id, folderId) {
-  return update(id, { folderId: folderId || null });
-}
-
-async function setTitle(id, title) {
-  return update(id, { title: title || '' });
-}
-
-module.exports = {
-  loadAll,
-  create,
-  get,
-  update,
-  remove,
-  markRunning,
-  markExited,
-  touch,
-  setFolder,
-  setTitle,
-  FILE,
-};
+
+async function normalizeStore() {
+  return withFileLock(FILE, async () => {
+    const list = await loadAll();
+    await saveAll(list);
+    return list;
+  });
+}
+
+async function markExited(id, exitCode) {
+  return update(id, { status: 'exited', exitCode: exitCode ?? null, exitedAt: Date.now(), pid: null });
+}
+
+async function touch(id) {
+  return update(id, { lastActiveAt: Date.now() });
+}
+
+async function setFolder(id, folderId) {
+  return update(id, { folderId: folderId || null });
+}
+
+async function setTitle(id, title) {
+  return update(id, { title: title || '' });
+}
+
+module.exports = {
+  loadAll,
+  create,
+  findByCliAndCwd,
+  createOrGetByCliAndCwd,
+  get,
+  update,
+  remove,
+  markRunning,
+  markExited,
+  touch,
+  setFolder,
+  setTitle,
+  normalizeStore,
+  FILE,
+};