@bakapiano/ccsm 0.22.7 → 0.22.8

package/public/css/widgets.css

@@ -260,28 +260,6 @@
   text-align: center;
 }
 
-.launch-import-link {
-  display: inline-flex;
-  align-items: center;
-  background: transparent;
-  border: none;
-  font: inherit;
-  font-size: 12px;
-  color: var(--ink-faint);
-  cursor: pointer;
-  padding: 4px 8px;
-  border-radius: 6px;
-  transition: color 120ms ease;
-}
-.launch-import-link:hover { color: var(--ink-mid); }
-.launch-import-arrow {
-  display: inline-flex;
-  align-items: center;
-  margin-left: 6px;
-  transition: transform 180ms cubic-bezier(.4, 0, .2, 1);
-}
-.launch-import-link:hover .launch-import-arrow { transform: translateX(3px); }
-
 /* === Launch toolbar · A · Pill toolbar =========================== */
 
 .launch-toolbar {
@@ -1080,8 +1058,7 @@
 .popover-panel {
   position: fixed;
   /* Above the modal backdrop (200) so pickers opened from inside a modal
-     — e.g. "Import as" in the adopt modal — float on top, not behind it.
-     Still below toasts (1200). */
+     float on top, not behind it. Still below toasts (1200). */
   z-index: 250;
   background: var(--bg-elev);
   border: 1px solid var(--border);
@@ -1296,361 +1273,6 @@
   margin-top: 4px;
 }
 
-/* --- Adopt (import existing CLI session) modal --------------------- */
-/* Fills the (flush, scrolling) modal body: a pinned head (tabs + tools)
-   and a scrolling list below it; pagination lives in the modal footer. */
-.adopt { display: flex; flex-direction: column; min-height: 360px; }
-
-.adopt-head {
-  position: sticky;
-  top: 0;
-  z-index: 2;
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-  padding: 14px 18px 12px;
-  background: var(--bg-elev);
-  border-bottom: 1px solid var(--border-soft);
-}
-
-/* Underline tab bar (was solid pills) — calmer, matches the app. */
-.adopt-tabs {
-  display: flex;
-  align-items: center;
-  gap: 2px;
-}
-.adopt-tab {
-  appearance: none;
-  display: inline-flex;
-  align-items: center;
-  gap: 7px;
-  padding: 6px 11px 8px;
-  background: transparent;
-  border: 0;
-  border-bottom: 2px solid transparent;
-  font: inherit;
-  font-size: 13px;
-  font-weight: 500;
-  color: var(--ink-muted);
-  cursor: pointer;
-  transition: color .12s ease, border-color .12s ease;
-}
-.adopt-tab:hover { color: var(--ink); }
-.adopt-tab.is-active {
-  color: var(--ink);
-  border-bottom-color: var(--ink);
-}
-.adopt-tab-icon { display: inline-flex; width: 16px; height: 16px; }
-.adopt-tab-icon svg, .adopt-tab-icon img { width: 100%; height: 100%; }
-.adopt-tab-count {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  min-width: 17px;
-  height: 16px;
-  padding: 0 5px;
-  border-radius: 999px;
-  background: var(--ui-bg);
-  color: var(--ink-mid);
-  font-size: 10.5px;
-  font-weight: 600;
-  font-variant-numeric: tabular-nums;
-}
-.adopt-rescan {
-  appearance: none;
-  margin-left: auto;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 28px;
-  height: 28px;
-  padding: 0;
-  border: 1px solid var(--border);
-  background: var(--bg-elev);
-  color: var(--ink-muted);
-  border-radius: 8px;
-  cursor: pointer;
-  transition: color .12s ease, border-color .12s ease, transform .3s ease;
-}
-.adopt-rescan:hover { color: var(--ink); border-color: var(--ink-faint); transform: rotate(90deg); }
-.adopt-rescan svg { width: 14px; height: 14px; }
-
-/* Tools row: CLI picker pill + search input */
-.adopt-tools {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  flex-wrap: wrap;
-}
-.adopt-cli-pill {
-  appearance: none;
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  padding: 5px 8px 5px 10px;
-  height: 30px;
-  border: 1px solid var(--border);
-  border-radius: 8px;
-  background: var(--bg-elev);
-  color: var(--ink);
-  font: inherit;
-  font-size: 12px;
-  cursor: pointer;
-  transition: border-color .12s ease, background .12s ease;
-}
-.adopt-cli-pill:hover { border-color: var(--ink-faint); background: var(--bg); }
-.adopt-cli-pill.is-open { border-color: var(--ink); }
-.adopt-cli-pill-prefix { color: var(--ink-muted); font-size: 11.5px; }
-.adopt-cli-pill-icon {
-  display: inline-flex; align-items: center; justify-content: center;
-  width: 14px; height: 14px;
-}
-.adopt-cli-pill-icon svg { width: 100%; height: 100%; }
-.adopt-cli-pill-name { font-weight: 500; }
-.adopt-cli-pill > svg { color: var(--ink-faint); width: 12px; height: 12px; }
-
-.adopt-search {
-  position: relative;
-  flex: 1 1 200px;
-  min-width: 200px;
-}
-.adopt-search-icon {
-  position: absolute;
-  left: 9px;
-  top: 50%;
-  transform: translateY(-50%);
-  display: inline-flex;
-  color: var(--ink-faint);
-  pointer-events: none;
-}
-.adopt-search-icon svg { width: 13px; height: 13px; }
-.adopt-search-input {
-  appearance: none;
-  width: 100%;
-  height: 30px;
-  padding: 0 28px 0 28px;
-  border: 1px solid var(--border);
-  border-radius: 8px;
-  background: var(--bg-elev);
-  color: var(--ink);
-  font: inherit;
-  font-size: 12px;
-  outline: none;
-  transition: border-color .12s ease;
-}
-.adopt-search-input:focus { border-color: var(--ink-faint); }
-.adopt-search-input:disabled { color: var(--ink-faint); }
-.adopt-search-clear {
-  appearance: none;
-  position: absolute;
-  right: 6px;
-  top: 50%;
-  transform: translateY(-50%);
-  border: 0;
-  background: transparent;
-  color: var(--ink-faint);
-  padding: 4px;
-  border-radius: 6px;
-  cursor: pointer;
-  display: inline-flex;
-}
-.adopt-search-clear:hover { color: var(--ink); background: var(--bg); }
-.adopt-search-clear svg { width: 11px; height: 11px; }
-
-/* The list scrolls inside the modal body now (not its own overflow box);
-   this is just the padded wrapper. */
-.adopt-list {
-  padding: 12px 18px 16px;
-}
-.adopt-empty {
-  padding: 48px 12px;
-  text-align: center;
-  color: var(--ink-muted);
-  font-size: 12.5px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 10px;
-}
-.adopt-error { color: var(--danger); }
-.adopt-empty-mark {
-  font-size: 24px;
-  color: var(--ink-faint);
-  width: 44px;
-  height: 44px;
-  border-radius: 50%;
-  background: var(--bg);
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  border: 1px dashed var(--border);
-}
-.adopt-empty-spinner {
-  width: 14px; height: 14px; border-radius: 50%;
-  border: 1.6px solid var(--border);
-  border-top-color: var(--ink-faint);
-  animation: adopt-spin 0.8s linear infinite;
-  display: inline-block;
-  vertical-align: -2px;
-  margin-right: 6px;
-}
-@keyframes adopt-spin { to { transform: rotate(360deg); } }
-
-.adopt-rows {
-  list-style: none;
-  margin: 0;
-  padding: 0;
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-}
-.adopt-row {
-  display: flex;
-  align-items: center;
-  gap: 11px;
-  padding: 10px 12px;
-  border: 1px solid var(--border);
-  background: var(--bg-elev);
-  border-radius: 10px;
-  transition: border-color .12s ease, background .12s ease, transform .12s ease;
-}
-.adopt-row-icon {
-  position: relative;
-  flex: 0 0 auto;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 30px;
-  height: 30px;
-  border-radius: 8px;
-  background: var(--bg);
-  border: 1px solid var(--border-soft);
-}
-.adopt-row-icon svg, .adopt-row-icon img { width: 17px; height: 17px; }
-.adopt-row:hover {
-  border-color: var(--ink-faint);
-  transform: translateY(-1px);
-}
-.adopt-row.is-adopted {
-  opacity: 0.6;
-  background: var(--bg);
-}
-.adopt-row.is-adopted:hover { transform: none; border-color: var(--border); }
-/* A session a cli process currently has open. Quiet treatment: the row
-   itself stays neutral (many rows can be live at once — a wall of green
-   slabs is noise) and the "alive" signal rides on the icon as a small
-   green presence dot, the way a chat avatar shows online. The icon tile
-   picks up a faint green tint + green glyph so the eye still lands. */
-.adopt-row.is-active .adopt-row-icon {
-  border-color: rgba(74, 138, 74, 0.4);
-  background: rgba(74, 138, 74, 0.1);
-  color: var(--green);
-}
-/* Static dot — punched out of the card with a bg-elev ring so it reads as
-   a badge sitting on the icon corner. */
-.adopt-row.is-active .adopt-row-icon::after {
-  content: "";
-  position: absolute;
-  right: -3px;
-  bottom: -3px;
-  width: 10px;
-  height: 10px;
-  border-radius: 50%;
-  background: var(--green);
-  border: 2px solid var(--bg-elev);
-}
-/* Soft presence pulse — a ring expanding off the dot. Opacity-animated on
-   its own layer so it stays GPU-cheap even with a dozen live rows (the old
-   box-shadow pulse pegged the paint thread). */
-.adopt-row.is-active .adopt-row-icon::before {
-  content: "";
-  position: absolute;
-  right: -1px;
-  bottom: -1px;
-  width: 6px;
-  height: 6px;
-  border-radius: 50%;
-  border: 1px solid var(--green);
-  opacity: 0;
-  animation: adopt-live-pulse 1.9s ease-in-out infinite;
-  pointer-events: none;
-  z-index: 1;
-}
-@keyframes adopt-live-pulse {
-  0%   { opacity: 0.55; transform: scale(0.8); }
-  70%, 100% { opacity: 0; transform: scale(2.6); }
-}
-.adopt-row-main { flex: 1 1 auto; min-width: 0; }
-.adopt-row-title {
-  font-size: 13px;
-  color: var(--ink);
-  font-weight: 500;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  line-height: 1.35;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-.adopt-row-untitled { color: var(--ink-faint); font-weight: 400; font-style: italic; }
-/* Minimal caption next to the title — the dot carries the signal, this
-   just names it. No pill, no border, no ring. */
-.adopt-row-live {
-  flex: 0 0 auto;
-  font-size: 10px;
-  font-weight: 600;
-  letter-spacing: 0.05em;
-  text-transform: uppercase;
-  color: var(--green);
-  cursor: default;
-}
-
-/* Footer pagination (rendered into .modal-foot): ‹ Prev · X–Y of Z · Next ›.
-   The flex:1 info pushes the two buttons to the edges and centres the count. */
-.adopt-pager-info {
-  flex: 1;
-  text-align: center;
-  font-size: 12px;
-  color: var(--ink-muted);
-  font-variant-numeric: tabular-nums;
-}
-.adopt-pager-btn { min-width: 78px; gap: 4px; }
-.adopt-pager-btn svg { width: 13px; height: 13px; }
-.adopt-row-meta {
-  display: flex;
-  align-items: center;
-  font-size: 11px;
-  color: var(--ink-muted);
-  margin-top: 4px;
-  white-space: nowrap;
-  overflow: hidden;
-}
-.adopt-row-path {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  flex: 0 1 auto;
-}
-.adopt-row-dot { margin: 0 8px; color: var(--ink-faint); }
-.adopt-row-id { color: var(--ink-faint); }
-.adopt-row-actions {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  flex: 0 0 auto;
-}
-.adopt-row-btn { padding: 6px 14px; font-size: 12px; }
-.adopt-row-badge {
-  font-size: 11px;
-  color: var(--ink-muted);
-  padding: 5px 12px;
-  border-radius: 999px;
-  background: var(--bg);
-  border: 1px solid var(--border);
-}
-
 /* ── Remote page ──────────────────────────────────────────────────
    Uses the existing .settings-scroll + Section + .config-grid + .field
    + .chip system from ConfigurePage. Only adds the bits that don't

package/public/js/api.js

@@ -100,6 +100,8 @@ export async function updateCli(id, patch) {
     clis: (cfg.clis || []).map((c) => c.id === id ? {
       ...c, ...patch,
       args: toArr(patch.args, c.args),
+      resumeLatestArgs: toArr(patch.resumeLatestArgs, c.resumeLatestArgs),
+      resumePickerArgs: toArr(patch.resumePickerArgs, c.resumePickerArgs),
       shell: ['direct', 'pwsh', 'cmd'].includes(patch.shell ?? c.shell) ? (patch.shell ?? c.shell) : 'direct',
     } : c),
   };
@@ -158,7 +160,7 @@ export async function setDefaultCli(id) {
 
 // Add a new CLI to config.clis and return its id. Generates a fresh id
 // from the command name + an integer suffix when collisions exist.
-export async function createCli({ name, command, args, shell, type }) {
+export async function createCli({ name, command, args, resumeLatestArgs, resumePickerArgs, shell, type }) {
   const cfg = S.config.value || (await api('GET', '/api/config'));
   const base = (name || command || 'cli').toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '') || 'cli';
   let id = base, n = 1;
@@ -171,6 +173,8 @@ export async function createCli({ name, command, args, shell, type }) {
       name: (name || command || id).trim(),
       command: (command || '').trim(),
       args: toArr(args),
+      resumeLatestArgs: toArr(resumeLatestArgs),
+      resumePickerArgs: toArr(resumePickerArgs),
       shell: ['direct', 'pwsh', 'cmd'].includes(shell) ? shell : 'direct',
       type: ['claude', 'codex', 'copilot', 'other'].includes(type) ? type : 'other',
     }],
@@ -340,32 +344,6 @@ export async function refreshAll() {
   S.lastRefreshAt.value = Date.now();
 }
 
-// List existing CLI sessions discovered on disk for a given cli type.
-// Paginated: page 0 returns all currently-active sessions + the first
-// `limit` non-active (sorted mtime desc). Subsequent pages return the
-// next slice of non-active sessions.
-// Returns { sessions, totalActive, totalNonActive, total, offset, limit, hasMore }.
-export async function listLocalCliSessions(cliType, { offset = 0, limit = 30 } = {}) {
-  const qs = `offset=${offset}&limit=${limit}`;
-  const r = await api('GET', `/api/cli-sessions/${cliType}?${qs}`);
-  return {
-    sessions: r.sessions || [],
-    totalActive: r.totalActive ?? 0,
-    totalNonActive: r.totalNonActive ?? 0,
-    total: r.total ?? (r.sessions?.length || 0),
-    offset: r.offset ?? offset,
-    limit: r.limit ?? limit,
-    hasMore: !!r.hasMore,
-  };
-}
-
-// Adopt an existing upstream CLI session into ccsm. Returns the created
-// (or existing) persistedSessions record.
-export async function adoptSession({ cliId, cliSessionId, cwd, title, folderId }) {
-  const r = await api('POST', '/api/sessions/adopt', { cliId, cliSessionId, cwd, title, folderId });
-  return r;
-}
-
 export async function restartBackend() {
   return api('POST', '/api/restart');
 }

package/public/js/components/EntityFormModal.js

@@ -29,9 +29,9 @@ export function EntityFormModal({
   // A field is read-only if its key is in the static `readOnlyKeys`
   // prop OR its own `readOnly` predicate (called with the current
   // draft) returns true. The predicate lets a field react to other
-  // fields' values — e.g. lock newSessionIdArgs once a known `type`
+  // fields' values — e.g. lock known CLI resume args once a `type`
   // is picked, since those args are an integration contract with the
-  // upstream CLI, not a user knob.
+  // upstream CLI, not a regular launch arg.
   const isReadOnly = (field) => {
     if (readOnlyKeys.includes(field.key)) return true;
     if (typeof field.readOnly === 'function') {

package/public/js/pages/ConfigurePage.js

@@ -27,7 +27,7 @@ import { useDragSort } from '../components/useDragSort.js';
 import { IconPlus, IconPencil, IconClose, IconTerminal, IconFolder, IconBranch, IconRefresh, IconChevronUp, IconChevronDown, IconForCliType, IconClaudeColor, IconCodexColor, IconCopilotColor, IconSun, IconMoon, IconMonitor } from '../icons.js';
 import { parseArgs, formatArgs } from '../util.js';
 
-// Tokenize the three free-form args fields into string[] before they hit
+// Tokenize the free-form args fields into string[] before they hit
 // the backend. Form values arrive as strings (text inputs) — backend
 // stores arrays. parseArgs handles shell-style quoting so users can type
 // `-Model "claude-opus-4-8"` or `-Path 'C:\some dir\bin'` and get sane
@@ -37,18 +37,18 @@ function tokenizeCliArgs(v) {
   return {
     ...v,
     args:             tok(v.args),
-    resumeIdArgs:     tok(v.resumeIdArgs),
-    newSessionIdArgs: tok(v.newSessionIdArgs),
+    resumeLatestArgs: tok(v.resumeLatestArgs),
+    resumePickerArgs: tok(v.resumePickerArgs),
   };
 }
 
-// Type → smart defaults. Choosing a type in the form auto-fills resumeArgs
+// Type → smart defaults. Choosing a type in the form auto-fills resume args
 // (and command if blank) so users don't need to remember the per-CLI flag.
 const CLI_TYPE_DEFAULTS = {
-  claude:  { command: 'claude',  resumeIdArgs: '--resume <id>', newSessionIdArgs: '--session-id <id>' },
-  codex:   { command: 'codex',   resumeIdArgs: 'resume <id>',   newSessionIdArgs: 'resume <id>' },
-  copilot: { command: 'copilot', resumeIdArgs: '--session-id <id>', newSessionIdArgs: '--session-id <id>' },
-  other:   { resumeIdArgs: '', newSessionIdArgs: '' },
+  claude:  { command: 'claude',  resumeLatestArgs: '--continue',    resumePickerArgs: '--resume' },
+  codex:   { command: 'codex',   resumeLatestArgs: 'resume --last', resumePickerArgs: 'resume' },
+  copilot: { command: 'copilot', resumeLatestArgs: '--continue',    resumePickerArgs: '--resume' },
+  other:   { resumeLatestArgs: '', resumePickerArgs: '' },
 };
 
 function cliFieldsFor({ creating } = {}) {
@@ -60,8 +60,8 @@ function cliFieldsFor({ creating } = {}) {
       { value: 'other',   label: 'Other',          icon: html`<${IconTerminal} />` },
     ],
       // Type-change side effects. For known types we force the
-      // integration args (newSessionIdArgs / resumeIdArgs) to the
-      // canonical template — those fields are locked anyway so
+      // folder-level resume args to the canonical template — those
+      // fields are locked anyway so
       // there's no value in leaving stale strings around. For
       // type='other' we leave existing args alone so the user can
       // keep editing them. Name + command are only prefilled when
@@ -71,8 +71,8 @@ function cliFieldsFor({ creating } = {}) {
         if (!d) return null;
         const patch = {};
         if (v !== 'other') {
-          patch.resumeIdArgs = d.resumeIdArgs;
-          patch.newSessionIdArgs = d.newSessionIdArgs;
+          patch.resumeLatestArgs = d.resumeLatestArgs;
+          patch.resumePickerArgs = d.resumePickerArgs;
         }
         if (creating) {
           if (!next.command || !next.command.trim()) patch.command = d.command || '';
@@ -90,20 +90,16 @@ function cliFieldsFor({ creating } = {}) {
     { key: 'command', label: 'Command', mono: true, placeholder: 'claude / codex / ...', required: true },
     { key: 'args', label: 'Args', mono: true, placeholder: '',
       hint: 'Used on every launch. Shell-style quoting: -Model "claude-opus-4-8" or -Path \'C:\\some dir\\bin\'.' },
-    { key: 'newSessionIdArgs', label: 'New session id args', mono: true, placeholder: '--session-id <id>',
-      // Lock for known types — those args are an integration contract
-      // with the upstream CLI, not a user knob. Only Type=Other allows
-      // a custom value (for hand-rolled CLIs ccsm doesn't ship a
-      // template for).
+    { key: 'resumeLatestArgs', label: 'Resume latest args', mono: true, placeholder: '--continue',
       readOnly: (d) => d.type && d.type !== 'other',
       hint: (d) => d.type && d.type !== 'other'
         ? `Locked to the canonical flags for ${d.type}. Change Type to "Other" to override.`
-        : 'ccsm pre-generates a UUID and substitutes it for <id> on first launch — the upstream CLI session id is known immediately.' },
-    { key: 'resumeIdArgs', label: 'Resume by id args', mono: true, placeholder: '--resume <id>',
+        : 'Used when Resume behavior is set to latest.' },
+    { key: 'resumePickerArgs', label: 'Resume picker args', mono: true, placeholder: '--resume',
       readOnly: (d) => d.type && d.type !== 'other',
       hint: (d) => d.type && d.type !== 'other'
         ? `Locked to the canonical flags for ${d.type}. Change Type to "Other" to override.`
-        : 'Used on every resume. Substitutes <id> with the captured session UUID.' },
+        : 'Used when Resume behavior is set to picker.' },
     { key: 'shell', label: 'Shell', type: 'select', default: 'direct', options: [
       { value: 'direct', label: 'direct (real .exe / .cmd)' },
       { value: 'pwsh',   label: 'pwsh (PowerShell aliases & functions)' },
@@ -157,7 +153,7 @@ export function ConfigurePage() {
       setGeneral({
         workDir: cfg.workDir,
         editor: cfg.editor,
-        reserveWorkspacesForStoppedSessions: !!cfg.reserveWorkspacesForStoppedSessions,
+        resumeMode: cfg.resumeMode === 'picker' ? 'picker' : 'latest',
       });
     }
   }, [cfg]);
@@ -172,7 +168,7 @@ export function ConfigurePage() {
         ...cfg,
         workDir: (merged.workDir || '').trim(),
         editor: (merged.editor || '').trim(),
-        reserveWorkspacesForStoppedSessions: !!merged.reserveWorkspacesForStoppedSessions,
+        resumeMode: merged.resumeMode === 'picker' ? 'picker' : 'latest',
       });
       config.value = saved;
       setToast('saved');
@@ -204,6 +200,21 @@ export function ConfigurePage() {
           <span class="label">Backend</span>
           <${RestartButton} />
         </div>
+        <div class="field">
+          <span class="label">Resume behavior</span>
+          <div class="seg" role="group" aria-label="Resume behavior">
+            ${[
+              { id: 'latest', label: 'Resume latest' },
+              { id: 'picker', label: 'Resume picker' },
+            ].map((o) => html`
+              <button key=${o.id} type="button"
+                      class=${`seg-btn${general.resumeMode === o.id ? ' is-active' : ''}`}
+                      aria-pressed=${general.resumeMode === o.id}
+                      onClick=${() => saveGeneral({ resumeMode: o.id })}>
+                <span>${o.label}</span>
+              </button>`)}
+          </div>
+        </div>
         <label class="field">
           <span class="label">Editor</span>
           <input type="text" class="mono" value=${general.editor || ''}
@@ -214,7 +225,7 @@ export function ConfigurePage() {
       </div>
     </${Section}>
 
-    <${Section} title="CLIs" meta=${html`Built-in entries (<code>claude</code>, <code>codex</code>) auto-probe your PATH.`}>
+    <${Section} title="CLIs" meta=${html`Built-in entries (<code>claude</code>, <code>codex</code>, <code>copilot</code>) auto-probe your PATH.`}>
       <${EntityList}
         kind="cli"
         addLabel="Add CLI"
@@ -308,14 +319,6 @@ export function ConfigurePage() {
           <input type="text" value=${general.workDir}
                  onChange=${(e) => saveGeneral({ workDir: e.target.value })} />
         </label>
-        <label class="field toggle">
-          <input type="checkbox" checked=${!!general.reserveWorkspacesForStoppedSessions}
-                 onChange=${(e) => saveGeneral({ reserveWorkspacesForStoppedSessions: e.target.checked })} />
-          <span class="toggle-text">
-            <span class="label">Reserve stopped sessions</span>
-            <span class="hint">Stopped sessions keep their workspace marked in use until the session is deleted.</span>
-          </span>
-        </label>
       </div>
       <${WorkspaceList} />
     </${Section}>
@@ -342,8 +345,8 @@ export function ConfigurePage() {
         initial=${{
           ...edit.payload,
           args: formatArgs(edit.payload.args),
-          resumeIdArgs: formatArgs(edit.payload.resumeIdArgs),
-          newSessionIdArgs: formatArgs(edit.payload.newSessionIdArgs),
+          resumeLatestArgs: formatArgs(edit.payload.resumeLatestArgs),
+          resumePickerArgs: formatArgs(edit.payload.resumePickerArgs),
         }}
         onClose=${close}
         onTest=${(v) => testCli({ command: v.command, shell: v.shell, type: v.type })}
@@ -434,8 +437,7 @@ function EntityList({ items, onAdd, onEdit, onDelete, onActivate, emptyHint, dnd
 // ── Workspace list ───────────────────────────────────────────────────
 function WorkspaceList() {
   const ws = workspaces.value || [];
-  const reserveStopped = !!config.value?.reserveWorkspacesForStoppedSessions;
-  const inUseBy = reserveStopped ? 'session' : 'running session';
+  const inUseBy = 'session';
   if (ws.length === 0) {
     return html`<div class="entity-empty">No workspaces yet — they're created automatically on launch.</div>`;
   }