@aryacode/dsh-aryacode-polish 0.12.1 → 0.13.1

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [0.13.1] - 2026-10-28
+
+### Added
+
+- **Rename a workspace in place.** The workspace menu opens an input under the search
+  box; Enter (or blurring) sends `workspaces.rename`, Escape abandons it. Renaming to
+  `Work/Client A` is also how a workspace joins a folder.
+
+### Fixed
+
+- `planReorder` ignores ids the Host no longer has, so a saved order that names a
+  deleted workspace cannot shuffle the survivors into the wrong slots.
+
+## [0.13.0] - 2026-10-28
+
+### Added
+
+- **Folders from titles.** A workspace named `Work/Client A` files itself under a
+  collapsible `Work` row, with the folder's session count on the right. The grouping is
+  derived from the label and written nowhere, so renaming the workspace moves it.
+- **Order presets.** The workspace menu can "Remember this order" and later "Restore
+  saved order", which replays the Host's only reorder verb — `insertBefore` — through a
+  pure `planReorder(current, wanted)` plan, stored under
+  `aryacode-polish:workspace-order.v1`.
+
 ## [0.12.1] - 2026-10-28
 
 ### Fixed

package/client/workspace.js

@@ -383,6 +383,79 @@ export function moveBefore(list, movingId, beforeId) {
 }
 
 const LOOK_KEY = 'aryacode-polish:workspace-appearance.v1'
+const ORDER_KEY = 'aryacode-polish:workspace-order.v1'
+
+/**
+ * A workspace whose label carries a path ("Work/Client A") files itself under
+ * "Work". The grouping is purely visual and derived from the title, so nothing is
+ * written to the Host and renaming a workspace is enough to move it between
+ * folders — the same idea as the reference plugin, without its "/" toggle.
+ */
+export function folderKey(workspace) {
+  const label = workspaceLabel(workspace)
+  const cut = label.lastIndexOf('/')
+  if (cut <= 0 || cut === label.length - 1) return undefined
+  return label.slice(0, cut).trim() || undefined
+}
+
+export function readOrder(storage) {
+  try {
+    const store = storage || (typeof localStorage === 'undefined' ? undefined : localStorage)
+    if (!store) return []
+    const raw = store.getItem(ORDER_KEY)
+    if (!raw) return []
+    const parsed = JSON.parse(raw)
+    return Array.isArray(parsed) ? parsed.filter((id) => typeof id === 'string') : []
+  } catch {
+    return []
+  }
+}
+
+export function writeOrder(ids, storage) {
+  try {
+    const store = storage || (typeof localStorage === 'undefined' ? undefined : localStorage)
+    if (!store) return
+    store.setItem(ORDER_KEY, JSON.stringify(Array.isArray(ids) ? ids : []))
+  } catch {
+    /* storage is a convenience here, never a requirement */
+  }
+}
+
+/**
+ * The insertBefore calls that turn one order into another. `insertBefore(moving, before)`
+ * is the only reorder verb the Host offers, so the plan walks the wanted order and moves
+ * each workspace in front of whatever currently sits at that slot.
+ */
+export function planReorder(currentIds, wantedIds) {
+  const current = Array.isArray(currentIds) ? currentIds.slice() : []
+  const ops = []
+  // Only ids the Host still has can move; a saved order that names a deleted
+  // workspace must not shuffle the rest into the wrong slots.
+  const wanted = (Array.isArray(wantedIds) ? wantedIds : []).filter((id) => current.indexOf(id) !== -1)
+  for (let i = 0; i < wanted.length; i += 1) {
+    const id = wanted[i]
+    const from = current.indexOf(id)
+    if (from === -1 || from === i) continue
+    const beforeId = current[i]
+    ops.push({ movingId: id, beforeId })
+    current.splice(from, 1)
+    current.splice(i, 0, id)
+  }
+  return ops
+}
+
+const WS_FOLDER_ROW = {
+  display: 'flex',
+  alignItems: 'center',
+  gap: '5px',
+  padding: '3px 6px 2px',
+  fontSize: 'calc(' + 'var(--dsh-content-font-size-secondary, 13px)' + ' - 2px)',
+  letterSpacing: '0.02em',
+  textTransform: 'uppercase',
+  color: 'var(--dsw-alias-label-tertiary, #61666b)',
+  cursor: 'pointer',
+  userSelect: 'none',
+}
 
 export const TONE_ORDER = ['slate', 'blue', 'green', 'amber', 'rose', 'violet']
 
@@ -524,6 +597,22 @@ export function BetterWorkspace(props) {
   const [drag, setDrag] = React.useState(null)
   const [dropping, setDropping] = React.useState(null)
   const [look, setLook] = React.useState(() => readAppearance())
+  const [folders, setFolders] = React.useState({})
+  const [renaming, setRenaming] = React.useState(null)
+  const commitRename = async () => {
+    const draft = renaming
+    setRenaming(null)
+    if (!draft || !services.renameWorkspace) return
+    const title = String(draft.value || '').trim()
+    if (title === '' || title === draft.label) return
+    try {
+      await services.renameWorkspace(draft.workspaceId, title)
+      setNotice('Renamed to ' + title + '.')
+    } catch {
+      setNotice('Could not rename that workspace.')
+    }
+  }
+  const [savedOrder, setSavedOrder] = React.useState(() => readOrder())
   const paintLook = (workspaceId, patch) => {
     setLook((prev) => {
       const next = withAppearance(prev, workspaceId, patch)
@@ -545,7 +634,12 @@ export function BetterWorkspace(props) {
   )
   const allRows = workspaceRows(workspaceList, sessionList)
   const rows = filterTree(allRows, query, pinned)
-  const walk = flattenRows(rows, expanded, query)
+  const folderOf = (workspace) => folderKey(workspace)
+  const visibleRows = rows.filter((group) => {
+    const key = folderOf(group.workspace)
+    return key === undefined || folders[key] !== true
+  })
+  const walk = flattenRows(visibleRows, expanded, query)
   const runtime = React.useMemo(() => menuRuntime(ctx, slots, standard), [ctx, slots, standard.wide])
   const RowBoundary = React.useMemo(() => rowBoundary(), [])
   const entries = React.useMemo(() => rowMenuEntries(slots), [slots, workspaceList.length, sessionList.length])
@@ -672,6 +766,47 @@ export function BetterWorkspace(props) {
           try { await navigator.clipboard.writeText(menu.workspace.path) } catch {}
         },
       }, 'Copy path'),
+      React.createElement('button', {
+        type: 'button',
+        'data-polish-ws-rename': 'open',
+        style: WS_MENU_ITEM,
+        onClick: () => {
+          const workspace = menu.workspace
+          closeMenu()
+          setNotice('')
+          setRenaming({ workspaceId: workspace.workspaceId, label: workspaceLabel(workspace), value: workspaceLabel(workspace) })
+        },
+      }, 'Rename workspace…'),
+      React.createElement('button', {
+        type: 'button',
+        'data-polish-order': 'remember',
+        style: WS_MENU_ITEM,
+        onClick: () => {
+          closeMenu()
+          const ids = workspaceList.map((workspace) => workspace.workspaceId)
+          writeOrder(ids)
+          setSavedOrder(ids)
+          setNotice('Order saved.')
+        },
+      }, 'Remember this order'),
+      savedOrder.length === 0
+        ? null
+        : React.createElement('button', {
+          type: 'button',
+          'data-polish-order': 'restore',
+          style: WS_MENU_ITEM,
+          onClick: async () => {
+            closeMenu()
+            const ops = planReorder(workspaceList.map((workspace) => workspace.workspaceId), savedOrder)
+            if (ops.length === 0) { setNotice('Already in the saved order.'); return }
+            try {
+              for (const op of ops) await services.reorderWorkspace(op.movingId, op.beforeId)
+              setNotice('Order restored.')
+            } catch {
+              setNotice('Could not restore that order.')
+            }
+          },
+        }, 'Restore saved order'),
       React.createElement('button', {
         type: 'button',
         'data-polish-ws-appearance': 'open',
@@ -808,6 +943,26 @@ export function BetterWorkspace(props) {
     }))
   }
 
+  if (renaming) {
+    children.push(React.createElement('input', {
+      key: 'rename',
+      'data-polish-ws-rename-input': 'true',
+      autoFocus: true,
+      value: renaming.value,
+      placeholder: 'Workspace name (use Work/Name to file it)',
+      'aria-label': 'Workspace name',
+      style: WS_FILTER,
+      onChange: (event) => setRenaming(Object.assign({}, renaming, { value: event.target.value })),
+      onKeyDown: (event) => {
+        if (event.key === 'Escape') { event.stopPropagation(); setRenaming(null); return }
+        if (event.key !== 'Enter') return
+        event.preventDefault()
+        void commitRename()
+      },
+      onBlur: () => { void commitRename() },
+    }))
+  }
+
   if (rows.length === 0) {
     children.push(React.createElement('div', {
       key: 'empty',
@@ -816,14 +971,82 @@ export function BetterWorkspace(props) {
   }
 
   let index = -1
+  const announced = {}
+
+  const sessionRow = (workspace, row, groupIndex) => {
+    const rowFocused = cursor === groupIndex
+    const rowHovered = hover === 'session:' + row.id
+    const lifted = dropping === 'session:' + row.id
+    return React.createElement('div', {
+      key: 'session:' + row.id,
+      'data-polish-ws-session': row.id,
+      draggable: true,
+      style: Object.assign({}, WS_ROW, {
+        paddingLeft: '24px',
+        opacity: drag && drag.kind === 'session' && drag.id === row.id ? 0.5 : undefined,
+        background: lifted
+          ? 'var(--dsw-alias-interactive-bg-hover, rgba(0, 0, 0, 0.05))'
+          : (rowFocused ? 'var(--dsw-alias-interactive-bg-hover, rgba(0, 0, 0, 0.04))' : undefined),
+        boxShadow: rowFocused ? 'inset 0 0 0 1px var(--dsw-alias-border-l2, rgba(0, 0, 0, 0.12))' : undefined,
+      }),
+      onClick: () => services.openSession(row.id),
+      onContextMenu: (event) => openMenu(event, row, workspace),
+      onMouseEnter: () => setHover('session:' + row.id),
+      onMouseLeave: () => setHover(null),
+      onDragStart: () => setDrag({ kind: 'session', id: row.id, workspaceId: workspace.workspaceId }),
+      onDragOver: (event) => {
+        if (!drag || drag.kind !== 'session' || drag.id === row.id) return
+        event.preventDefault()
+        setDropping('session:' + row.id)
+      },
+      onDragLeave: () => setDropping(null),
+      onDrop: (event) => { event.preventDefault(); dropOnSession(workspace.workspaceId, row.id) },
+    },
+    row.running ? React.createElement('span', { style: WS_DOT, title: 'Running' }) : null,
+    pinned.has(row.id) ? React.createElement('span', { style: WS_PIN, title: 'Pinned' }, '\u2605') : null,
+    React.createElement('span', { style: WS_TITLE }, row.displayTitle || row.id),
+    rowHovered || rowFocused
+      ? React.createElement('button', {
+        type: 'button',
+        'data-polish-ws-menu': 'session',
+        'aria-label': 'Session menu',
+        style: WS_ROW_ACTION,
+        onClick: (event) => openMenu(event, row, workspace),
+      }, React.createElement(DotsGlyph))
+      : null)
+  }
+
   rows.forEach((group) => {
     const workspace = group.workspace
     const sessions = group.sessions
+    const folder = folderOf(workspace)
+    const folded = folder !== undefined && folders[folder] === true
+
+    if (folder !== undefined && !announced[folder]) {
+      announced[folder] = true
+      const inside = rows.filter((entry) => folderOf(entry.workspace) === folder)
+      children.push(React.createElement('div', {
+        key: 'folder:' + folder,
+        'data-polish-ws-folder': folder,
+        role: 'group',
+        'aria-label': folder,
+        title: folded ? 'Expand ' + folder : 'Collapse ' + folder,
+        style: WS_FOLDER_ROW,
+        onClick: () => setFolders((prev) => Object.assign({}, prev, { [folder]: prev[folder] !== true })),
+      },
+      React.createElement('span', { 'aria-hidden': 'true' }, folded ? '›' : '⌄'),
+      React.createElement('span', { style: WS_TITLE }, folder),
+      React.createElement('span', { style: WS_COUNT }, String(inside.reduce((sum, entry) => sum + entry.sessions.length, 0)))))
+    }
+
+    if (folded) return
+
     index += 1
     const open = expanded[workspace.workspaceId] !== false
     const focused = cursor === index
     const hovered = hover === 'workspace:' + workspace.workspaceId
     const dropHere = dropping === 'workspace:' + workspace.workspaceId
+    const looks = appearanceOf(look, workspace.workspaceId)
 
     children.push(React.createElement('div', {
       key: 'workspace:' + workspace.workspaceId,
@@ -855,15 +1078,11 @@ export function BetterWorkspace(props) {
     },
     React.createElement(CaretGlyph, { open }),
     React.createElement(FolderGlyph),
-    look[workspace.workspaceId] && appearanceOf(look, workspace.workspaceId).tone
-      ? React.createElement('span', {
-        style: Object.assign({}, WS_TONE, { background: TONE_COLOR[appearanceOf(look, workspace.workspaceId).tone] }),
-      })
+    looks.tone
+      ? React.createElement('span', { style: Object.assign({}, WS_TONE, { background: TONE_COLOR[looks.tone] }) })
       : null,
     React.createElement('span', {
-      style: Object.assign({}, WS_TITLE, {
-        fontWeight: appearanceOf(look, workspace.workspaceId).strong ? 600 : undefined,
-      }),
+      style: Object.assign({}, WS_TITLE, { fontWeight: looks.strong ? 600 : undefined }),
     }, workspaceLabel(workspace)),
     React.createElement('span', { style: WS_COUNT }, String(sessions.length)),
     hovered || focused
@@ -879,46 +1098,7 @@ export function BetterWorkspace(props) {
     if (open) {
       sessions.forEach((row) => {
         index += 1
-        const rowFocused = cursor === index
-        const rowHovered = hover === 'session:' + row.id
-        const lifted = dropping === 'session:' + row.id
-        children.push(React.createElement('div', {
-          key: 'session:' + row.id,
-          'data-polish-ws-session': row.id,
-          draggable: true,
-          style: Object.assign({}, WS_ROW, {
-            paddingLeft: '24px',
-            opacity: drag && drag.kind === 'session' && drag.id === row.id ? 0.5 : undefined,
-            background: lifted
-              ? 'var(--dsw-alias-interactive-bg-hover, rgba(0, 0, 0, 0.05))'
-              : (rowFocused ? 'var(--dsw-alias-interactive-bg-hover, rgba(0, 0, 0, 0.04))' : undefined),
-            boxShadow: rowFocused ? 'inset 0 0 0 1px var(--dsw-alias-border-l2, rgba(0, 0, 0, 0.12))' : undefined,
-          }),
-          onClick: () => services.openSession(row.id),
-          onContextMenu: (event) => openMenu(event, row, workspace),
-          onMouseEnter: () => setHover('session:' + row.id),
-          onMouseLeave: () => setHover(null),
-          onDragStart: () => setDrag({ kind: 'session', id: row.id, workspaceId: workspace.workspaceId }),
-          onDragOver: (event) => {
-            if (!drag || drag.kind !== 'session' || drag.id === row.id) return
-            event.preventDefault()
-            setDropping('session:' + row.id)
-          },
-          onDragLeave: () => setDropping(null),
-          onDrop: (event) => { event.preventDefault(); dropOnSession(workspace.workspaceId, row.id) },
-        },
-        row.running ? React.createElement('span', { style: WS_DOT, title: 'Running' }) : null,
-        pinned.has(row.id) ? React.createElement('span', { style: WS_PIN, title: 'Pinned' }, '\u2605') : null,
-        React.createElement('span', { style: WS_TITLE }, row.displayTitle || row.id),
-        rowHovered || rowFocused
-          ? React.createElement('button', {
-            type: 'button',
-            'data-polish-ws-menu': 'session',
-            'aria-label': 'Session menu',
-            style: WS_ROW_ACTION,
-            onClick: (event) => openMenu(event, row, workspace),
-          }, React.createElement(DotsGlyph))
-          : null))
+        children.push(sessionRow(workspace, row, index))
       })
     }
   })
@@ -1071,6 +1251,7 @@ export function installWorkspaceSeat(ctx, configForms, extras = {}) {
             reorderWorkspace: (movingId, beforeId) => seated.workspaces.insertBefore(movingId, beforeId),
             reorderSession: (workspaceId, movingId, beforeId) => seated.workspaces.insertSessionBefore(workspaceId, movingId, beforeId),
             removeWorkspace: (id) => seated.workspaces.delete(id),
+            renameWorkspace: (id, title) => seated.workspaces.rename(id, title),
             openFolder: async (path) => {
               const answer = await seated.remote.session.openWorkspacePath({ path })
               if (answer && answer.ok === false) throw new Error('cannot open the folder')

package/docs/better-workspace.md

@@ -114,3 +114,23 @@ switch. The slot hands over `{ open, anchorRef, selectedId, onPick, onClose }`:
 is portalled to the anchor's bottom-left only while `open` is true (an unconditional
 list floated over the Hero copy), it shows the same tone dots and bold labels as the
 sidebar, and picking a row calls `onPick(workspaceId)` then `onClose()`.
+
+## Folders from titles
+
+A workspace whose label carries a path files itself under the prefix: rename
+`Alpha` to `Work/Alpha` (workspace menu → **Rename workspace…**) and a collapsible
+`WORK` row appears, carrying the session count of everything filed inside it. The
+group is derived on every render from `folderKey(workspace)` — nothing is written to the
+Host, nothing is cached, and renaming the workspace out of the prefix puts it back in
+the flat list. `folderKey` refuses a leading slash, a trailing slash and a bare label, so
+ordinary names never grow a folder.
+
+## Order presets
+
+**Remember this order** stores the current workspace ids under
+`aryacode-polish:workspace-order.v1`; **Restore saved order** replays them. The Host
+offers exactly one reorder verb (`insertBefore(movingId, beforeId)`), so restoring is
+`planReorder(current, wanted)` — a pure function that walks the wanted order and emits
+one move per workspace that sits in the wrong slot. Ids the Host no longer has are
+filtered out first, so a preset that names a deleted workspace cannot shuffle the
+survivors into the wrong places.

package/lib/client.js

@@ -53,7 +53,7 @@ window.__ModuleLoader__.load({
     ]
     const ROW_ID = "polish"
     const ROW_KEY = "@aryacode/dsh-aryacode-polish" + '#' + ROW_ID
-    const CLIENT_VERSION = "0.12.1"
+    const CLIENT_VERSION = "0.13.1"
 
 /* html2canvas 1.4.1 — MIT, vendored from vendor/html2canvas.min.js.
  * A UMD build, so it assigns itself to globalThis; face.js reads it lazily. */
@@ -584,6 +584,79 @@ window.__ModuleLoader__.load({
     }
 
     const LOOK_KEY = 'aryacode-polish:workspace-appearance.v1'
+    const ORDER_KEY = 'aryacode-polish:workspace-order.v1'
+
+    /**
+     * A workspace whose label carries a path ("Work/Client A") files itself under
+     * "Work". The grouping is purely visual and derived from the title, so nothing is
+     * written to the Host and renaming a workspace is enough to move it between
+     * folders — the same idea as the reference plugin, without its "/" toggle.
+     */
+    function folderKey(workspace) {
+      const label = workspaceLabel(workspace)
+      const cut = label.lastIndexOf('/')
+      if (cut <= 0 || cut === label.length - 1) return undefined
+      return label.slice(0, cut).trim() || undefined
+    }
+
+    function readOrder(storage) {
+      try {
+        const store = storage || (typeof localStorage === 'undefined' ? undefined : localStorage)
+        if (!store) return []
+        const raw = store.getItem(ORDER_KEY)
+        if (!raw) return []
+        const parsed = JSON.parse(raw)
+        return Array.isArray(parsed) ? parsed.filter((id) => typeof id === 'string') : []
+      } catch {
+        return []
+      }
+    }
+
+    function writeOrder(ids, storage) {
+      try {
+        const store = storage || (typeof localStorage === 'undefined' ? undefined : localStorage)
+        if (!store) return
+        store.setItem(ORDER_KEY, JSON.stringify(Array.isArray(ids) ? ids : []))
+      } catch {
+        /* storage is a convenience here, never a requirement */
+      }
+    }
+
+    /**
+     * The insertBefore calls that turn one order into another. `insertBefore(moving, before)`
+     * is the only reorder verb the Host offers, so the plan walks the wanted order and moves
+     * each workspace in front of whatever currently sits at that slot.
+     */
+    function planReorder(currentIds, wantedIds) {
+      const current = Array.isArray(currentIds) ? currentIds.slice() : []
+      const ops = []
+      // Only ids the Host still has can move; a saved order that names a deleted
+      // workspace must not shuffle the rest into the wrong slots.
+      const wanted = (Array.isArray(wantedIds) ? wantedIds : []).filter((id) => current.indexOf(id) !== -1)
+      for (let i = 0; i < wanted.length; i += 1) {
+        const id = wanted[i]
+        const from = current.indexOf(id)
+        if (from === -1 || from === i) continue
+        const beforeId = current[i]
+        ops.push({ movingId: id, beforeId })
+        current.splice(from, 1)
+        current.splice(i, 0, id)
+      }
+      return ops
+    }
+
+    const WS_FOLDER_ROW = {
+      display: 'flex',
+      alignItems: 'center',
+      gap: '5px',
+      padding: '3px 6px 2px',
+      fontSize: 'calc(' + 'var(--dsh-content-font-size-secondary, 13px)' + ' - 2px)',
+      letterSpacing: '0.02em',
+      textTransform: 'uppercase',
+      color: 'var(--dsw-alias-label-tertiary, #61666b)',
+      cursor: 'pointer',
+      userSelect: 'none',
+    }
 
     const TONE_ORDER = ['slate', 'blue', 'green', 'amber', 'rose', 'violet']
 
@@ -725,6 +798,22 @@ window.__ModuleLoader__.load({
       const [drag, setDrag] = React.useState(null)
       const [dropping, setDropping] = React.useState(null)
       const [look, setLook] = React.useState(() => readAppearance())
+      const [folders, setFolders] = React.useState({})
+      const [renaming, setRenaming] = React.useState(null)
+      const commitRename = async () => {
+        const draft = renaming
+        setRenaming(null)
+        if (!draft || !services.renameWorkspace) return
+        const title = String(draft.value || '').trim()
+        if (title === '' || title === draft.label) return
+        try {
+          await services.renameWorkspace(draft.workspaceId, title)
+          setNotice('Renamed to ' + title + '.')
+        } catch {
+          setNotice('Could not rename that workspace.')
+        }
+      }
+      const [savedOrder, setSavedOrder] = React.useState(() => readOrder())
       const paintLook = (workspaceId, patch) => {
         setLook((prev) => {
           const next = withAppearance(prev, workspaceId, patch)
@@ -746,7 +835,12 @@ window.__ModuleLoader__.load({
       )
       const allRows = workspaceRows(workspaceList, sessionList)
       const rows = filterTree(allRows, query, pinned)
-      const walk = flattenRows(rows, expanded, query)
+      const folderOf = (workspace) => folderKey(workspace)
+      const visibleRows = rows.filter((group) => {
+        const key = folderOf(group.workspace)
+        return key === undefined || folders[key] !== true
+      })
+      const walk = flattenRows(visibleRows, expanded, query)
       const runtime = React.useMemo(() => menuRuntime(ctx, slots, standard), [ctx, slots, standard.wide])
       const RowBoundary = React.useMemo(() => rowBoundary(), [])
       const entries = React.useMemo(() => rowMenuEntries(slots), [slots, workspaceList.length, sessionList.length])
@@ -873,6 +967,47 @@ window.__ModuleLoader__.load({
               try { await navigator.clipboard.writeText(menu.workspace.path) } catch {}
             },
           }, 'Copy path'),
+          React.createElement('button', {
+            type: 'button',
+            'data-polish-ws-rename': 'open',
+            style: WS_MENU_ITEM,
+            onClick: () => {
+              const workspace = menu.workspace
+              closeMenu()
+              setNotice('')
+              setRenaming({ workspaceId: workspace.workspaceId, label: workspaceLabel(workspace), value: workspaceLabel(workspace) })
+            },
+          }, 'Rename workspace…'),
+          React.createElement('button', {
+            type: 'button',
+            'data-polish-order': 'remember',
+            style: WS_MENU_ITEM,
+            onClick: () => {
+              closeMenu()
+              const ids = workspaceList.map((workspace) => workspace.workspaceId)
+              writeOrder(ids)
+              setSavedOrder(ids)
+              setNotice('Order saved.')
+            },
+          }, 'Remember this order'),
+          savedOrder.length === 0
+            ? null
+            : React.createElement('button', {
+              type: 'button',
+              'data-polish-order': 'restore',
+              style: WS_MENU_ITEM,
+              onClick: async () => {
+                closeMenu()
+                const ops = planReorder(workspaceList.map((workspace) => workspace.workspaceId), savedOrder)
+                if (ops.length === 0) { setNotice('Already in the saved order.'); return }
+                try {
+                  for (const op of ops) await services.reorderWorkspace(op.movingId, op.beforeId)
+                  setNotice('Order restored.')
+                } catch {
+                  setNotice('Could not restore that order.')
+                }
+              },
+            }, 'Restore saved order'),
           React.createElement('button', {
             type: 'button',
             'data-polish-ws-appearance': 'open',
@@ -1009,6 +1144,26 @@ window.__ModuleLoader__.load({
         }))
       }
 
+      if (renaming) {
+        children.push(React.createElement('input', {
+          key: 'rename',
+          'data-polish-ws-rename-input': 'true',
+          autoFocus: true,
+          value: renaming.value,
+          placeholder: 'Workspace name (use Work/Name to file it)',
+          'aria-label': 'Workspace name',
+          style: WS_FILTER,
+          onChange: (event) => setRenaming(Object.assign({}, renaming, { value: event.target.value })),
+          onKeyDown: (event) => {
+            if (event.key === 'Escape') { event.stopPropagation(); setRenaming(null); return }
+            if (event.key !== 'Enter') return
+            event.preventDefault()
+            void commitRename()
+          },
+          onBlur: () => { void commitRename() },
+        }))
+      }
+
       if (rows.length === 0) {
         children.push(React.createElement('div', {
           key: 'empty',
@@ -1017,14 +1172,82 @@ window.__ModuleLoader__.load({
       }
 
       let index = -1
+      const announced = {}
+
+      const sessionRow = (workspace, row, groupIndex) => {
+        const rowFocused = cursor === groupIndex
+        const rowHovered = hover === 'session:' + row.id
+        const lifted = dropping === 'session:' + row.id
+        return React.createElement('div', {
+          key: 'session:' + row.id,
+          'data-polish-ws-session': row.id,
+          draggable: true,
+          style: Object.assign({}, WS_ROW, {
+            paddingLeft: '24px',
+            opacity: drag && drag.kind === 'session' && drag.id === row.id ? 0.5 : undefined,
+            background: lifted
+              ? 'var(--dsw-alias-interactive-bg-hover, rgba(0, 0, 0, 0.05))'
+              : (rowFocused ? 'var(--dsw-alias-interactive-bg-hover, rgba(0, 0, 0, 0.04))' : undefined),
+            boxShadow: rowFocused ? 'inset 0 0 0 1px var(--dsw-alias-border-l2, rgba(0, 0, 0, 0.12))' : undefined,
+          }),
+          onClick: () => services.openSession(row.id),
+          onContextMenu: (event) => openMenu(event, row, workspace),
+          onMouseEnter: () => setHover('session:' + row.id),
+          onMouseLeave: () => setHover(null),
+          onDragStart: () => setDrag({ kind: 'session', id: row.id, workspaceId: workspace.workspaceId }),
+          onDragOver: (event) => {
+            if (!drag || drag.kind !== 'session' || drag.id === row.id) return
+            event.preventDefault()
+            setDropping('session:' + row.id)
+          },
+          onDragLeave: () => setDropping(null),
+          onDrop: (event) => { event.preventDefault(); dropOnSession(workspace.workspaceId, row.id) },
+        },
+        row.running ? React.createElement('span', { style: WS_DOT, title: 'Running' }) : null,
+        pinned.has(row.id) ? React.createElement('span', { style: WS_PIN, title: 'Pinned' }, '\u2605') : null,
+        React.createElement('span', { style: WS_TITLE }, row.displayTitle || row.id),
+        rowHovered || rowFocused
+          ? React.createElement('button', {
+            type: 'button',
+            'data-polish-ws-menu': 'session',
+            'aria-label': 'Session menu',
+            style: WS_ROW_ACTION,
+            onClick: (event) => openMenu(event, row, workspace),
+          }, React.createElement(DotsGlyph))
+          : null)
+      }
+
       rows.forEach((group) => {
         const workspace = group.workspace
         const sessions = group.sessions
+        const folder = folderOf(workspace)
+        const folded = folder !== undefined && folders[folder] === true
+
+        if (folder !== undefined && !announced[folder]) {
+          announced[folder] = true
+          const inside = rows.filter((entry) => folderOf(entry.workspace) === folder)
+          children.push(React.createElement('div', {
+            key: 'folder:' + folder,
+            'data-polish-ws-folder': folder,
+            role: 'group',
+            'aria-label': folder,
+            title: folded ? 'Expand ' + folder : 'Collapse ' + folder,
+            style: WS_FOLDER_ROW,
+            onClick: () => setFolders((prev) => Object.assign({}, prev, { [folder]: prev[folder] !== true })),
+          },
+          React.createElement('span', { 'aria-hidden': 'true' }, folded ? '›' : '⌄'),
+          React.createElement('span', { style: WS_TITLE }, folder),
+          React.createElement('span', { style: WS_COUNT }, String(inside.reduce((sum, entry) => sum + entry.sessions.length, 0)))))
+        }
+
+        if (folded) return
+
         index += 1
         const open = expanded[workspace.workspaceId] !== false
         const focused = cursor === index
         const hovered = hover === 'workspace:' + workspace.workspaceId
         const dropHere = dropping === 'workspace:' + workspace.workspaceId
+        const looks = appearanceOf(look, workspace.workspaceId)
 
         children.push(React.createElement('div', {
           key: 'workspace:' + workspace.workspaceId,
@@ -1056,15 +1279,11 @@ window.__ModuleLoader__.load({
         },
         React.createElement(CaretGlyph, { open }),
         React.createElement(FolderGlyph),
-        look[workspace.workspaceId] && appearanceOf(look, workspace.workspaceId).tone
-          ? React.createElement('span', {
-            style: Object.assign({}, WS_TONE, { background: TONE_COLOR[appearanceOf(look, workspace.workspaceId).tone] }),
-          })
+        looks.tone
+          ? React.createElement('span', { style: Object.assign({}, WS_TONE, { background: TONE_COLOR[looks.tone] }) })
           : null,
         React.createElement('span', {
-          style: Object.assign({}, WS_TITLE, {
-            fontWeight: appearanceOf(look, workspace.workspaceId).strong ? 600 : undefined,
-          }),
+          style: Object.assign({}, WS_TITLE, { fontWeight: looks.strong ? 600 : undefined }),
         }, workspaceLabel(workspace)),
         React.createElement('span', { style: WS_COUNT }, String(sessions.length)),
         hovered || focused
@@ -1080,46 +1299,7 @@ window.__ModuleLoader__.load({
         if (open) {
           sessions.forEach((row) => {
             index += 1
-            const rowFocused = cursor === index
-            const rowHovered = hover === 'session:' + row.id
-            const lifted = dropping === 'session:' + row.id
-            children.push(React.createElement('div', {
-              key: 'session:' + row.id,
-              'data-polish-ws-session': row.id,
-              draggable: true,
-              style: Object.assign({}, WS_ROW, {
-                paddingLeft: '24px',
-                opacity: drag && drag.kind === 'session' && drag.id === row.id ? 0.5 : undefined,
-                background: lifted
-                  ? 'var(--dsw-alias-interactive-bg-hover, rgba(0, 0, 0, 0.05))'
-                  : (rowFocused ? 'var(--dsw-alias-interactive-bg-hover, rgba(0, 0, 0, 0.04))' : undefined),
-                boxShadow: rowFocused ? 'inset 0 0 0 1px var(--dsw-alias-border-l2, rgba(0, 0, 0, 0.12))' : undefined,
-              }),
-              onClick: () => services.openSession(row.id),
-              onContextMenu: (event) => openMenu(event, row, workspace),
-              onMouseEnter: () => setHover('session:' + row.id),
-              onMouseLeave: () => setHover(null),
-              onDragStart: () => setDrag({ kind: 'session', id: row.id, workspaceId: workspace.workspaceId }),
-              onDragOver: (event) => {
-                if (!drag || drag.kind !== 'session' || drag.id === row.id) return
-                event.preventDefault()
-                setDropping('session:' + row.id)
-              },
-              onDragLeave: () => setDropping(null),
-              onDrop: (event) => { event.preventDefault(); dropOnSession(workspace.workspaceId, row.id) },
-            },
-            row.running ? React.createElement('span', { style: WS_DOT, title: 'Running' }) : null,
-            pinned.has(row.id) ? React.createElement('span', { style: WS_PIN, title: 'Pinned' }, '\u2605') : null,
-            React.createElement('span', { style: WS_TITLE }, row.displayTitle || row.id),
-            rowHovered || rowFocused
-              ? React.createElement('button', {
-                type: 'button',
-                'data-polish-ws-menu': 'session',
-                'aria-label': 'Session menu',
-                style: WS_ROW_ACTION,
-                onClick: (event) => openMenu(event, row, workspace),
-              }, React.createElement(DotsGlyph))
-              : null))
+            children.push(sessionRow(workspace, row, index))
           })
         }
       })
@@ -1272,6 +1452,7 @@ window.__ModuleLoader__.load({
                 reorderWorkspace: (movingId, beforeId) => seated.workspaces.insertBefore(movingId, beforeId),
                 reorderSession: (workspaceId, movingId, beforeId) => seated.workspaces.insertSessionBefore(workspaceId, movingId, beforeId),
                 removeWorkspace: (id) => seated.workspaces.delete(id),
+                renameWorkspace: (id, title) => seated.workspaces.rename(id, title),
                 openFolder: async (path) => {
                   const answer = await seated.remote.session.openWorkspacePath({ path })
                   if (answer && answer.ok === false) throw new Error('cannot open the folder')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aryacode/dsh-aryacode-polish",
-  "version": "0.12.1",
+  "version": "0.13.1",
   "description": "AryaCode Polish: one install for the small things that make AryaCode feel finished. One Plugins row, one switch per quality-of-life feature.",
   "keywords": [
     "dsh",