@bakapiano/ccsm 0.10.3 → 0.12.0

package/lib/config.js

@@ -1,185 +1,188 @@
-'use strict';
-
-const fs = require('node:fs/promises');
-const fsSync = require('node:fs');
-const path = require('node:path');
-const os = require('node:os');
-
-// Data dir lives under ~/.ccsm by default so config survives across upgrades
-// (incl. running from a new npx checkout). Override with CCSM_HOME if you
-// want a different location.
-const DATA_DIR = process.env.CCSM_HOME || path.join(os.homedir(), '.ccsm');
-const CONFIG_PATH = path.join(DATA_DIR, 'config.json');
-
-const LEGACY_DATA_DIR = path.join(__dirname, '..', 'data');
-
-// v1.0 — wt / system-terminal launch path removed. Sessions are always
-// in-page web terminals managed by ccsm. CLI is pluggable: configure one
-// or more entries under `clis` (claude, codex, custom wrappers), pick a
-// default. Old config keys (`terminal`, `commandShell`, `claudeCommand`,
-// `defaultTerminalMode`, `autoFocusOnLaunch`, `focusMovesToCenter`,
-// `snapshot*`) are silently dropped on load.
-const DEFAULT_CLIS = [
-  {
-    id: 'claude',
-    name: 'Claude Code',
-    command: 'claude',
-    args: [],
-    resumeArgs: ['--continue'],
-    resumeIdArgs: ['--resume', '<id>'],
-    shell: 'direct',
-    type: 'claude',
-    builtin: true,
-  },
-  {
-    id: 'codex',
-    name: 'OpenAI Codex',
-    command: 'codex',
-    args: [],
-    resumeArgs: ['resume', '--last'],
-    resumeIdArgs: ['resume', '<id>'],
-    shell: 'direct',
-    type: 'codex',
-    builtin: true,
-  },
-  {
-    id: 'copilot',
-    name: 'GitHub Copilot',
-    command: 'copilot',
-    args: [],
-    resumeArgs: ['--continue'],
-    resumeIdArgs: ['--resume', '<id>'],
-    shell: 'direct',
-    type: 'copilot',
-    builtin: true,
-  },
-];
-
-const DEFAULTS = {
-  port: 7777,
-  workDir: path.join(os.homedir(), 'ccsm-workspaces'),
-  // Repos available for cloning into a fresh workspace at launch time.
-  //   { name: 'foo', url: 'https://github.com/me/foo.git', defaultSelected: true }
-  repos: [],
-  // Pluggable CLIs. Add wrappers like `ccp` (gc2cc) or self-hosted
-  // proxies by appending an entry. defaultCliId picks one for the
-  // Launch button when the user doesn't override.
-  clis: DEFAULT_CLIS,
-  defaultCliId: 'claude',
-};
-
-function ensureDataDir() {
-  if (!fsSync.existsSync(DATA_DIR)) {
-    fsSync.mkdirSync(DATA_DIR, { recursive: true });
-  }
-}
-
-// If we find a legacy <repo>/data dir from before the home-dir move AND
-// no ~/.ccsm yet, copy across. Idempotent — only fires when DATA_DIR is
-// empty so existing users with both dirs aren't clobbered.
-function migrateLegacyDataIfNeeded() {
-  if (!fsSync.existsSync(LEGACY_DATA_DIR)) return;
-  if (LEGACY_DATA_DIR === DATA_DIR) return;
-  ensureDataDir();
-  const dataEmpty = fsSync.readdirSync(DATA_DIR).length === 0;
-  if (!dataEmpty) return;
-  try {
-    fsSync.cpSync(LEGACY_DATA_DIR, DATA_DIR, { recursive: true });
-    console.log(`[ccsm] migrated legacy data: ${LEGACY_DATA_DIR} → ${DATA_DIR}`);
-  } catch (e) {
-    console.error('[ccsm] legacy migration failed:', e.message);
-  }
-}
-
-migrateLegacyDataIfNeeded();
-
-// Strip dropped v0.x keys + clamp shape of survivors. Returns a fresh
-// object so callers don't mutate DEFAULTS.
-function mergeWithDefaults(partial) {
-  const out = { ...DEFAULTS, ...partial };
-  // Drop v0.x keys that the new architecture doesn't use.
-  delete out.terminal;
-  delete out.commandShell;
-  delete out.claudeCommand;
-  delete out.defaultTerminalMode;
-  delete out.autoFocusOnLaunch;
-  delete out.focusMovesToCenter;
-  delete out.snapshotIntervalMs;
-  delete out.snapshotHistoryKeep;
-  delete out.autoOpenBrowser;
-  delete out.browserMode;
-  delete out.finderPrompt;
-
-  if (!Array.isArray(out.repos)) out.repos = DEFAULTS.repos;
-  if (!Array.isArray(out.clis)) out.clis = [];
-  // Always inject builtin CLIs (claude, codex) if they're missing or were
-  // deleted from a saved config — they're managed by ccsm, the user can
-  // tweak args/shell but can't remove them. Preserves any user
-  // customisation on existing builtin entries.
-  for (const def of DEFAULT_CLIS) {
-    const existing = out.clis.find((c) => c.id === def.id);
-    if (existing) {
-      existing.builtin = true;
-      // Backfill defaults from the built-in template for any field the
-      // user's saved copy is missing — keeps old configs aligned with new
-      // schema additions (resumeArgs, type, etc.) without clobbering the
-      // user's customisations.
-      if (existing.resumeArgs == null) existing.resumeArgs = def.resumeArgs;
-      if (existing.resumeIdArgs == null) existing.resumeIdArgs = def.resumeIdArgs;
-      if (!existing.type) existing.type = def.type;
-    } else {
-      out.clis.unshift({ ...def });
-    }
-  }
-  // Normalize per-CLI fields.
-  out.clis = out.clis.map((c) => {
-    const { installed, installPath, ...rest } = c;  // strip computed probe fields
-    return {
-      ...rest,
-      args: Array.isArray(rest.args) ? rest.args : [],
-      resumeArgs: Array.isArray(rest.resumeArgs) ? rest.resumeArgs : [],
-      resumeIdArgs: Array.isArray(rest.resumeIdArgs) ? rest.resumeIdArgs : [],
-      shell: ['direct', 'pwsh', 'cmd'].includes(rest.shell) ? rest.shell : 'direct',
-      type: ['claude', 'codex', 'copilot', 'other'].includes(rest.type) ? rest.type : 'other',
-      builtin: !!rest.builtin,
-    };
-  });
-  // Make sure defaultCliId points at an actual CLI; fall back to first.
-  if (!out.clis.find((c) => c.id === out.defaultCliId)) {
-    out.defaultCliId = out.clis[0].id;
-  }
-  return out;
-}
-
-async function loadConfig() {
-  ensureDataDir();
-  try {
-    const raw = await fs.readFile(CONFIG_PATH, 'utf8');
-    return mergeWithDefaults(JSON.parse(raw));
-  } catch (e) {
-    if (e.code === 'ENOENT') {
-      const cfg = { ...DEFAULTS };
-      await fs.writeFile(CONFIG_PATH, JSON.stringify(cfg, null, 2));
-      return cfg;
-    }
-    throw e;
-  }
-}
-
-async function saveConfig(partial) {
-  ensureDataDir();
-  const current = await loadConfig();
-  const next = mergeWithDefaults({ ...current, ...partial });
-  await fs.writeFile(CONFIG_PATH, JSON.stringify(next, null, 2));
-  return next;
-}
-
-module.exports = {
-  loadConfig,
-  saveConfig,
-  DATA_DIR,
-  CONFIG_PATH,
-  LEGACY_DATA_DIR,
-  DEFAULTS,
-  DEFAULT_CLIS,
-};
+'use strict';
+
+const fs = require('node:fs/promises');
+const fsSync = require('node:fs');
+const path = require('node:path');
+const os = require('node:os');
+const { atomicWriteJson, withFileLock } = require('./atomicJson');
+
+// Data dir lives under ~/.ccsm by default so config survives across upgrades
+// (incl. running from a new npx checkout). Override with CCSM_HOME if you
+// want a different location.
+const DATA_DIR = process.env.CCSM_HOME || path.join(os.homedir(), '.ccsm');
+const CONFIG_PATH = path.join(DATA_DIR, 'config.json');
+
+const LEGACY_DATA_DIR = path.join(__dirname, '..', 'data');
+
+// v1.0 — wt / system-terminal launch path removed. Sessions are always
+// in-page web terminals managed by ccsm. CLI is pluggable: configure one
+// or more entries under `clis` (claude, codex, custom wrappers), pick a
+// default. Old config keys (`terminal`, `commandShell`, `claudeCommand`,
+// `defaultTerminalMode`, `autoFocusOnLaunch`, `focusMovesToCenter`,
+// `snapshot*`) are silently dropped on load.
+const DEFAULT_CLIS = [
+  {
+    id: 'claude',
+    name: 'Claude Code',
+    command: 'claude',
+    args: [],
+    resumeArgs: ['--continue'],
+    resumeIdArgs: ['--resume', '<id>'],
+    shell: 'direct',
+    type: 'claude',
+    builtin: true,
+  },
+  {
+    id: 'codex',
+    name: 'OpenAI Codex',
+    command: 'codex',
+    args: [],
+    resumeArgs: ['resume', '--last'],
+    resumeIdArgs: ['resume', '<id>'],
+    shell: 'direct',
+    type: 'codex',
+    builtin: true,
+  },
+  {
+    id: 'copilot',
+    name: 'GitHub Copilot',
+    command: 'copilot',
+    args: [],
+    resumeArgs: ['--continue'],
+    resumeIdArgs: ['--resume', '<id>'],
+    shell: 'direct',
+    type: 'copilot',
+    builtin: true,
+  },
+];
+
+const DEFAULTS = {
+  port: 7777,
+  workDir: path.join(os.homedir(), 'ccsm-workspaces'),
+  // Repos available for cloning into a fresh workspace at launch time.
+  //   { name: 'foo', url: 'https://github.com/me/foo.git', defaultSelected: true }
+  repos: [],
+  // Pluggable CLIs. Add wrappers like `ccp` (gc2cc) or self-hosted
+  // proxies by appending an entry. defaultCliId picks one for the
+  // Launch button when the user doesn't override.
+  clis: DEFAULT_CLIS,
+  defaultCliId: 'claude',
+};
+
+function ensureDataDir() {
+  if (!fsSync.existsSync(DATA_DIR)) {
+    fsSync.mkdirSync(DATA_DIR, { recursive: true });
+  }
+}
+
+// If we find a legacy <repo>/data dir from before the home-dir move AND
+// no ~/.ccsm yet, copy across. Idempotent — only fires when DATA_DIR is
+// empty so existing users with both dirs aren't clobbered.
+function migrateLegacyDataIfNeeded() {
+  if (!fsSync.existsSync(LEGACY_DATA_DIR)) return;
+  if (LEGACY_DATA_DIR === DATA_DIR) return;
+  ensureDataDir();
+  const dataEmpty = fsSync.readdirSync(DATA_DIR).length === 0;
+  if (!dataEmpty) return;
+  try {
+    fsSync.cpSync(LEGACY_DATA_DIR, DATA_DIR, { recursive: true });
+    console.log(`[ccsm] migrated legacy data: ${LEGACY_DATA_DIR} → ${DATA_DIR}`);
+  } catch (e) {
+    console.error('[ccsm] legacy migration failed:', e.message);
+  }
+}
+
+migrateLegacyDataIfNeeded();
+
+// Strip dropped v0.x keys + clamp shape of survivors. Returns a fresh
+// object so callers don't mutate DEFAULTS.
+function mergeWithDefaults(partial) {
+  const out = { ...DEFAULTS, ...partial };
+  // Drop v0.x keys that the new architecture doesn't use.
+  delete out.terminal;
+  delete out.commandShell;
+  delete out.claudeCommand;
+  delete out.defaultTerminalMode;
+  delete out.autoFocusOnLaunch;
+  delete out.focusMovesToCenter;
+  delete out.snapshotIntervalMs;
+  delete out.snapshotHistoryKeep;
+  delete out.autoOpenBrowser;
+  delete out.browserMode;
+  delete out.finderPrompt;
+
+  if (!Array.isArray(out.repos)) out.repos = DEFAULTS.repos;
+  if (!Array.isArray(out.clis)) out.clis = [];
+  // Always inject builtin CLIs (claude, codex) if they're missing or were
+  // deleted from a saved config — they're managed by ccsm, the user can
+  // tweak args/shell but can't remove them. Preserves any user
+  // customisation on existing builtin entries.
+  for (const def of DEFAULT_CLIS) {
+    const existing = out.clis.find((c) => c.id === def.id);
+    if (existing) {
+      existing.builtin = true;
+      // Backfill defaults from the built-in template for any field the
+      // user's saved copy is missing — keeps old configs aligned with new
+      // schema additions (resumeArgs, type, etc.) without clobbering the
+      // user's customisations.
+      if (existing.resumeArgs == null) existing.resumeArgs = def.resumeArgs;
+      if (existing.resumeIdArgs == null) existing.resumeIdArgs = def.resumeIdArgs;
+      if (!existing.type) existing.type = def.type;
+    } else {
+      out.clis.unshift({ ...def });
+    }
+  }
+  // Normalize per-CLI fields.
+  out.clis = out.clis.map((c) => {
+    const { installed, installPath, ...rest } = c;  // strip computed probe fields
+    return {
+      ...rest,
+      args: Array.isArray(rest.args) ? rest.args : [],
+      resumeArgs: Array.isArray(rest.resumeArgs) ? rest.resumeArgs : [],
+      resumeIdArgs: Array.isArray(rest.resumeIdArgs) ? rest.resumeIdArgs : [],
+      shell: ['direct', 'pwsh', 'cmd'].includes(rest.shell) ? rest.shell : 'direct',
+      type: ['claude', 'codex', 'copilot', 'other'].includes(rest.type) ? rest.type : 'other',
+      builtin: !!rest.builtin,
+    };
+  });
+  // Make sure defaultCliId points at an actual CLI; fall back to first.
+  if (!out.clis.find((c) => c.id === out.defaultCliId)) {
+    out.defaultCliId = out.clis[0].id;
+  }
+  return out;
+}
+
+async function loadConfig() {
+  ensureDataDir();
+  try {
+    const raw = await fs.readFile(CONFIG_PATH, 'utf8');
+    return mergeWithDefaults(JSON.parse(raw));
+  } catch (e) {
+    if (e.code === 'ENOENT') {
+      const cfg = { ...DEFAULTS };
+      await atomicWriteJson(CONFIG_PATH, cfg);
+      return cfg;
+    }
+    throw e;
+  }
+}
+
+async function saveConfig(partial) {
+  ensureDataDir();
+  return withFileLock(CONFIG_PATH, async () => {
+    const current = await loadConfig();
+    const next = mergeWithDefaults({ ...current, ...partial });
+    await atomicWriteJson(CONFIG_PATH, next);
+    return next;
+  });
+}
+
+module.exports = {
+  loadConfig,
+  saveConfig,
+  DATA_DIR,
+  CONFIG_PATH,
+  LEGACY_DATA_DIR,
+  DEFAULTS,
+  DEFAULT_CLIS,
+};

package/lib/folders.js

@@ -1,96 +1,105 @@
-'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 FILE = path.join(DATA_DIR, 'folders.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 fs.writeFile(FILE, JSON.stringify(list, null, 2));
-}
-
-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');
-  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) {
-  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 (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) {
-  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');
-  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');
+
+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 '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) {
+  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 (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) {
+  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/jsonStore.js

@@ -12,6 +12,7 @@
 
 const fs = require('node:fs/promises');
 const path = require('node:path');
+const { atomicWriteJson, withFileLock } = require('./atomicJson');
 
 function createKeyedJsonStore({ dataDir, filename, transformValue = (v) => v }) {
   const filePath = path.join(dataDir, filename);
@@ -28,25 +29,29 @@ function createKeyedJsonStore({ dataDir, filename, transformValue = (v) => v })
   }
 
   async function save(map) {
-    await fs.writeFile(filePath, JSON.stringify(map, null, 2));
+    await atomicWriteJson(filePath, map);
   }
 
   async function set(key, value) {
     if (!key) throw new Error('set: key required');
     const next = transformValue(value, key);
     if (next == null) return remove(key);
-    const map = await load();
-    map[key] = next;
-    await save(map);
-    return next;
+    return withFileLock(filePath, async () => {
+      const map = await load();
+      map[key] = next;
+      await save(map);
+      return next;
+    });
   }
 
   async function remove(key) {
-    const map = await load();
-    if (!(key in map)) return false;
-    delete map[key];
-    await save(map);
-    return true;
+    return withFileLock(filePath, async () => {
+      const map = await load();
+      if (!(key in map)) return false;
+      delete map[key];
+      await save(map);
+      return true;
+    });
   }
 
   async function list() {