@aryacode/dsh-aryacode-polish 0.17.0 → 0.19.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.19.0] - 2026-10-28
+
+### Added
+- **Move to top level** in a workspace menu drops the folder prefix, so filing is reversible.
+- **Rename a folder** from its header: every workspace inside is refiled under the new
+  prefix through the Host rename, and the declared/empty list follows the folder.
+
+
+## [0.18.0] - 2026-10-28
+
+### Added
+- **Folders that exist before their content.** The workspace menu can declare a folder, an
+  empty folder draws its own header with an empty count, accepts a workspace drop, and
+  can be removed again. Declared folders are remembered (ryacode-polish:folders.v1).
+
+
 ## [0.17.0] - 2026-10-28
 
 ### Added

package/client/workspace.js

@@ -386,6 +386,68 @@ const LOOK_KEY = 'aryacode-polish:workspace-appearance.v1'
 const ORDER_KEY = 'aryacode-polish:workspace-order.v1'
 const FOLD_KEY = 'aryacode-polish:folded.v1'
 const DENSITY_KEY = 'aryacode-polish:density.v1'
+const FOLDER_KEY = 'aryacode-polish:folders.v1'
+
+const cleanFolder = (name) => {
+  const value = String(name || '').trim().replace(/^\/+|\/+$/g, '')
+  return value && !value.includes('/') ? value : undefined
+}
+
+/** Add a folder name, refusing empties, duplicates and anything nested. */
+export function addFolder(list, name) {
+  const folder = cleanFolder(name)
+  const names = Array.isArray(list) ? list.slice() : []
+  if (!folder || names.includes(folder)) return names
+  names.push(folder)
+  return names
+}
+
+/** Remove a folder name from the declared list. */
+export function removeFolder(list, name) {
+  const folder = cleanFolder(name)
+  const names = Array.isArray(list) ? list : []
+  return folder ? names.filter((entry) => entry !== folder) : names.slice()
+}
+
+export function readFolders(storage) {
+  try {
+    const store = storage || (typeof localStorage === 'undefined' ? undefined : localStorage)
+    if (!store) return []
+    const parsed = JSON.parse(store.getItem(FOLDER_KEY) || '[]')
+    if (!Array.isArray(parsed)) return []
+    return parsed.map(cleanFolder).filter(Boolean)
+  } catch {
+    return []
+  }
+}
+
+export function writeFolders(list, storage) {
+  try {
+    const store = storage || (typeof localStorage === 'undefined' ? undefined : localStorage)
+    if (!store) return
+    store.setItem(FOLDER_KEY, JSON.stringify((Array.isArray(list) ? list : []).map(cleanFolder).filter(Boolean)))
+  } catch {
+    /* folders are a convenience, not a requirement */
+  }
+}
+
+/**
+ * Folder names the tree must draw: the ones its workspaces imply, then any declared but
+ * still empty. Declared folders keep their order so an empty folder does not jump around
+ * when the first workspace lands in it.
+ */
+export function folderNamesOf(rows, declared) {
+  const seen = []
+  for (const row of rows || []) {
+    const name = folderKey(row.workspace)
+    if (name && !seen.includes(name)) seen.push(name)
+  }
+  for (const name of declared || []) {
+    const folder = cleanFolder(name)
+    if (folder && !seen.includes(folder)) seen.push(folder)
+  }
+  return seen
+}
 
 export const DENSITIES = ['comfortable', 'compact']
 
@@ -645,6 +707,14 @@ export function fileUnder(label, folder) {
   return bare ? target + '/' + bare : target
 }
 
+/** The title a workspace needs to sit at the top level again: no folder prefix. */
+export function unfiled(label) {
+  const name = String(label || '').trim()
+  if (!name) return name
+  const cut = name.lastIndexOf('/')
+  return cut >= 0 ? name.slice(cut + 1).trim() : name
+}
+
 export function folderKey(workspace) {
   const label = workspaceLabel(workspace)
   const cut = label.lastIndexOf('/')
@@ -865,10 +935,13 @@ export function BetterWorkspace(props) {
   const [card, setCard] = React.useState(null)
   const folded = React.useMemo(() => readFolded(), [])
   const [folders, setFolders] = React.useState(folded.folders)
+  const [declared, setDeclared] = React.useState(() => readFolders())
+  const [folderDraft, setFolderDraft] = React.useState('')
   const [switcher, setSwitcher] = React.useState(null)
   const [density, setDensity] = React.useState(() => readDensity())
   const [archiveOpen, setArchiveOpen] = React.useState(false)
   React.useEffect(() => { writeFolded({ workspaces: expanded, folders }) }, [expanded, folders])
+  React.useEffect(() => { writeFolders(declared) }, [declared])
   const [renaming, setRenaming] = React.useState(null)
   const commitRename = async () => {
     const draft = renaming
@@ -920,7 +993,7 @@ export function BetterWorkspace(props) {
   const entries = React.useMemo(() => rowMenuEntries(slots), [slots, workspaceList.length, sessionList.length])
   const totalCount = allRows.reduce((sum, row) => sum + row.sessions.length, 0)
   const shownCount = rows.reduce((sum, row) => sum + row.sessions.length, 0)
-  const folderNames = Array.from(new Set(rows.map(row => folderKey(row.workspace)).filter(Boolean)))
+  const folderNames = folderNamesOf(rows, declared)
   // One click should always do the useful thing: if anything is folded, the button
   // expands everything (folders included); only when nothing is folded does it fold.
   const anyFolded = rows.some(row => expanded[row.workspace.workspaceId] === false)
@@ -1124,6 +1197,33 @@ export function BetterWorkspace(props) {
             }
           },
         }, 'Restore saved order'),
+      folderOf(menu.workspace) === undefined
+        ? null
+        : React.createElement('button', {
+          type: 'button',
+          'data-polish-ws-unfile': menu.workspace.workspaceId,
+          style: WS_MENU_ITEM,
+          onClick: () => {
+            const target = menu.workspace
+            const title = unfiled(workspaceLabel(target))
+            closeMenu()
+            Promise.resolve()
+              .then(() => services.renameWorkspace(target.workspaceId, title))
+              .then(() => setNotice('Moved to the top level.'))
+              .catch(() => setNotice('Could not move that workspace.'))
+          },
+        }, 'Move to top level'),
+      React.createElement('button', {
+        type: 'button',
+        'data-polish-folder-new': 'open',
+        style: WS_MENU_ITEM,
+        onClick: () => {
+          const anchor = menu.anchor
+          closeMenu()
+          setFolderDraft('')
+          setMenu({ kind: 'folder', anchor })
+        },
+      }, 'New folder…'),
       React.createElement('button', {
         type: 'button',
         'data-polish-glyph': 'open',
@@ -1191,6 +1291,70 @@ export function BetterWorkspace(props) {
       }, 'Unarchive session'))
     : null
 
+  const folderMenu = menu && menu.kind === 'folder'
+    ? React.createElement(RowMenu, { anchor: menu.anchor, onClose: closeMenu },
+      React.createElement('input', {
+        'data-polish-folder-input': 'true',
+        type: 'text',
+        value: folderDraft,
+        placeholder: 'Folder name',
+        autoFocus: true,
+        style: WS_NOTE_INPUT,
+        onChange: (event) => setFolderDraft(event.target.value),
+        onKeyDown: (event) => {
+          if (event.key === 'Escape') { event.stopPropagation(); closeMenu(); return }
+          if (event.key !== 'Enter') return
+          const next = addFolder(declared, folderDraft)
+          closeMenu()
+          if (next.length === declared.length) { setNotice('That folder already exists.'); return }
+          setDeclared(next)
+          setFolders((prev) => Object.assign({}, prev, { [next[next.length - 1]]: false }))
+          setNotice('Folder added.')
+        },
+      }),
+      React.createElement('div', { style: WS_MENU_HINT }, 'Enter creates, Escape cancels'))
+    : null
+
+  const renameFolderMenu = menu && menu.kind === 'renameFolder'
+    ? React.createElement(RowMenu, { anchor: menu.anchor, onClose: closeMenu },
+      React.createElement('input', {
+        'data-polish-folder-edit-input': 'true',
+        type: 'text',
+        value: folderDraft,
+        placeholder: 'Folder name',
+        autoFocus: true,
+        style: WS_NOTE_INPUT,
+        onChange: (event) => setFolderDraft(event.target.value),
+        onKeyDown: (event) => {
+          if (event.key === 'Escape') { event.stopPropagation(); closeMenu(); return }
+          if (event.key !== 'Enter') return
+          const target = cleanFolder(folderDraft)
+          const moving = menu.members || []
+          const from = menu.folder
+          closeMenu()
+          if (!target || target === from) return
+          Promise.resolve()
+            .then(async () => {
+              for (const workspace of moving) {
+                await services.renameWorkspace(workspace.workspaceId, fileUnder(workspaceLabel(workspace), target))
+              }
+            })
+            .then(() => {
+              setDeclared((prev) => addFolder(removeFolder(prev, from), target))
+              setFolders((prev) => {
+                const next = Object.assign({}, prev)
+                if (next[from] !== undefined) next[target] = next[from]
+                delete next[from]
+                return next
+              })
+              setNotice('Folder renamed.')
+            })
+            .catch(() => setNotice('Could not rename that folder.'))
+        },
+      }),
+      React.createElement('div', { style: WS_MENU_HINT }, 'Renames every workspace inside it'))
+    : null
+
   const glyphMenu = menu && menu.kind === 'glyph'
     ? React.createElement(RowMenu, { anchor: menu.anchor, onClose: closeMenu },
       React.createElement('div', { style: WS_GLYPH_GRID },
@@ -1506,6 +1670,7 @@ export function BetterWorkspace(props) {
     const folded = folder !== undefined && folders[folder] === true
 
     if (folder !== undefined && !announced[folder]) {
+      /* handled below for both filled and empty folders */
       announced[folder] = true
       const inside = rows.filter((entry) => folderOf(entry.workspace) === folder)
       children.push(React.createElement('div', {
@@ -1542,6 +1707,19 @@ export function BetterWorkspace(props) {
       },
       React.createElement('span', { 'aria-hidden': 'true' }, folded ? '›' : '⌄'),
       React.createElement('span', { style: WS_TITLE }, folder),
+      React.createElement('button', {
+        type: 'button',
+        'data-polish-folder-edit': folder,
+        'aria-label': 'Rename the folder ' + folder,
+        title: 'Rename this folder',
+        style: WS_ROW_ACTION,
+        onClick: (event) => {
+          event.stopPropagation()
+          const box = event.currentTarget.getBoundingClientRect()
+          setFolderDraft(folder)
+          setMenu({ kind: 'renameFolder', folder, anchor: { top: box.bottom + 4, left: box.left }, members: inside.map((entry) => entry.workspace) })
+        },
+      }, '✎'),
       React.createElement('span', { style: WS_COUNT }, String(inside.reduce((sum, entry) => sum + entry.sessions.length, 0)))))
     }
 
@@ -1618,6 +1796,58 @@ export function BetterWorkspace(props) {
     }
   })
 
+  const filled = new Set(rows.map(row => folderKey(row.workspace)).filter(Boolean))
+  for (const folder of folderNames) {
+    if (filled.has(folder)) continue
+    const empty = folders[folder] === true
+    children.push(React.createElement('div', {
+      key: 'empty-folder:' + folder,
+      'data-polish-ws-empty': folder,
+      role: 'group',
+      'aria-label': folder,
+      title: 'Drop a workspace here to file it in ' + folder,
+      style: Object.assign({}, WS_FOLDER_ROW, {
+        background: dropping === 'folder:' + folder
+          ? 'var(--dsw-alias-interactive-bg-hover, rgba(0, 0, 0, 0.05))'
+          : undefined,
+      }),
+      onDragOver: (event) => {
+        if (!drag || drag.kind !== 'workspace') return
+        event.preventDefault()
+        setDropping('folder:' + folder)
+      },
+      onDragLeave: () => setDropping(null),
+      onDrop: (event) => {
+        event.preventDefault()
+        setDropping(null)
+        if (!drag || drag.kind !== 'workspace') return
+        const moving = rows.find((entry) => entry.workspace.workspaceId === drag.id)
+        if (!moving) return
+        const title = fileUnder(workspaceLabel(moving.workspace), folder)
+        Promise.resolve()
+          .then(() => services.renameWorkspace(moving.workspace.workspaceId, title))
+          .then(() => setNotice('Filed under ' + folder + '.'))
+          .catch(() => setNotice('Could not file that workspace.'))
+      },
+    },
+    React.createElement('span', { 'aria-hidden': 'true' }, '⌄'),
+    React.createElement('span', { style: WS_TITLE }, folder),
+    React.createElement('span', { style: WS_COUNT_NOTE }, 'empty'),
+    React.createElement('button', {
+      type: 'button',
+      'data-polish-folder-remove': folder,
+      'aria-label': 'Remove the empty folder ' + folder,
+      title: 'Remove this empty folder',
+      style: WS_ROW_ACTION,
+      onClick: (event) => {
+        event.stopPropagation()
+        setDeclared(removeFolder(declared, folder))
+        setNotice('Folder removed.')
+      },
+    }, '×')))
+    if (!empty) continue
+  }
+
   if (archivedSessions.length > 0) {
     children.push(React.createElement('div', {
       key: 'archived-head',
@@ -1675,6 +1905,8 @@ export function BetterWorkspace(props) {
   sessionMenu,
   glyphMenu,
   noteMenu,
+  folderMenu,
+  renameFolderMenu,
   noteCard,
   archivedMenu,
   paintMenu,

package/docs/better-workspace.md

@@ -201,3 +201,27 @@ drop target, so the gesture cannot rename something onto itself.
 A workspace note shows as a small card under the row on hover rather than as a browser
 tooltip: tooltips are slow to appear, unstyleable, and vanish when the pointer leaves. The
 card is portalled, `pointer-events: none`, and only exists while a note does.
+
+## Folders without content
+
+A folder can be declared before anything lives in it (**New folder…** in a workspace menu).
+It draws its own header with the word `empty` where the count would be, accepts a workspace
+drop like any other folder header, and carries a `×` that removes the declaration. Declared
+names live in `aryacode-polish:folders.v1`; the tree draws the names its workspaces imply
+first and the declared ones after, so an empty folder never jumps ahead of real content and
+disappears on its own the moment the first workspace is filed into it.
+
+## Renaming a folder
+
+A folder is not an object in the Host — it is the prefix of the titles inside it. So renaming
+a folder means refiling every member: the header's `✎` asks for a new name, and each
+workspace inside is renamed to `NewName/` + its own name through `workspaces.rename`. The
+declared/empty list follows the old name to the new one, and the fold state moves with it, so
+a renamed folder does not suddenly spring open.
+
+## Filing is reversible
+
+**Move to top level** appears in a workspace's menu only when it actually lives under a folder,
+and does the inverse: `unfiled('Work/Alpha')` is `Alpha`, renamed through the Host like any
+other title change. A folder left with nothing in it simply stops being drawn, unless it was
+declared empty on purpose.

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.17.0"
+    const CLIENT_VERSION = "0.19.0"
 
 /* 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. */
@@ -587,6 +587,68 @@ window.__ModuleLoader__.load({
     const ORDER_KEY = 'aryacode-polish:workspace-order.v1'
     const FOLD_KEY = 'aryacode-polish:folded.v1'
     const DENSITY_KEY = 'aryacode-polish:density.v1'
+    const FOLDER_KEY = 'aryacode-polish:folders.v1'
+
+    const cleanFolder = (name) => {
+      const value = String(name || '').trim().replace(/^\/+|\/+$/g, '')
+      return value && !value.includes('/') ? value : undefined
+    }
+
+    /** Add a folder name, refusing empties, duplicates and anything nested. */
+    function addFolder(list, name) {
+      const folder = cleanFolder(name)
+      const names = Array.isArray(list) ? list.slice() : []
+      if (!folder || names.includes(folder)) return names
+      names.push(folder)
+      return names
+    }
+
+    /** Remove a folder name from the declared list. */
+    function removeFolder(list, name) {
+      const folder = cleanFolder(name)
+      const names = Array.isArray(list) ? list : []
+      return folder ? names.filter((entry) => entry !== folder) : names.slice()
+    }
+
+    function readFolders(storage) {
+      try {
+        const store = storage || (typeof localStorage === 'undefined' ? undefined : localStorage)
+        if (!store) return []
+        const parsed = JSON.parse(store.getItem(FOLDER_KEY) || '[]')
+        if (!Array.isArray(parsed)) return []
+        return parsed.map(cleanFolder).filter(Boolean)
+      } catch {
+        return []
+      }
+    }
+
+    function writeFolders(list, storage) {
+      try {
+        const store = storage || (typeof localStorage === 'undefined' ? undefined : localStorage)
+        if (!store) return
+        store.setItem(FOLDER_KEY, JSON.stringify((Array.isArray(list) ? list : []).map(cleanFolder).filter(Boolean)))
+      } catch {
+        /* folders are a convenience, not a requirement */
+      }
+    }
+
+    /**
+     * Folder names the tree must draw: the ones its workspaces imply, then any declared but
+     * still empty. Declared folders keep their order so an empty folder does not jump around
+     * when the first workspace lands in it.
+     */
+    function folderNamesOf(rows, declared) {
+      const seen = []
+      for (const row of rows || []) {
+        const name = folderKey(row.workspace)
+        if (name && !seen.includes(name)) seen.push(name)
+      }
+      for (const name of declared || []) {
+        const folder = cleanFolder(name)
+        if (folder && !seen.includes(folder)) seen.push(folder)
+      }
+      return seen
+    }
 
     const DENSITIES = ['comfortable', 'compact']
 
@@ -846,6 +908,14 @@ window.__ModuleLoader__.load({
       return bare ? target + '/' + bare : target
     }
 
+    /** The title a workspace needs to sit at the top level again: no folder prefix. */
+    function unfiled(label) {
+      const name = String(label || '').trim()
+      if (!name) return name
+      const cut = name.lastIndexOf('/')
+      return cut >= 0 ? name.slice(cut + 1).trim() : name
+    }
+
     function folderKey(workspace) {
       const label = workspaceLabel(workspace)
       const cut = label.lastIndexOf('/')
@@ -1066,10 +1136,13 @@ window.__ModuleLoader__.load({
       const [card, setCard] = React.useState(null)
       const folded = React.useMemo(() => readFolded(), [])
       const [folders, setFolders] = React.useState(folded.folders)
+      const [declared, setDeclared] = React.useState(() => readFolders())
+      const [folderDraft, setFolderDraft] = React.useState('')
       const [switcher, setSwitcher] = React.useState(null)
       const [density, setDensity] = React.useState(() => readDensity())
       const [archiveOpen, setArchiveOpen] = React.useState(false)
       React.useEffect(() => { writeFolded({ workspaces: expanded, folders }) }, [expanded, folders])
+      React.useEffect(() => { writeFolders(declared) }, [declared])
       const [renaming, setRenaming] = React.useState(null)
       const commitRename = async () => {
         const draft = renaming
@@ -1121,7 +1194,7 @@ window.__ModuleLoader__.load({
       const entries = React.useMemo(() => rowMenuEntries(slots), [slots, workspaceList.length, sessionList.length])
       const totalCount = allRows.reduce((sum, row) => sum + row.sessions.length, 0)
       const shownCount = rows.reduce((sum, row) => sum + row.sessions.length, 0)
-      const folderNames = Array.from(new Set(rows.map(row => folderKey(row.workspace)).filter(Boolean)))
+      const folderNames = folderNamesOf(rows, declared)
       // One click should always do the useful thing: if anything is folded, the button
       // expands everything (folders included); only when nothing is folded does it fold.
       const anyFolded = rows.some(row => expanded[row.workspace.workspaceId] === false)
@@ -1325,6 +1398,33 @@ window.__ModuleLoader__.load({
                 }
               },
             }, 'Restore saved order'),
+          folderOf(menu.workspace) === undefined
+            ? null
+            : React.createElement('button', {
+              type: 'button',
+              'data-polish-ws-unfile': menu.workspace.workspaceId,
+              style: WS_MENU_ITEM,
+              onClick: () => {
+                const target = menu.workspace
+                const title = unfiled(workspaceLabel(target))
+                closeMenu()
+                Promise.resolve()
+                  .then(() => services.renameWorkspace(target.workspaceId, title))
+                  .then(() => setNotice('Moved to the top level.'))
+                  .catch(() => setNotice('Could not move that workspace.'))
+              },
+            }, 'Move to top level'),
+          React.createElement('button', {
+            type: 'button',
+            'data-polish-folder-new': 'open',
+            style: WS_MENU_ITEM,
+            onClick: () => {
+              const anchor = menu.anchor
+              closeMenu()
+              setFolderDraft('')
+              setMenu({ kind: 'folder', anchor })
+            },
+          }, 'New folder…'),
           React.createElement('button', {
             type: 'button',
             'data-polish-glyph': 'open',
@@ -1392,6 +1492,70 @@ window.__ModuleLoader__.load({
           }, 'Unarchive session'))
         : null
 
+      const folderMenu = menu && menu.kind === 'folder'
+        ? React.createElement(RowMenu, { anchor: menu.anchor, onClose: closeMenu },
+          React.createElement('input', {
+            'data-polish-folder-input': 'true',
+            type: 'text',
+            value: folderDraft,
+            placeholder: 'Folder name',
+            autoFocus: true,
+            style: WS_NOTE_INPUT,
+            onChange: (event) => setFolderDraft(event.target.value),
+            onKeyDown: (event) => {
+              if (event.key === 'Escape') { event.stopPropagation(); closeMenu(); return }
+              if (event.key !== 'Enter') return
+              const next = addFolder(declared, folderDraft)
+              closeMenu()
+              if (next.length === declared.length) { setNotice('That folder already exists.'); return }
+              setDeclared(next)
+              setFolders((prev) => Object.assign({}, prev, { [next[next.length - 1]]: false }))
+              setNotice('Folder added.')
+            },
+          }),
+          React.createElement('div', { style: WS_MENU_HINT }, 'Enter creates, Escape cancels'))
+        : null
+
+      const renameFolderMenu = menu && menu.kind === 'renameFolder'
+        ? React.createElement(RowMenu, { anchor: menu.anchor, onClose: closeMenu },
+          React.createElement('input', {
+            'data-polish-folder-edit-input': 'true',
+            type: 'text',
+            value: folderDraft,
+            placeholder: 'Folder name',
+            autoFocus: true,
+            style: WS_NOTE_INPUT,
+            onChange: (event) => setFolderDraft(event.target.value),
+            onKeyDown: (event) => {
+              if (event.key === 'Escape') { event.stopPropagation(); closeMenu(); return }
+              if (event.key !== 'Enter') return
+              const target = cleanFolder(folderDraft)
+              const moving = menu.members || []
+              const from = menu.folder
+              closeMenu()
+              if (!target || target === from) return
+              Promise.resolve()
+                .then(async () => {
+                  for (const workspace of moving) {
+                    await services.renameWorkspace(workspace.workspaceId, fileUnder(workspaceLabel(workspace), target))
+                  }
+                })
+                .then(() => {
+                  setDeclared((prev) => addFolder(removeFolder(prev, from), target))
+                  setFolders((prev) => {
+                    const next = Object.assign({}, prev)
+                    if (next[from] !== undefined) next[target] = next[from]
+                    delete next[from]
+                    return next
+                  })
+                  setNotice('Folder renamed.')
+                })
+                .catch(() => setNotice('Could not rename that folder.'))
+            },
+          }),
+          React.createElement('div', { style: WS_MENU_HINT }, 'Renames every workspace inside it'))
+        : null
+
       const glyphMenu = menu && menu.kind === 'glyph'
         ? React.createElement(RowMenu, { anchor: menu.anchor, onClose: closeMenu },
           React.createElement('div', { style: WS_GLYPH_GRID },
@@ -1707,6 +1871,7 @@ window.__ModuleLoader__.load({
         const folded = folder !== undefined && folders[folder] === true
 
         if (folder !== undefined && !announced[folder]) {
+          /* handled below for both filled and empty folders */
           announced[folder] = true
           const inside = rows.filter((entry) => folderOf(entry.workspace) === folder)
           children.push(React.createElement('div', {
@@ -1743,6 +1908,19 @@ window.__ModuleLoader__.load({
           },
           React.createElement('span', { 'aria-hidden': 'true' }, folded ? '›' : '⌄'),
           React.createElement('span', { style: WS_TITLE }, folder),
+          React.createElement('button', {
+            type: 'button',
+            'data-polish-folder-edit': folder,
+            'aria-label': 'Rename the folder ' + folder,
+            title: 'Rename this folder',
+            style: WS_ROW_ACTION,
+            onClick: (event) => {
+              event.stopPropagation()
+              const box = event.currentTarget.getBoundingClientRect()
+              setFolderDraft(folder)
+              setMenu({ kind: 'renameFolder', folder, anchor: { top: box.bottom + 4, left: box.left }, members: inside.map((entry) => entry.workspace) })
+            },
+          }, '✎'),
           React.createElement('span', { style: WS_COUNT }, String(inside.reduce((sum, entry) => sum + entry.sessions.length, 0)))))
         }
 
@@ -1819,6 +1997,58 @@ window.__ModuleLoader__.load({
         }
       })
 
+      const filled = new Set(rows.map(row => folderKey(row.workspace)).filter(Boolean))
+      for (const folder of folderNames) {
+        if (filled.has(folder)) continue
+        const empty = folders[folder] === true
+        children.push(React.createElement('div', {
+          key: 'empty-folder:' + folder,
+          'data-polish-ws-empty': folder,
+          role: 'group',
+          'aria-label': folder,
+          title: 'Drop a workspace here to file it in ' + folder,
+          style: Object.assign({}, WS_FOLDER_ROW, {
+            background: dropping === 'folder:' + folder
+              ? 'var(--dsw-alias-interactive-bg-hover, rgba(0, 0, 0, 0.05))'
+              : undefined,
+          }),
+          onDragOver: (event) => {
+            if (!drag || drag.kind !== 'workspace') return
+            event.preventDefault()
+            setDropping('folder:' + folder)
+          },
+          onDragLeave: () => setDropping(null),
+          onDrop: (event) => {
+            event.preventDefault()
+            setDropping(null)
+            if (!drag || drag.kind !== 'workspace') return
+            const moving = rows.find((entry) => entry.workspace.workspaceId === drag.id)
+            if (!moving) return
+            const title = fileUnder(workspaceLabel(moving.workspace), folder)
+            Promise.resolve()
+              .then(() => services.renameWorkspace(moving.workspace.workspaceId, title))
+              .then(() => setNotice('Filed under ' + folder + '.'))
+              .catch(() => setNotice('Could not file that workspace.'))
+          },
+        },
+        React.createElement('span', { 'aria-hidden': 'true' }, '⌄'),
+        React.createElement('span', { style: WS_TITLE }, folder),
+        React.createElement('span', { style: WS_COUNT_NOTE }, 'empty'),
+        React.createElement('button', {
+          type: 'button',
+          'data-polish-folder-remove': folder,
+          'aria-label': 'Remove the empty folder ' + folder,
+          title: 'Remove this empty folder',
+          style: WS_ROW_ACTION,
+          onClick: (event) => {
+            event.stopPropagation()
+            setDeclared(removeFolder(declared, folder))
+            setNotice('Folder removed.')
+          },
+        }, '×')))
+        if (!empty) continue
+      }
+
       if (archivedSessions.length > 0) {
         children.push(React.createElement('div', {
           key: 'archived-head',
@@ -1876,6 +2106,8 @@ window.__ModuleLoader__.load({
       sessionMenu,
       glyphMenu,
       noteMenu,
+      folderMenu,
+      renameFolderMenu,
       noteCard,
       archivedMenu,
       paintMenu,

package/package.json

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