@aryacode/dsh-aryacode-polish 0.11.2 → 0.13.1

package/CHANGELOG.md

@@ -1,5 +1,52 @@
 # 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
+
+- The Hero list now only appears when the workspace chip is open, and it paints a
+  card of its own instead of an unstyled list floating over the Hero copy.
+
+## [0.12.0] - 2026-10-28
+
+### Added
+
+- **Colour and weight per workspace.** Right-click a workspace → "Colour and
+  weight…" paints it one of six tones (slate, blue, green, amber, rose, violet) or
+  none, and can make its label bold. The choice is stored under
+  `aryacode-polish:workspace-appearance` in the app's own storage, so it survives a
+  restart, and a broken or missing store degrades to the plain tree instead of
+  throwing.
+- **The same workspaces in the Hero picker.** The blank-session Hero now offers this
+  bundle's workspace list (tone dots, bold labels, session counts) instead of the
+  stock picker, through `conversation.hero.workspace` at priority -1 — same data,
+  same colours, one switch.
+
 ## [0.11.2] - 2026-10-28
 
 ### Verified

package/client/workspace.js

@@ -382,6 +382,155 @@ export function moveBefore(list, movingId, beforeId) {
   return next
 }
 
+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']
+
+export const TONE_COLOR = {
+  slate: '#8a8f98',
+  blue: '#4a72d0',
+  green: '#2f9e6b',
+  amber: '#c8892f',
+  rose: '#c2496a',
+  violet: '#7a5cc4',
+}
+
+export function appearanceOf(map, workspaceId) {
+  const entry = (map && map[workspaceId]) || {}
+  return {
+    tone: TONE_COLOR[entry.tone] ? entry.tone : undefined,
+    strong: entry.strong === true,
+  }
+}
+
+export function withAppearance(map, workspaceId, patch) {
+  const next = Object.assign({}, map || {})
+  const merged = Object.assign({}, appearanceOf(next, workspaceId), patch || {})
+  if (!merged.tone && merged.strong !== true) delete next[workspaceId]
+  else next[workspaceId] = { tone: merged.tone, strong: merged.strong === true }
+  return next
+}
+
+export function readAppearance(storage) {
+  try {
+    const store = storage || (typeof localStorage === 'undefined' ? undefined : localStorage)
+    if (!store) return {}
+    const raw = store.getItem(LOOK_KEY)
+    if (!raw) return {}
+    const parsed = JSON.parse(raw)
+    return parsed && typeof parsed === 'object' ? parsed : {}
+  } catch {
+    return {}
+  }
+}
+
+export function writeAppearance(map, storage) {
+  try {
+    const store = storage || (typeof localStorage === 'undefined' ? undefined : localStorage)
+    if (!store) return
+    store.setItem(LOOK_KEY, JSON.stringify(map || {}))
+  } catch {
+    /* a locked-down webview must not break the tree */
+  }
+}
+
+const WS_TONE = {
+  flex: 'none',
+  width: '6px',
+  height: '6px',
+  borderRadius: '50%',
+  boxShadow: '0 0 0 2px var(--dsw-alias-bg-base, transparent)',
+}
+
+const WS_SWATCH = {
+  width: '18px',
+  height: '18px',
+  borderRadius: '50%',
+  border: '0.5px solid var(--dsw-alias-border-l2, rgba(0,0,0,0.12))',
+  cursor: 'pointer',
+  padding: 0,
+}
+
+const WS_PAINT_ROW = {
+  display: 'flex',
+  alignItems: 'center',
+  gap: '6px',
+  padding: '6px 8px',
+}
+
 const WS_FILTER = {
   margin: '2px 2px 6px',
   padding: '4px 8px',
@@ -447,6 +596,30 @@ export function BetterWorkspace(props) {
   const [hover, setHover] = React.useState(null)
   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)
+      writeAppearance(next)
+      return next
+    })
+  }
   const filterRef = React.useRef(null)
 
   const workspaceState = useLive(services.workspacesLive)
@@ -461,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])
@@ -588,6 +766,56 @@ 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',
+        style: WS_MENU_ITEM,
+        onClick: () => {
+          const workspace = menu.workspace
+          setMenu({ kind: 'paint', workspace, anchor: menu.anchor })
+        },
+      }, 'Colour and weight…'),
       React.createElement('button', {
         type: 'button',
         style: Object.assign({}, WS_MENU_ITEM, { color: 'var(--dsw-alias-label-error, #d92d20)' }),
@@ -604,6 +832,44 @@ export function BetterWorkspace(props) {
       }, armed && armed === menu.workspace.workspaceId ? 'Remove workspace?' : 'Remove workspace'))
     : null
 
+  const paintMenu = menu && menu.kind === 'paint'
+    ? (() => {
+      const workspace = menu.workspace
+      const current = appearanceOf(look, workspace.workspaceId)
+      return React.createElement(RowMenu, { anchor: menu.anchor, onClose: closeMenu },
+        React.createElement('div', { style: WS_PAINT_ROW },
+          TONE_ORDER.map((tone) => React.createElement('button', {
+            key: tone,
+            type: 'button',
+            'data-polish-tone': tone,
+            'aria-label': 'Colour ' + tone,
+            title: tone,
+            style: Object.assign({}, WS_SWATCH, {
+              background: TONE_COLOR[tone],
+              boxShadow: current.tone === tone
+                ? '0 0 0 1.5px var(--dsw-alias-label-secondary, #61666b)'
+                : undefined,
+            }),
+            onClick: () => paintLook(workspace.workspaceId, { tone }),
+          })),
+          React.createElement('button', {
+            key: 'none',
+            type: 'button',
+            'data-polish-tone': 'none',
+            'aria-label': 'No colour',
+            title: 'No colour',
+            style: Object.assign({}, WS_SWATCH, { background: 'transparent' }),
+            onClick: () => paintLook(workspace.workspaceId, { tone: undefined }),
+          })),
+        React.createElement('button', {
+          type: 'button',
+          'data-polish-ws-strong': current.strong ? 'on' : 'off',
+          style: WS_MENU_ITEM,
+          onClick: () => paintLook(workspace.workspaceId, { strong: !current.strong }),
+        }, current.strong ? 'Weight: bold ✓' : 'Weight: normal'))
+    })()
+    : null
+
   const sessionMenu = menu && menu.kind === 'session'
     ? React.createElement(RowMenu, { anchor: menu.anchor, onClose: closeMenu },
       entries.map((entry, index) => React.createElement(RowBoundary, { key: (entry.options && entry.options.id) || index },
@@ -677,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',
@@ -685,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,
@@ -724,7 +1078,12 @@ export function BetterWorkspace(props) {
     },
     React.createElement(CaretGlyph, { open }),
     React.createElement(FolderGlyph),
-    React.createElement('span', { style: WS_TITLE }, workspaceLabel(workspace)),
+    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: looks.strong ? 600 : undefined }),
+    }, workspaceLabel(workspace)),
     React.createElement('span', { style: WS_COUNT }, String(sessions.length)),
     hovered || focused
       ? React.createElement('button', {
@@ -739,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))
       })
     }
   })
@@ -806,9 +1126,81 @@ export function BetterWorkspace(props) {
     ? React.createElement('div', { key: 'count', style: WS_COUNT_NOTE }, String(shownCount) + ' of ' + String(totalCount) + ' sessions')
     : null,
   sessionMenu,
+  paintMenu,
   workspaceMenu)
 }
 
+const WS_HERO = {
+  display: 'flex',
+  flexDirection: 'column',
+  gap: '1px',
+  minWidth: '220px',
+  maxHeight: '320px',
+  overflowY: 'auto',
+  padding: '4px',
+}
+
+const WS_HERO_TITLE = {
+  fontSize: 'calc(' + "var(--dsh-content-font-size-secondary, 13px)" + ' - 2px)',
+  letterSpacing: '0.02em',
+  textTransform: 'uppercase',
+  color: 'var(--dsw-alias-label-quaternary, #8a8a8a)',
+  padding: '4px 6px 2px',
+}
+
+/**
+ * The Hero's workspace picker. Same data and same colours as the sidebar tree,
+ * reachable before a session exists — the Hero slot wants a list that calls
+ * `onPick(workspaceId)`, so this is a flat list rather than the tree.
+ */
+export function HeroWorkspacePicker(props) {
+  const services = (props && props.services) || {}
+  const workspaceState = useLive(services.workspacesLive)
+  const look = React.useMemo(() => readAppearance(), [])
+  const list = (workspaceState && (workspaceState.items || workspaceState.workspaces)) || []
+  // The slot hands over `open`: the chip is closed most of the time, and rendering
+  // the list unconditionally left it floating over the Hero copy.
+  if (!props || props.open !== true || list.length === 0) return null
+  const anchor = props.anchorRef && props.anchorRef.current
+  const spot = anchor && anchor.getBoundingClientRect
+    ? (() => {
+      const box = anchor.getBoundingClientRect()
+      return {
+        position: 'fixed',
+        top: Math.round(box.bottom + 6) + 'px',
+        left: Math.max(8, Math.round(box.left)) + 'px',
+        zIndex: 1200,
+      }
+    })()
+    : {}
+  return ReactDOM.createPortal(React.createElement('div', { 'data-polish-hero': 'true', style: Object.assign({}, WS_MENU, WS_HERO, spot, { maxHeight: '320px' }) },
+    React.createElement('div', { style: WS_HERO_TITLE }, 'Workspaces'),
+    list.map((workspace) => {
+      const looks = appearanceOf(look, workspace.workspaceId)
+      return React.createElement('button', {
+        key: workspace.workspaceId,
+        type: 'button',
+        'data-polish-hero-row': workspace.workspaceId,
+        style: Object.assign({}, WS_ROW, {
+          fontWeight: looks.strong ? 600 : 500,
+          background: 'transparent',
+          border: 'none',
+          textAlign: 'left',
+        }),
+        onClick: () => {
+          if (props.onPick) props.onPick(workspace.workspaceId)
+          if (props.onClose) props.onClose()
+        },
+      },
+      React.createElement(FolderGlyph),
+      looks.tone
+        ? React.createElement('span', { style: Object.assign({}, WS_TONE, { background: TONE_COLOR[looks.tone] }) })
+        : null,
+      React.createElement('span', { style: WS_TITLE }, workspaceLabel(workspace)),
+      React.createElement('span', { style: WS_COUNT }, String((workspace.sessionIds || []).length)))
+    })), document.body)
+}
+
 /**
  * Add and dispose the seat with the switch. A `single` slot renders its LOWEST
  * priority occupant, so presence is the only way to stand aside: without this the
@@ -816,6 +1208,7 @@ export function BetterWorkspace(props) {
  */
 export function installWorkspaceSeat(ctx, configForms, extras = {}) {
   let dispose
+  let disposeHero
   let unlisten
   const scope = () => {
     try {
@@ -858,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')
@@ -868,6 +1262,13 @@ export function installWorkspaceSeat(ctx, configForms, extras = {}) {
             priority: -1,
             inject: () => ({ services }),
           }, BetterWorkspace))
+          // The Hero picker is its own single slot, so it needs its own -1 seat;
+          // both live and die with the one switch.
+          disposeHero = seated.slots.inject('conversation.hero.workspace', () => seated.slots.register({
+            name: 'conversation.hero.workspace',
+            priority: -1,
+            inject: () => ({ services }),
+          }, HeroWorkspacePicker))
         },
       )
     } catch (error) {
@@ -880,6 +1281,12 @@ export function installWorkspaceSeat(ctx, configForms, extras = {}) {
       install()
       return
     }
+    if (typeof disposeHero === 'function') {
+      try {
+        disposeHero()
+      } catch {}
+    }
+    disposeHero = undefined
     if (typeof dispose === 'function') {
       try {
         dispose()
@@ -897,6 +1304,7 @@ export function installWorkspaceSeat(ctx, configForms, extras = {}) {
   }
   return () => {
     if (typeof unlisten === 'function') unlisten()
+    if (typeof disposeHero === 'function') disposeHero()
     if (typeof dispose === 'function') dispose()
   }
 }

package/docs/better-workspace.md

@@ -93,3 +93,44 @@ So the tree refuses with "A session stays in its workspace; drag it within that
 workspace to reorder." rather than attempting a call that throws. If the Host ever
 exposes attach/detach, the gesture becomes a one-line change here — the drag payload
 already carries `{ kind: 'session', id, workspaceId }`.
+
+## Colour and weight
+
+Right-click a workspace → **Colour and weight…** opens a six-tone palette (slate, blue,
+green, amber, rose, violet) plus "none", and toggles a bold label. The choice is kept in
+the app's own storage under `aryacode-polish:workspace-appearance.v1` as
+`{ [workspaceId]: { tone, strong } }`, so it survives a restart without asking the Host
+to remember anything. `readAppearance`/`writeAppearance` swallow every failure
+(missing storage, quota, a locked-down webview), so a broken store costs the colours
+and nothing else. `appearanceOf` ignores a tone it does not know, which keeps an old
+entry from breaking the row if the palette ever changes.
+
+## The Hero picker
+
+The blank-session Hero's workspace chip is the same list, not a second implementation:
+`conversation.hero.workspace` is a `single` slot at the root, so this bundle shadows it
+at `priority: -1` beside `sidebar.workspaces` and both seats come and go with the one
+switch. The slot hands over `{ open, anchorRef, selectedId, onPick, onClose }`: the card
+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.11.2"
+    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. */
@@ -583,6 +583,155 @@ window.__ModuleLoader__.load({
       return next
     }
 
+    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']
+
+    const TONE_COLOR = {
+      slate: '#8a8f98',
+      blue: '#4a72d0',
+      green: '#2f9e6b',
+      amber: '#c8892f',
+      rose: '#c2496a',
+      violet: '#7a5cc4',
+    }
+
+    function appearanceOf(map, workspaceId) {
+      const entry = (map && map[workspaceId]) || {}
+      return {
+        tone: TONE_COLOR[entry.tone] ? entry.tone : undefined,
+        strong: entry.strong === true,
+      }
+    }
+
+    function withAppearance(map, workspaceId, patch) {
+      const next = Object.assign({}, map || {})
+      const merged = Object.assign({}, appearanceOf(next, workspaceId), patch || {})
+      if (!merged.tone && merged.strong !== true) delete next[workspaceId]
+      else next[workspaceId] = { tone: merged.tone, strong: merged.strong === true }
+      return next
+    }
+
+    function readAppearance(storage) {
+      try {
+        const store = storage || (typeof localStorage === 'undefined' ? undefined : localStorage)
+        if (!store) return {}
+        const raw = store.getItem(LOOK_KEY)
+        if (!raw) return {}
+        const parsed = JSON.parse(raw)
+        return parsed && typeof parsed === 'object' ? parsed : {}
+      } catch {
+        return {}
+      }
+    }
+
+    function writeAppearance(map, storage) {
+      try {
+        const store = storage || (typeof localStorage === 'undefined' ? undefined : localStorage)
+        if (!store) return
+        store.setItem(LOOK_KEY, JSON.stringify(map || {}))
+      } catch {
+        /* a locked-down webview must not break the tree */
+      }
+    }
+
+    const WS_TONE = {
+      flex: 'none',
+      width: '6px',
+      height: '6px',
+      borderRadius: '50%',
+      boxShadow: '0 0 0 2px var(--dsw-alias-bg-base, transparent)',
+    }
+
+    const WS_SWATCH = {
+      width: '18px',
+      height: '18px',
+      borderRadius: '50%',
+      border: '0.5px solid var(--dsw-alias-border-l2, rgba(0,0,0,0.12))',
+      cursor: 'pointer',
+      padding: 0,
+    }
+
+    const WS_PAINT_ROW = {
+      display: 'flex',
+      alignItems: 'center',
+      gap: '6px',
+      padding: '6px 8px',
+    }
+
     const WS_FILTER = {
       margin: '2px 2px 6px',
       padding: '4px 8px',
@@ -648,6 +797,30 @@ window.__ModuleLoader__.load({
       const [hover, setHover] = React.useState(null)
       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)
+          writeAppearance(next)
+          return next
+        })
+      }
       const filterRef = React.useRef(null)
 
       const workspaceState = useLive(services.workspacesLive)
@@ -662,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])
@@ -789,6 +967,56 @@ 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',
+            style: WS_MENU_ITEM,
+            onClick: () => {
+              const workspace = menu.workspace
+              setMenu({ kind: 'paint', workspace, anchor: menu.anchor })
+            },
+          }, 'Colour and weight…'),
           React.createElement('button', {
             type: 'button',
             style: Object.assign({}, WS_MENU_ITEM, { color: 'var(--dsw-alias-label-error, #d92d20)' }),
@@ -805,6 +1033,44 @@ window.__ModuleLoader__.load({
           }, armed && armed === menu.workspace.workspaceId ? 'Remove workspace?' : 'Remove workspace'))
         : null
 
+      const paintMenu = menu && menu.kind === 'paint'
+        ? (() => {
+          const workspace = menu.workspace
+          const current = appearanceOf(look, workspace.workspaceId)
+          return React.createElement(RowMenu, { anchor: menu.anchor, onClose: closeMenu },
+            React.createElement('div', { style: WS_PAINT_ROW },
+              TONE_ORDER.map((tone) => React.createElement('button', {
+                key: tone,
+                type: 'button',
+                'data-polish-tone': tone,
+                'aria-label': 'Colour ' + tone,
+                title: tone,
+                style: Object.assign({}, WS_SWATCH, {
+                  background: TONE_COLOR[tone],
+                  boxShadow: current.tone === tone
+                    ? '0 0 0 1.5px var(--dsw-alias-label-secondary, #61666b)'
+                    : undefined,
+                }),
+                onClick: () => paintLook(workspace.workspaceId, { tone }),
+              })),
+              React.createElement('button', {
+                key: 'none',
+                type: 'button',
+                'data-polish-tone': 'none',
+                'aria-label': 'No colour',
+                title: 'No colour',
+                style: Object.assign({}, WS_SWATCH, { background: 'transparent' }),
+                onClick: () => paintLook(workspace.workspaceId, { tone: undefined }),
+              })),
+            React.createElement('button', {
+              type: 'button',
+              'data-polish-ws-strong': current.strong ? 'on' : 'off',
+              style: WS_MENU_ITEM,
+              onClick: () => paintLook(workspace.workspaceId, { strong: !current.strong }),
+            }, current.strong ? 'Weight: bold ✓' : 'Weight: normal'))
+        })()
+        : null
+
       const sessionMenu = menu && menu.kind === 'session'
         ? React.createElement(RowMenu, { anchor: menu.anchor, onClose: closeMenu },
           entries.map((entry, index) => React.createElement(RowBoundary, { key: (entry.options && entry.options.id) || index },
@@ -878,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',
@@ -886,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,
@@ -925,7 +1279,12 @@ window.__ModuleLoader__.load({
         },
         React.createElement(CaretGlyph, { open }),
         React.createElement(FolderGlyph),
-        React.createElement('span', { style: WS_TITLE }, workspaceLabel(workspace)),
+        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: looks.strong ? 600 : undefined }),
+        }, workspaceLabel(workspace)),
         React.createElement('span', { style: WS_COUNT }, String(sessions.length)),
         hovered || focused
           ? React.createElement('button', {
@@ -940,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))
           })
         }
       })
@@ -1007,9 +1327,81 @@ window.__ModuleLoader__.load({
         ? React.createElement('div', { key: 'count', style: WS_COUNT_NOTE }, String(shownCount) + ' of ' + String(totalCount) + ' sessions')
         : null,
       sessionMenu,
+      paintMenu,
       workspaceMenu)
     }
 
+    const WS_HERO = {
+      display: 'flex',
+      flexDirection: 'column',
+      gap: '1px',
+      minWidth: '220px',
+      maxHeight: '320px',
+      overflowY: 'auto',
+      padding: '4px',
+    }
+
+    const WS_HERO_TITLE = {
+      fontSize: 'calc(' + "var(--dsh-content-font-size-secondary, 13px)" + ' - 2px)',
+      letterSpacing: '0.02em',
+      textTransform: 'uppercase',
+      color: 'var(--dsw-alias-label-quaternary, #8a8a8a)',
+      padding: '4px 6px 2px',
+    }
+
+    /**
+     * The Hero's workspace picker. Same data and same colours as the sidebar tree,
+     * reachable before a session exists — the Hero slot wants a list that calls
+     * `onPick(workspaceId)`, so this is a flat list rather than the tree.
+     */
+    function HeroWorkspacePicker(props) {
+      const services = (props && props.services) || {}
+      const workspaceState = useLive(services.workspacesLive)
+      const look = React.useMemo(() => readAppearance(), [])
+      const list = (workspaceState && (workspaceState.items || workspaceState.workspaces)) || []
+      // The slot hands over `open`: the chip is closed most of the time, and rendering
+      // the list unconditionally left it floating over the Hero copy.
+      if (!props || props.open !== true || list.length === 0) return null
+      const anchor = props.anchorRef && props.anchorRef.current
+      const spot = anchor && anchor.getBoundingClientRect
+        ? (() => {
+          const box = anchor.getBoundingClientRect()
+          return {
+            position: 'fixed',
+            top: Math.round(box.bottom + 6) + 'px',
+            left: Math.max(8, Math.round(box.left)) + 'px',
+            zIndex: 1200,
+          }
+        })()
+        : {}
+      return ReactDOM.createPortal(React.createElement('div', { 'data-polish-hero': 'true', style: Object.assign({}, WS_MENU, WS_HERO, spot, { maxHeight: '320px' }) },
+        React.createElement('div', { style: WS_HERO_TITLE }, 'Workspaces'),
+        list.map((workspace) => {
+          const looks = appearanceOf(look, workspace.workspaceId)
+          return React.createElement('button', {
+            key: workspace.workspaceId,
+            type: 'button',
+            'data-polish-hero-row': workspace.workspaceId,
+            style: Object.assign({}, WS_ROW, {
+              fontWeight: looks.strong ? 600 : 500,
+              background: 'transparent',
+              border: 'none',
+              textAlign: 'left',
+            }),
+            onClick: () => {
+              if (props.onPick) props.onPick(workspace.workspaceId)
+              if (props.onClose) props.onClose()
+            },
+          },
+          React.createElement(FolderGlyph),
+          looks.tone
+            ? React.createElement('span', { style: Object.assign({}, WS_TONE, { background: TONE_COLOR[looks.tone] }) })
+            : null,
+          React.createElement('span', { style: WS_TITLE }, workspaceLabel(workspace)),
+          React.createElement('span', { style: WS_COUNT }, String((workspace.sessionIds || []).length)))
+        })), document.body)
+    }
+
     /**
      * Add and dispose the seat with the switch. A `single` slot renders its LOWEST
      * priority occupant, so presence is the only way to stand aside: without this the
@@ -1017,6 +1409,7 @@ window.__ModuleLoader__.load({
      */
     function installWorkspaceSeat(ctx, configForms, extras = {}) {
       let dispose
+      let disposeHero
       let unlisten
       const scope = () => {
         try {
@@ -1059,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')
@@ -1069,6 +1463,13 @@ window.__ModuleLoader__.load({
                 priority: -1,
                 inject: () => ({ services }),
               }, BetterWorkspace))
+              // The Hero picker is its own single slot, so it needs its own -1 seat;
+              // both live and die with the one switch.
+              disposeHero = seated.slots.inject('conversation.hero.workspace', () => seated.slots.register({
+                name: 'conversation.hero.workspace',
+                priority: -1,
+                inject: () => ({ services }),
+              }, HeroWorkspacePicker))
             },
           )
         } catch (error) {
@@ -1081,6 +1482,12 @@ window.__ModuleLoader__.load({
           install()
           return
         }
+        if (typeof disposeHero === 'function') {
+          try {
+            disposeHero()
+          } catch {}
+        }
+        disposeHero = undefined
         if (typeof dispose === 'function') {
           try {
             dispose()
@@ -1098,6 +1505,7 @@ window.__ModuleLoader__.load({
       }
       return () => {
         if (typeof unlisten === 'function') unlisten()
+        if (typeof disposeHero === 'function') disposeHero()
         if (typeof dispose === 'function') dispose()
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aryacode/dsh-aryacode-polish",
-  "version": "0.11.2",
+  "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",