@bakapiano/ccsm 0.22.7 → 0.22.8

package/lib/config.js

@@ -26,11 +26,8 @@ const DEFAULT_CLIS = [
     name: 'Claude Code',
     command: 'claude',
     args: [],
-    // Pre-assign the upstream session UUID when starting a NEW session.
-    // ccsm picks the UUID, passes it via these args, and stores it on
-    // the record immediately — no need to poll the transcript dir later.
-    newSessionIdArgs: ['--session-id', '<id>'],
-    resumeIdArgs: ['--resume', '<id>'],
+    resumeLatestArgs: ['--continue'],
+    resumePickerArgs: ['--resume'],
     shell: 'direct',
     type: 'claude',
     builtin: true,
@@ -40,13 +37,8 @@ const DEFAULT_CLIS = [
     name: 'OpenAI Codex',
     command: 'codex',
     args: [],
-    // codex has no "use this UUID for a new session" flag, but we work
-    // around it: ccsm seeds a fake rollout file at the right path with
-    // our chosen UUID (lib/codexSeed.js), then spawns `codex resume <id>`
-    // so the first launch *is* a resume against our seed. From then on
-    // codex appends to the same file and resume-by-id keeps working.
-    newSessionIdArgs: ['resume', '<id>'],
-    resumeIdArgs: ['resume', '<id>'],
+    resumeLatestArgs: ['resume', '--last'],
+    resumePickerArgs: ['resume'],
     shell: 'direct',
     type: 'codex',
     builtin: true,
@@ -56,13 +48,8 @@ const DEFAULT_CLIS = [
     name: 'GitHub Copilot',
     command: 'copilot',
     args: [],
-    // copilot has no `--resume <id>` (space) flag — that parses as `--resume`
-    // (valueless → session picker) plus a stray positional arg, which hangs on
-    // a blank screen. `--session-id <id>` both creates AND resumes a session by
-    // id (`copilot --help`: "Resume an existing session or task by ID"), so we
-    // use it for both new and resume.
-    newSessionIdArgs: ['--session-id', '<id>'],
-    resumeIdArgs: ['--session-id', '<id>'],
+    resumeLatestArgs: ['--continue'],
+    resumePickerArgs: ['--resume'],
     shell: 'direct',
     type: 'copilot',
     builtin: true,
@@ -72,10 +59,10 @@ const DEFAULT_CLIS = [
 const DEFAULTS = {
   port: 7777,
   workDir: path.join(os.homedir(), 'ccsm-workspaces'),
-  // When false, only running sessions reserve a workspace. When true,
-  // any persisted session with a cwd keeps that workspace in-use until
-  // the session record is deleted.
-  reserveWorkspacesForStoppedSessions: false,
+  // How a stopped session is reattached for its cwd: latest asks the CLI
+  // for the most recent session in that folder; picker opens the CLI's
+  // interactive resume picker for that folder.
+  resumeMode: 'latest',
   // Repos available for cloning into a fresh workspace at launch time.
   //   { name: 'foo', url: 'https://github.com/me/foo.git', defaultSelected: true }
   repos: [],
@@ -110,6 +97,27 @@ function ensureDataDir() {
   }
 }
 
+function isArgArray(v) {
+  return Array.isArray(v);
+}
+
+function cloneArgs(v) {
+  return Array.isArray(v) ? [...v] : [];
+}
+
+function needsBackfill(v) {
+  return !Array.isArray(v) || v.length === 0;
+}
+
+function migratePickerArgsFromLegacyResumeIdArgs(args) {
+  if (!Array.isArray(args)) return [];
+  const clean = args.map((a) => String(a));
+  if (clean.length === 2 && clean[1].includes('<id>')) {
+    if (clean[0] === '--resume' || clean[0] === 'resume') return [clean[0]];
+  }
+  return [];
+}
+
 // 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.
@@ -149,12 +157,13 @@ function mergeWithDefaults(partial) {
   delete out.autoOpenBrowser;
   delete out.browserMode;
   delete out.finderPrompt;
+  delete out.reserveWorkspacesForStoppedSessions;
 
   if (!Array.isArray(out.repos)) out.repos = DEFAULTS.repos;
   if (!Array.isArray(out.clis)) out.clis = [];
   if (typeof out.editor !== 'string') out.editor = DEFAULTS.editor;
-  out.reserveWorkspacesForStoppedSessions = out.reserveWorkspacesForStoppedSessions === true;
-  // Always inject builtin CLIs (claude, codex) if they're missing or were
+  out.resumeMode = out.resumeMode === 'picker' ? 'picker' : 'latest';
+  // Always inject builtin CLIs (claude, codex, copilot) 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.
@@ -162,30 +171,12 @@ function mergeWithDefaults(partial) {
     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 OR has as an empty array. Empty
-      // arrays matter because users upgrading from a pre-0.15 config
-      // never wrote `newSessionIdArgs` (didn't exist), AND a partial
-      // 0.14→0.15 dev iteration shipped codex with `[]`. Treat both
-      // the same: a builtin with no template means "use the canonical
-      // one ccsm now knows about", since these fields are the
-      // integration contract with the upstream CLI — not user knobs.
-      const needsBackfill = (v) => v == null || (Array.isArray(v) && v.length === 0);
-      if (needsBackfill(existing.resumeIdArgs)) existing.resumeIdArgs = def.resumeIdArgs;
-      if (needsBackfill(existing.newSessionIdArgs)) existing.newSessionIdArgs = def.newSessionIdArgs;
-      // Heal the old broken copilot resume flag: `--resume <id>` (space form)
-      // isn't valid copilot syntax — it parses as a valueless `--resume`
-      // (session picker) plus a stray positional, hanging on a blank screen.
-      // The builtin now uses `--session-id <id>`. Migrate configs still
-      // carrying the old default; genuine user customisations are left alone.
-      if (existing.id === 'copilot'
-          && Array.isArray(existing.resumeIdArgs)
-          && existing.resumeIdArgs.join(' ') === '--resume <id>') {
-        existing.resumeIdArgs = def.resumeIdArgs;
-      }
-      // Drop the v0.x `resumeArgs` fallback — every builtin now has a
-      // pre-assigned UUID (claude/copilot via flag, codex via seed) so
-      // resumeIdArgs always applies on resume; the field is dead weight.
+      // Backfill the canonical folder-level resume templates for built-ins.
+      // These are integration args, not regular user runtime args.
+      if (needsBackfill(existing.resumeLatestArgs)) existing.resumeLatestArgs = cloneArgs(def.resumeLatestArgs);
+      if (needsBackfill(existing.resumePickerArgs)) existing.resumePickerArgs = cloneArgs(def.resumePickerArgs);
+      delete existing.newSessionIdArgs;
+      delete existing.resumeIdArgs;
       delete existing.resumeArgs;
       if (!existing.type) existing.type = def.type;
     } else {
@@ -194,31 +185,38 @@ function mergeWithDefaults(partial) {
   }
   // Normalize per-CLI fields.
   out.clis = out.clis.map((c) => {
-    const { installed, installPath, resumeArgs, ...rest } = c;  // strip computed probe fields + v0.x resumeArgs
+    const {
+      installed,
+      installPath,
+      resumeArgs,
+      resumeIdArgs,
+      newSessionIdArgs,
+      ...rest
+    } = c;  // strip computed probe fields + legacy session-id resume fields
     const normalized = {
       ...rest,
-      args: Array.isArray(rest.args) ? rest.args : [],
-      resumeIdArgs: Array.isArray(rest.resumeIdArgs) ? rest.resumeIdArgs : [],
-      newSessionIdArgs: Array.isArray(rest.newSessionIdArgs) ? rest.newSessionIdArgs : [],
+      args: isArgArray(rest.args) ? rest.args : [],
+      resumeLatestArgs: isArgArray(rest.resumeLatestArgs)
+        ? rest.resumeLatestArgs
+        : (isArgArray(resumeArgs) ? resumeArgs : []),
+      resumePickerArgs: isArgArray(rest.resumePickerArgs)
+        ? rest.resumePickerArgs
+        : migratePickerArgsFromLegacyResumeIdArgs(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,
     };
-    // Type-based fallback for non-builtin CLIs (wrappers that
-    // just call claude under the hood). If user picked
-    // type='claude' but left newSessionIdArgs / resumeIdArgs blank,
-    // assume they want the same args claude / copilot / codex use
-    // canonically — without this the wrapped CLI gets spawned with
-    // no UUID and ccsm can never recapture the upstream session.
-    // Builtins are already handled by the loop above with `def`.
+    // Type-based fallback for non-builtin CLIs (wrappers that just call
+    // a known CLI under the hood). If the resume templates are blank, use
+    // the same folder-level resume commands as the matching built-in.
     if (!normalized.builtin && normalized.type !== 'other') {
       const template = DEFAULT_CLIS.find((d) => d.type === normalized.type);
       if (template) {
-        if (normalized.newSessionIdArgs.length === 0) {
-          normalized.newSessionIdArgs = [...template.newSessionIdArgs];
+        if (normalized.resumeLatestArgs.length === 0) {
+          normalized.resumeLatestArgs = cloneArgs(template.resumeLatestArgs);
         }
-        if (normalized.resumeIdArgs.length === 0) {
-          normalized.resumeIdArgs = [...template.resumeIdArgs];
+        if (normalized.resumePickerArgs.length === 0) {
+          normalized.resumePickerArgs = cloneArgs(template.resumePickerArgs);
         }
       }
     }

package/lib/persistedSessions.js

@@ -10,22 +10,17 @@
 //   {
 //     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)
+//     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'],    // names of repos cloned into cwd at launch
+//     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.
@@ -38,11 +33,17 @@ 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 : [];
+    return Array.isArray(j) ? j.map(normalizeEntry) : [];
   } catch (e) {
     if (e.code === 'ENOENT') return [];
     throw e;
@@ -50,40 +51,68 @@ async function loadAll() {
 }
 
 async function saveAll(list) {
-  await atomicWriteJson(FILE, 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 { 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,
-    };
+    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;
@@ -117,6 +146,14 @@ async function markRunning(id, pid) {
   return update(id, { status: 'running', pid, exitedAt: null, exitCode: null, manualStopped: false, lastActiveAt: Date.now() });
 }
 
+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 });
 }
@@ -136,6 +173,8 @@ async function setTitle(id, title) {
 module.exports = {
   loadAll,
   create,
+  findByCliAndCwd,
+  createOrGetByCliAndCwd,
   get,
   update,
   remove,
@@ -144,5 +183,6 @@ module.exports = {
   touch,
   setFolder,
   setTitle,
+  normalizeStore,
   FILE,
 };

package/lib/winPath.js

@@ -5,7 +5,7 @@
 // installed or put on PATH AFTER the server started. We read the
 // persisted user PATH from the registry and merge it in, then hand the
 // deduped env to every child we spawn. server.js uses this for session
-// launches; codexSeed uses it for the `<cli> doctor` home probe so the wrapper
+// launches; the Codex theme helper uses it for the `<cli> doctor` home probe so the wrapper
 // resolves regardless of the parent process's PATH.
 //
 // (server.js keeps its own equivalent inline for the hot spawn path; this

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bakapiano/ccsm",
-  "version": "0.22.7",
+  "version": "0.22.8",
   "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",