dsh-better-workspace 0.17.1 → 0.18.0

package/README.md

@@ -69,7 +69,7 @@
 ### 其余亮点
 
 - **文件夹式收起**:点工作区行 = 收起/展开该工作区的全部会话(收起后行上保留会话数角标);会话分组同样可收起;搜索时自动全部展开。
-- **拖拽还原原版能力**:工作区行可拖拽——拖到另一工作区行上/下半即调整顺序(写回宿主 registry 序),拖到分组行则移动进该分组(改写名称前缀);会话行可拖拽——同工作区拖到另一会话上/下调整顺序,拖到会话子分组即移动进该分组。显示顺序 = 宿主手动序,拖拽结果立即生效。**磁盘层是文件系统事实,不随拖拽改变**:跨磁盘层的放置只重组名称分组(工作区落回自身磁盘层的末尾),同层放置才走锚点序。拖拽工作区期间,单链合并显示的行(如 工作/A)临时展开回文件夹树——路径里的每一级都是可投放的分组行,松手后自动合并回去。
+- **拖拽还原原版能力**:工作区行可拖拽——拖到另一工作区行上/下半即调整顺序(写回宿主 registry 序),拖到分组行则移动进该分组(改写名称前缀);会话行可拖拽——同组内拖到另一会话上/下即调整顺序,拖到**别组的会话行**会把名字前缀改写到那个组(拖到根层的行 = 移出分组),拖到会话子分组行即移动进该分组,拖到**自己的工作区行**或**树里任何组外的地方**(含空白区域)同样移出分组 —— 拖拽期间工作区行整行高亮、树底部有一条淡虚线提示这个出口;带分组前缀的会话行右键还多一项「移出分组」。显示顺序 = 宿主手动序,拖拽结果立即生效。**磁盘层是文件系统事实,不随拖拽改变**:跨磁盘层的放置只重组名称分组(工作区落回自身磁盘层的末尾),同层放置才走锚点序。拖拽工作区期间,单链合并显示的行(如 工作/A)临时展开回文件夹树——路径里的每一级都是可投放的分组行,松手后自动合并回去。
 - **不丢原生能力**:会话行(打开/重命名/分叉/归档)、每工作区「新会话」(点 + 总是先展开该工作区,让新会话立刻可见)、当前会话高亮、官方状态灯(蓝色运行环 / 琥珀待交互 / 绿色完成提醒)、**状态呼吸灯**(折叠藏起的状态灯向外冒泡:工作区/分组行图标按状态色呼吸发光——琥珀待交互/绿完成,自定义过发光的标题一起呼吸;运行中只在会话行本层蓝色呼吸,不外渗;可在设置关闭)、**活跃定时任务角标**(有活动 Schedule 的会话显示闹钟图标,与官方行一致)、未分组会话兜底、界面文案跟随 DSH 的语言设置(内置 21 种语言,含简繁中文)。
 - **URL/斜杠标题不拆层**:宿主自动生成的会话标题落地时若含 `/`(如复述了 URL),整串自动包上 `“”` 原样显示,绝不解析成层级——只对本次启动后**新建的会话**生效,并等命名稳定(约 20 秒,让原生 AI 命名先落地)才处理;存量会话与你手动命名的 `/` 分组标题永不被改动。引号内(含手动添加)的 `/` 永不切分,孤立引号只当普通字符;无引号但含 URL 的旧标题也有平铺兜底。
 - **对话空态页同样生效**:会话空态页的「添加工作区」菜单同样回归官方目录流(原生选择器 / 官方应用内浏览器)。
@@ -116,7 +116,7 @@ DSH 的侧边栏浏览区是一个公开插槽 `sidebar.workspaces`(single),官
 
 ## 限制与路线图
 
-- 会话拖到**另一分组内的会话行**仅做扁平重排(标题分组归属不变);要改分组请拖到分组行或走重命名。
+- 会话**跨工作区**拖拽仍被拒绝(会话归属工作区);同一工作区内的分组归属已随拖拽生效(v0.18.0:拖到别组的行改写前缀,拖到自己的工作区行移出分组,右键也有「移出分组」)。
 - 搜索为本地标题过滤(两层扁平化后逐工作区匹配);宿主内容搜索(`session.search`)计划接回。
 - flat(平铺)视图未接管,层级树即视图。
 

package/README_EN.md

@@ -69,7 +69,7 @@ Session titles nest on `/` too (e.g. `test1/plugin maintenance`). Session groups
 ### More highlights
 
 - **Folder-style collapse**: clicking a workspace row collapses/expands all of its sessions (the row keeps a session counter when collapsed); session groups collapse too; search force-expands everything.
-- **Native drag restored**: drag a workspace row above/below another to reorder (writes back the host registry order) or onto a folder row to move it into that group (rewrites the title prefix); drag session rows to reorder within the same workspace or onto a session group to move. Display order = host manual order, drag results are visible immediately. **The disk layer is a filesystem fact and never changes through dragging**: a cross-level drop only re-groups the name prefix (the workspace lands at the end of its own disk level), same-level drops take the anchor order. While dragging a workspace, merged single-chain rows (e.g. work/A) temporarily re-expand into folder rows — every level of the path becomes a drop target, and chains merge back when the drag ends.
+- **Native drag restored**: drag a workspace row above/below another to reorder (writes back the host registry order) or onto a folder row to move it into that group (rewrites the title prefix); drag session rows to reorder inside their group, onto a row of ANOTHER group to move into that group (onto a root-level row to leave the group), onto a session-group row to move into it, or onto their OWN workspace row / anywhere outside a group (empty space included) to leave it — the workspace row highlights and the tree shows a faint dashed hint while such a drag is in flight; a grouped session row also offers "Move out of group" in its context menu. Display order = host manual order, drag results are visible immediately. **The disk layer is a filesystem fact and never changes through dragging**: a cross-level drop only re-groups the name prefix (the workspace lands at the end of its own disk level), same-level drops take the anchor order. While dragging a workspace, merged single-chain rows (e.g. work/A) temporarily re-expand into folder rows — every level of the path becomes a drop target, and chains merge back when the drag ends.
 - **Native capabilities kept**: open/rename/fork/archive sessions, per-workspace new-session (the + button always expands the workspace first so the new session is immediately visible), current-session highlight, official status dots (blue running ring / amber pending / green done), **status breathing lights** (dots hidden by collapse bubble outward: workspace/folder rows breathe on their icon in the status color — amber pending / green done, custom-glow labels breathe along; running breathes blue only on the session row itself and never relays; off-able in settings), **active-schedule badge** (alarm clock icon for sessions with active Schedule records, matching the official rows), ungrouped-session fallback, UI copy in 21 languages following the DSH language preference (Simplified and Traditional Chinese included).
 - **Slash-bearing titles never nest from URLs**: when a host-generated session title lands containing `/` (e.g. echoing a pasted URL), it is auto-wrapped in `“”` and shown verbatim — only for sessions **created after this launch**, and only once the name stays stable for ~20s (letting the native AI naming land first); pre-existing sessions and your manually named `/` groupings are never touched. Quotes (manual ones too) never split on `/`, and a lone quote is just an ordinary character; unquoted URL tails still fall back flat.
 - **Conversation hero too**: the empty-state “Add workspace” menu returns to the official directory flow (native chooser / official in-app browser).
@@ -102,7 +102,7 @@ Same `dsh-better-*` family, zero overlap: [dsh-better-sidebar](https://github.co
 
 ## Limitations / roadmap
 
-- A session dragged onto a session row **inside another group** only gets reordered in the flat list (its title group stays); drag onto the group row or rename to move it.
+- Dragging a session **across workspaces** is still refused (a session belongs to its workspace); inside one workspace the group now follows the drop (v0.18.0: another group's row rewrites the prefix, the workspace row takes it out of every group, and the context menu offers "Move out of group").
 - Search is local title filtering (both layers flattened, per-workspace matching); host content search (`session.search`) is planned.
 - The flat view is not taken over; the hierarchical tree is the view.
 

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-better-workspace",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "main": "./src/index.js",
   "description": "侧边栏工作区树:按官方磁盘目录嵌套(官方 workspace-tree 语义),可选按名称中的 / 分组(默认关闭,设置里开启);添加工作区由官方目录流承载。Workspace tree for the DSH sidebar workspace list, nested by official disk folders with optional \"/\"-name grouping.",
   "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-better-workspace",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "description": "侧边栏工作区树:按官方磁盘目录嵌套(官方 workspace-tree 语义),可选按名称中的 / 分组(默认关闭,设置里开启);添加工作区走官方目录流。Workspace tree for the DSH sidebar: disk-path nesting (official workspace-tree semantics), with optional \"/\"-name grouping (off by default); add-workspace rides the official directory flow.",
   "type": "module",
   "repository": {

package/src/client.js

@@ -72,6 +72,7 @@ window.__ModuleLoader__.load({
       'menu.renameFolder': '重命名分组',
       'menu.renameSgroup': '重命名会话分组',
       'menu.moveToGroup': '移动到分组…',
+      'menu.moveOutGroup': '移出分组',
       'settings.title': '更好的工作区',
       'settings.desc': '工作区树的外观与折叠偏好',
       'settings.expand': '展开',
@@ -151,6 +152,7 @@ window.__ModuleLoader__.load({
       'group.new.nameHint': "名称中的 / 即嵌套层级,例如 前端/组件",
       'group.new.empty': "请输入分组名称",
       'group.new.root': "顶层",
+      'group.new.independent': "新建顶层分组",
       'group.new.pickWorkspace': "选择一个工作区",
       'group.new.noWorkspace': "还没有工作区,请先添加一个",
       'group.new.pickFirst': "请先选择一个工作区",
@@ -200,6 +202,7 @@ window.__ModuleLoader__.load({
       'menu.renameFolder': 'Rename folder',
       'menu.renameSgroup': 'Rename session group',
       'menu.moveToGroup': 'Move to group…',
+      'menu.moveOutGroup': 'Move out of group',
       'settings.title': 'Better Workspaces',
       'settings.desc': 'Workspace tree appearance and folding preferences',
       'settings.expand': 'Expand',
@@ -279,6 +282,7 @@ window.__ModuleLoader__.load({
       'group.new.nameHint': "A \"/\" nests further, e.g. frontend/components",
       'group.new.empty': "Enter a group name",
       'group.new.root': "Top level",
+      'group.new.independent': "New top-level group",
       'group.new.pickWorkspace': "Pick a workspace",
       'group.new.noWorkspace': "No workspaces yet — add one first",
       'group.new.pickFirst': "Pick a workspace first",
@@ -336,6 +340,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': 'إعادة تسمية المجلد',
         'menu.renameSgroup': 'إعادة تسمية مجموعة الجلسات',
         'menu.moveToGroup': 'نقل إلى مجموعة…',
+        'menu.moveOutGroup': 'إخراج من المجموعة',
         'settings.title': 'مساحات عمل أفضل',
         'settings.desc': 'مظهر شجرة مساحات العمل وتفضيلات الطيّ',
         'settings.expand': 'توسيع',
@@ -415,6 +420,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "الشرطة المائلة \"/\" تنشئ مستوى أعمق، مثل frontend/components",
         'group.new.empty': "أدخل اسم المجموعة",
         'group.new.root': "المستوى الأعلى",
+        'group.new.independent': "مجموعة جديدة في المستوى الأعلى",
         'group.new.pickWorkspace': "اختر مساحة عمل",
         'group.new.noWorkspace': "لا توجد مساحات عمل بعد — أضف واحدة أولاً",
         'group.new.pickFirst': "اختر مساحة عمل أولاً",
@@ -464,6 +470,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': 'Ordner umbenennen',
         'menu.renameSgroup': 'Sitzungsgruppe umbenennen',
         'menu.moveToGroup': 'In Gruppe verschieben…',
+        'menu.moveOutGroup': 'Aus der Gruppe entfernen',
         'settings.title': 'Bessere Arbeitsbereiche',
         'settings.desc': 'Aussehen und Einklappverhalten des Arbeitsbereich-Baums',
         'settings.expand': 'Ausklappen',
@@ -543,6 +550,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "Ein „/\" verschachtelt weiter, z. B. frontend/components",
         'group.new.empty': "Gruppennamen eingeben",
         'group.new.root': "Oberste Ebene",
+        'group.new.independent': "Neue Gruppe auf oberster Ebene",
         'group.new.pickWorkspace': "Arbeitsbereich wählen",
         'group.new.noWorkspace': "Noch keine Arbeitsbereiche — zuerst einen hinzufügen",
         'group.new.pickFirst': "Zuerst einen Arbeitsbereich wählen",
@@ -592,6 +600,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': 'Renommer le dossier',
         'menu.renameSgroup': 'Renommer le groupe de sessions',
         'menu.moveToGroup': 'Déplacer vers le groupe…',
+        'menu.moveOutGroup': 'Retirer du groupe',
         'settings.title': 'Espaces de travail améliorés',
         'settings.desc': 'Apparence et repli de l\'arborescence des espaces de travail',
         'settings.expand': 'Développer',
@@ -671,6 +680,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "Un « / » imbrique davantage, par ex. frontend/components",
         'group.new.empty': "Saisissez un nom de groupe",
         'group.new.root': "Niveau supérieur",
+        'group.new.independent': "Nouveau groupe de premier niveau",
         'group.new.pickWorkspace': "Choisissez un espace de travail",
         'group.new.noWorkspace': "Aucun espace de travail — ajoutez-en un d’abord",
         'group.new.pickFirst': "Choisissez d’abord un espace de travail",
@@ -720,6 +730,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': 'फ़ोल्डर का नाम बदलें',
         'menu.renameSgroup': 'सत्र समूह का नाम बदलें',
         'menu.moveToGroup': 'समूह में ले जाएँ…',
+        'menu.moveOutGroup': 'समूह से बाहर निकालें',
         'settings.title': 'बेहतर कार्यस्थान',
         'settings.desc': 'कार्यस्थान वृक्ष का रूप और समेटने की प्राथमिकताएँ',
         'settings.expand': 'फैलाएँ',
@@ -799,6 +810,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "\"/\" और गहरा स्तर बनाता है, जैसे frontend/components",
         'group.new.empty': "समूह का नाम दर्ज करें",
         'group.new.root': "शीर्ष स्तर",
+        'group.new.independent': "नया शीर्ष-स्तरीय समूह",
         'group.new.pickWorkspace': "एक कार्यस्थान चुनें",
         'group.new.noWorkspace': "अभी कोई कार्यस्थान नहीं — पहले एक जोड़ें",
         'group.new.pickFirst': "पहले एक कार्यस्थान चुनें",
@@ -848,6 +860,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': 'Ganti nama folder',
         'menu.renameSgroup': 'Ganti nama grup sesi',
         'menu.moveToGroup': 'Pindahkan ke grup…',
+        'menu.moveOutGroup': 'Keluarkan dari grup',
         'settings.title': 'Ruang kerja yang lebih baik',
         'settings.desc': 'Tampilan dan pelipatan pohon ruang kerja',
         'settings.expand': 'Bentangkan',
@@ -927,6 +940,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "\"/\" membuat tingkat lebih dalam, mis. frontend/components",
         'group.new.empty': "Masukkan nama grup",
         'group.new.root': "Tingkat teratas",
+        'group.new.independent': "Grup tingkat teratas baru",
         'group.new.pickWorkspace': "Pilih ruang kerja",
         'group.new.noWorkspace': "Belum ada ruang kerja — tambahkan dulu",
         'group.new.pickFirst': "Pilih ruang kerja dulu",
@@ -976,6 +990,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': 'Rinomina cartella',
         'menu.renameSgroup': 'Rinomina gruppo di sessioni',
         'menu.moveToGroup': 'Sposta nel gruppo…',
+        'menu.moveOutGroup': 'Rimuovi dal gruppo',
         'settings.title': 'Aree di lavoro migliori',
         'settings.desc': 'Aspetto e compressione dell\'albero delle aree di lavoro',
         'settings.expand': 'Espandi',
@@ -1055,6 +1070,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "Una «/» annida ulteriormente, es. frontend/components",
         'group.new.empty': "Inserisci un nome di gruppo",
         'group.new.root': "Livello superiore",
+        'group.new.independent': "Nuovo gruppo di primo livello",
         'group.new.pickWorkspace': "Scegli un’area di lavoro",
         'group.new.noWorkspace': "Nessuna area di lavoro — aggiungine una prima",
         'group.new.pickFirst': "Scegli prima un’area di lavoro",
@@ -1104,6 +1120,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': 'フォルダー名を変更',
         'menu.renameSgroup': 'セッショングループ名を変更',
         'menu.moveToGroup': 'グループに移動…',
+        'menu.moveOutGroup': 'グループから出す',
         'settings.title': 'より良いワークスペース',
         'settings.desc': 'ワークスペースツリーの外観と折りたたみ設定',
         'settings.expand': '展開',
@@ -1183,6 +1200,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "/ でさらに深い階層になります(例: frontend/components)",
         'group.new.empty': "グループ名を入力してください",
         'group.new.root': "最上位",
+        'group.new.independent': "最上位に新しいグループ",
         'group.new.pickWorkspace': "ワークスペースを選択",
         'group.new.noWorkspace': "ワークスペースがありません。先に追加してください",
         'group.new.pickFirst': "先にワークスペースを選択してください",
@@ -1232,6 +1250,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': '폴더 이름 바꾸기',
         'menu.renameSgroup': '세션 그룹 이름 바꾸기',
         'menu.moveToGroup': '그룹으로 이동…',
+        'menu.moveOutGroup': '그룹에서 제거',
         'settings.title': '더 나은 워크스페이스',
         'settings.desc': '워크스페이스 트리의 모양과 접기 설정',
         'settings.expand': '펼치기',
@@ -1311,6 +1330,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "\"/\"로 더 깊은 단계, 예: frontend/components",
         'group.new.empty': "그룹 이름을 입력하세요",
         'group.new.root': "최상위",
+        'group.new.independent': "최상위 새 그룹",
         'group.new.pickWorkspace': "워크스페이스 선택",
         'group.new.noWorkspace': "워크스페이스가 없습니다. 먼저 추가하세요",
         'group.new.pickFirst': "먼저 워크스페이스를 선택하세요",
@@ -1360,6 +1380,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': 'Mapnaam wijzigen',
         'menu.renameSgroup': 'Sessiegroep naam wijzigen',
         'menu.moveToGroup': 'Naar groep verplaatsen…',
+        'menu.moveOutGroup': 'Uit groep halen',
         'settings.title': 'Betere werkruimten',
         'settings.desc': 'Uiterlijk en inklapgedrag van de werkruimteboom',
         'settings.expand': 'Uitklappen',
@@ -1439,6 +1460,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "Een \"/\" nest dieper, bijv. frontend/components",
         'group.new.empty': "Voer een groepsnaam in",
         'group.new.root': "Bovenste niveau",
+        'group.new.independent': "Nieuwe groep op hoogste niveau",
         'group.new.pickWorkspace': "Kies een werkruimte",
         'group.new.noWorkspace': "Nog geen werkruimten — voeg er eerst een toe",
         'group.new.pickFirst': "Kies eerst een werkruimte",
@@ -1488,6 +1510,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': 'Zmień nazwę folderu',
         'menu.renameSgroup': 'Zmień nazwę grupy sesji',
         'menu.moveToGroup': 'Przenieś do grupy…',
+        'menu.moveOutGroup': 'Przenieś poza grupę',
         'settings.title': 'Lepsze obszary robocze',
         'settings.desc': 'Wygląd i zwijanie drzewa obszarów roboczych',
         'settings.expand': 'Rozwiń',
@@ -1567,6 +1590,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "„/” zagnieżdża głębiej, np. frontend/components",
         'group.new.empty': "Podaj nazwę grupy",
         'group.new.root': "Najwyższy poziom",
+        'group.new.independent': "Nowa grupa najwyższego poziomu",
         'group.new.pickWorkspace': "Wybierz obszar roboczy",
         'group.new.noWorkspace': "Brak obszarów roboczych — najpierw dodaj jeden",
         'group.new.pickFirst': "Najpierw wybierz obszar roboczy",
@@ -1616,6 +1640,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': 'Renomear pasta',
         'menu.renameSgroup': 'Renomear grupo de sessões',
         'menu.moveToGroup': 'Mover para o grupo…',
+        'menu.moveOutGroup': 'Remover do grupo',
         'settings.title': 'Espaços de trabalho melhores',
         'settings.desc': 'Aparência e recolhimento da árvore de espaços de trabalho',
         'settings.expand': 'Expandir',
@@ -1695,6 +1720,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "Uma \"/\" aninha mais, ex. frontend/components",
         'group.new.empty': "Digite um nome de grupo",
         'group.new.root': "Nível superior",
+        'group.new.independent': "Novo grupo de nível superior",
         'group.new.pickWorkspace': "Escolha uma área de trabalho",
         'group.new.noWorkspace': "Ainda não há áreas de trabalho — adicione uma primeiro",
         'group.new.pickFirst': "Escolha uma área de trabalho primeiro",
@@ -1744,6 +1770,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': 'Переименовать папку',
         'menu.renameSgroup': 'Переименовать группу сессий',
         'menu.moveToGroup': 'Переместить в группу…',
+        'menu.moveOutGroup': 'Убрать из группы',
         'settings.title': 'Улучшенные рабочие области',
         'settings.desc': 'Внешний вид и сворачивание дерева рабочих областей',
         'settings.expand': 'Развернуть',
@@ -1823,6 +1850,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "«/» вкладывает глубже, напр. frontend/components",
         'group.new.empty': "Введите имя группы",
         'group.new.root': "Верхний уровень",
+        'group.new.independent': "Новая группа верхнего уровня",
         'group.new.pickWorkspace': "Выберите рабочую область",
         'group.new.noWorkspace': "Рабочих областей пока нет — сначала добавьте одну",
         'group.new.pickFirst': "Сначала выберите рабочую область",
@@ -1872,6 +1900,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': 'Byt namn på mapp',
         'menu.renameSgroup': 'Byt namn på sessionsgrupp',
         'menu.moveToGroup': 'Flytta till grupp…',
+        'menu.moveOutGroup': 'Flytta ut ur gruppen',
         'settings.title': 'Bättre arbetsytor',
         'settings.desc': 'Utseende och ihopfällning för arbetsyteträdet',
         'settings.expand': 'Fäll ut',
@@ -1951,6 +1980,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "Ett \"/\" nästlar djupare, t.ex. frontend/components",
         'group.new.empty': "Ange ett gruppnamn",
         'group.new.root': "Översta nivån",
+        'group.new.independent': "Ny grupp på översta nivån",
         'group.new.pickWorkspace': "Välj en arbetsyta",
         'group.new.noWorkspace': "Inga arbetsytor än — lägg till en först",
         'group.new.pickFirst': "Välj en arbetsyta först",
@@ -2000,6 +2030,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': 'เปลี่ยนชื่อโฟลเดอร์',
         'menu.renameSgroup': 'เปลี่ยนชื่อกลุ่มเซสชัน',
         'menu.moveToGroup': 'ย้ายไปยังกลุ่ม…',
+        'menu.moveOutGroup': 'ย้ายออกจากกลุ่ม',
         'settings.title': 'พื้นที่ทำงานที่ดีขึ้น',
         'settings.desc': 'รูปลักษณ์และการย่อของต้นไม้พื้นที่ทำงาน',
         'settings.expand': 'ขยาย',
@@ -2079,6 +2110,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "/ ใช้ซ้อนระดับลึกขึ้น เช่น frontend/components",
         'group.new.empty': "กรอกชื่อกลุ่ม",
         'group.new.root': "ระดับบนสุด",
+        'group.new.independent': "กลุ่มระดับบนสุดใหม่",
         'group.new.pickWorkspace': "เลือกเวิร์กสเปซ",
         'group.new.noWorkspace': "ยังไม่มีเวิร์กสเปซ — เพิ่มก่อน",
         'group.new.pickFirst': "เลือกเวิร์กสเปซก่อน",
@@ -2128,6 +2160,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': 'Klasörü yeniden adlandır',
         'menu.renameSgroup': 'Oturum grubunu yeniden adlandır',
         'menu.moveToGroup': 'Gruba taşı…',
+        'menu.moveOutGroup': 'Gruptan çıkar',
         'settings.title': 'Daha iyi çalışma alanları',
         'settings.desc': 'Çalışma alanı ağacının görünümü ve daraltma tercihleri',
         'settings.expand': 'Genişlet',
@@ -2207,6 +2240,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "\"/\" daha derin iç içe koyar, örn. frontend/components",
         'group.new.empty': "Bir grup adı girin",
         'group.new.root': "En üst düzey",
+        'group.new.independent': "Yeni üst düzey grup",
         'group.new.pickWorkspace': "Bir çalışma alanı seçin",
         'group.new.noWorkspace': "Henüz çalışma alanı yok — önce bir tane ekleyin",
         'group.new.pickFirst': "Önce bir çalışma alanı seçin",
@@ -2256,6 +2290,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': 'Đổi tên thư mục',
         'menu.renameSgroup': 'Đổi tên nhóm phiên',
         'menu.moveToGroup': 'Chuyển vào nhóm…',
+        'menu.moveOutGroup': 'Đưa ra khỏi nhóm',
         'settings.title': 'Không gian làm việc tốt hơn',
         'settings.desc': 'Giao diện và cách thu gọn của cây không gian làm việc',
         'settings.expand': 'Mở rộng',
@@ -2335,6 +2370,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "\"/\" lồng sâu hơn, ví dụ frontend/components",
         'group.new.empty': "Nhập tên nhóm",
         'group.new.root': "Cấp cao nhất",
+        'group.new.independent': "Nhóm cấp cao nhất mới",
         'group.new.pickWorkspace': "Chọn một không gian làm việc",
         'group.new.noWorkspace': "Chưa có không gian làm việc — hãy thêm trước",
         'group.new.pickFirst': "Chọn không gian làm việc trước",
@@ -2384,6 +2420,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': '重新命名分組',
         'menu.renameSgroup': '重新命名對話分組',
         'menu.moveToGroup': '移動到分組…',
+        'menu.moveOutGroup': '移出分組',
         'settings.title': '更好嘅工作區',
         'settings.desc': '工作區樹嘅外觀同收起偏好',
         'settings.expand': '展開',
@@ -2463,6 +2500,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "名入面嘅 / 即嵌套層級,例如 前端/組件",
         'group.new.empty': "請輸入分組名",
         'group.new.root': "最頂層",
+        'group.new.independent': "新增頂層分組",
         'group.new.pickWorkspace': "揀一個工作區",
         'group.new.noWorkspace': "仲未有工作區,請先加一個",
         'group.new.pickFirst': "請先揀一個工作區",
@@ -2512,6 +2550,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': '重新命名分組',
         'menu.renameSgroup': '重新命名對話分組',
         'menu.moveToGroup': '移動到分組…',
+        'menu.moveOutGroup': '移出分組',
         'settings.title': '更好嘅工作區',
         'settings.desc': '工作區樹嘅外觀同收起偏好',
         'settings.expand': '展開',
@@ -2591,6 +2630,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "名入面嘅 / 即嵌套層級,例如 前端/組件",
         'group.new.empty': "請輸入分組名",
         'group.new.root': "最頂層",
+        'group.new.independent': "新增頂層分組",
         'group.new.pickWorkspace': "揀一個工作區",
         'group.new.noWorkspace': "仲未有工作區,請先加一個",
         'group.new.pickFirst': "請先揀一個工作區",
@@ -2640,6 +2680,7 @@ window.__ModuleLoader__.load({
         'menu.renameFolder': '重新命名群組',
         'menu.renameSgroup': '重新命名工作階段群組',
         'menu.moveToGroup': '移動到分組…',
+        'menu.moveOutGroup': '移出分組',
         'settings.title': '更好的工作區',
         'settings.desc': '工作區樹的外觀與收合偏好',
         'settings.expand': '展開',
@@ -2719,6 +2760,7 @@ window.__ModuleLoader__.load({
         'group.new.nameHint': "名稱中的 / 即巢狀層級,例如 前端/元件",
         'group.new.empty': "請輸入分組名稱",
         'group.new.root': "最頂層",
+        'group.new.independent': "新增頂層分組",
         'group.new.pickWorkspace': "選擇一個工作區",
         'group.new.noWorkspace': "還沒有工作區,請先新增一個",
         'group.new.pickFirst': "請先選擇一個工作區",
@@ -3101,6 +3143,14 @@ window.__ModuleLoader__.load({
       return Array.isArray(raw) && raw.length > 0
     }
 
+    /**
+     * Display name of a tree folder node. compressTree materializes a
+     * single-child chain as a `kind:'ws'` row, and THAT shape carries `segs`
+     * but no `name` — reading .name alone rendered a blank row (a lone
+     * "E" above its only member F came out empty).
+     */
+    const folderLabelOf = (node) => String(node.name || (Array.isArray(node.segs) ? node.segs.join('/') : '') || node.path || '')
+
     const explicitSegsOf = (explicit, scope) => {
       const raw = explicit && typeof explicit === 'object' ? explicit[String(scope)] : undefined
       const out = []
@@ -3285,6 +3335,10 @@ window.__ModuleLoader__.load({
       // rim + a tinted wash so "this drop joins a group" reads stronger than
       // the reorder dashes above.
       '.bw-drop-into-strong{outline:2px solid var(--dsw-alias-brand-primary,#5b8def);outline-offset:-2px;background:color-mix(in srgb, var(--dsw-alias-brand-primary,#5b8def) 16%, transparent)}',
+      // Session drag whose source sits in a group: a quiet dashed line at the
+      // bottom of the tree says "anywhere outside a group = out of it". Kept
+      // faint on purpose — the row outlines are the loud feedback.
+      '.bw-root-drop-out::after{content:"";position:absolute;left:10px;right:10px;bottom:6px;border-bottom:1px dashed var(--dsw-alias-border-secondary,rgba(230,230,230,.35));pointer-events:none}',
       // v0.17.0: the new-group entry is an ICON button now (same family as the
       // search / add buttons beside it); the wording moved into its tooltip.
       '.bw-newgroup-btn{flex:none}',
@@ -3296,6 +3350,10 @@ window.__ModuleLoader__.load({
       '.bw-gn-hint{font-size:12px;color:var(--dsw-alias-label-tertiary,#9a9a9a)}',
       // A container-only node (a workspace name-group in the session layer):
       // still expandable, but it carries no workspaceId to file against.
+      // The trailing "new top-level group" row: separated from the containers
+      // above it, because it belongs to none of them.
+      '.bw-gn-row-new{margin-top:4px;border-top:1px solid var(--dsw-alias-border-l1,rgba(127,127,127,.22));border-radius:0 0 6px 6px;padding-top:4px}',
+      '.bw-gn-row-new .bw-gn-label{color:var(--dsw-alias-label-secondary,#b8b8b8)}',
       '.bw-gn-row-hold{cursor:default}',
       '.bw-gn-row-hold:hover{background:transparent}',
       '.bw-gn-row-hold .bw-gn-label{color:var(--dsw-alias-label-secondary,#b8b8b8)}',
@@ -3834,7 +3892,7 @@ window.__ModuleLoader__.load({
      * writes the declaration itself, which is why it is not the move dialog.
      */
     function GroupNewDialog(props) {
-      const { kinds, initialKind, treeOf, onConfirm, onClose, t } = props
+      const { kinds, initialKind, treeOf, label, onConfirm, onClose, t } = props
       const [kind, setKind] = React.useState(initialKind)
       const [picked, setPicked] = React.useState(null)
       const [openKeys, setOpenKeys] = React.useState({})
@@ -3859,7 +3917,7 @@ window.__ModuleLoader__.load({
           const expanded = openKeys[node.id] === true || (depth === 0 && openKeys[node.id] !== false)
           out.push(E('div', {
             key: 'n-' + node.id,
-            className: cls('bw-gn-row', node.pickable === false && 'bw-gn-row-hold', picked && picked.id === node.id && 'bw-gn-row-on'),
+            className: cls('bw-gn-row', node.pickable === false && 'bw-gn-row-hold', node.kind === 'new' && 'bw-gn-row-new', picked && picked.id === node.id && 'bw-gn-row-on'),
             style: { paddingLeft: 6 + depth * 14 },
             role: 'treeitem',
             'aria-selected': picked && picked.id === node.id ? 'true' : 'false',
@@ -3872,7 +3930,10 @@ window.__ModuleLoader__.load({
               'aria-label': node.label,
               onClick: (e) => { e.stopPropagation(); toggle(node.id) },
             }, E('span', { className: 'bw-chevron' })) : E('span', { className: 'bw-gn-twist' }),
-            E('span', { className: 'bw-gn-icon' }, node.kind === 'ws' ? icon('IconFolderOpen16', 15) : icon('IconFolderClose16', 15)),
+            E('span', { className: 'bw-gn-icon' },
+              node.kind === 'new' ? icon('IconPlusOutline16', 15)
+                : node.kind === 'ws' ? icon('IconFolderOpen16', 15)
+                  : icon('IconFolderClose16', 15)),
             E('span', { className: 'bw-gn-label' }, node.label),
           ))
           if (hasKids && expanded) out.push(...renderNodes(node.children, depth + 1))
@@ -3883,7 +3944,7 @@ window.__ModuleLoader__.load({
         open: true,
         onClose,
         closeLabel: t('close'),
-        title: t('group.new.title'),
+        title: label,
         footer: E('div', { className: 'bw-modal-actions' },
           E(BTN, { variant: 'outline', onClick: onClose }, t('cancel')),
           E(BTN, { variant: 'primary', onClick: submit }, t('confirm')),
@@ -4210,13 +4271,13 @@ window.__ModuleLoader__.load({
       )
     }
 
-    function WorkspaceRow({ workspace, depth, count, sessionsOpen, onToggle, onStart, onContextMenu, currentInside, dropHalf, dragEvents, custStyle, iconMode, pulse, t }) {
+    function WorkspaceRow({ workspace, depth, count, sessionsOpen, onToggle, onStart, onContextMenu, currentInside, dropHalf, dropInto, dragEvents, custStyle, iconMode, pulse, t }) {
       const iconEl = iconOf(iconMode, sessionsOpen)
       const iconChild = pulse
         ? E(PulseGlow, { state: pulse }, iconEl || (typeof ui.StateDot === 'function' ? E(ui.StateDot, { state: pulse, size: 10 }) : null))
         : iconEl
       return E('div', {
-        className: cls('bw-row', currentInside && 'bw-row-current', dropHalf === 'before' && 'bw-drop-before', dropHalf === 'after' && 'bw-drop-after'),
+        className: cls('bw-row', currentInside && 'bw-row-current', dropHalf === 'before' && 'bw-drop-before', dropHalf === 'after' && 'bw-drop-after', dropInto && 'bw-drop-into', dropInto && 'bw-drop-into-strong'),
         style: { paddingLeft: 6 + depth * 12, ...(custStyle || {}), ...(pulse ? { '--bw-pulse-color': PULSE_COLORS[pulse] || PULSE_COLORS.ongoing } : null) },
         onClick: onToggle,
         onContextMenu: onContextMenu,
@@ -5170,6 +5231,13 @@ window.__ModuleLoader__.load({
         if (!compactChains || draggingWorkspace) return built
         return { ...built, folders: built.folders.map((f) => materializeChain(compressTree(f))), workspaces: built.workspaces }
       }, [items, compactChains, draggingWorkspace, workspaceSlash, wsFolders])
+      // UNCOMPRESSED tree, for the new-group dialog only. compressTree merges a
+      // single-child chain into one row that stands for BOTH a group and the
+      // workspace under it — fine for drawing, useless for choosing a
+      // container: one half must stay unselectable and the other must be
+      // selectable, and a merged row cannot be both. (It also carried no
+      // `name`, which is how a lone "E" rendered blank.)
+      const rawTree = React.useMemo(() => buildTree(items, workspaceSlash, wsFolders), [items, workspaceSlash, wsFolders])
       // Disk-layer ancestry for drag semantics (same derivation as buildTree).
       const diskParentMap = React.useMemo(() => diskParentMapOf(items), [items])
 
@@ -5329,6 +5397,18 @@ window.__ModuleLoader__.load({
         const s = splitTitleSegs(String(title || ''))
         return s.length > 0 ? s[s.length - 1] : (fallback || String(title || ''))
       }
+      /**
+       * Retitle `title` so its leaf lands in the group `anchorTitle` lives in
+       * (v0.18.0). '' as the anchor group means the root level. Used by the
+       * cross-group session drop: the visible order of session rows is decided
+       * by these groups, so a drop that only reorders the flat list would leave
+       * the row exactly where it was.
+       */
+      const titleMovedToGroup = (title, anchorTitle) => {
+        const leaf = leafOf(title)
+        const group = groupPrefixOf(anchorTitle)
+        return group ? group + '/' + leaf : leaf
+      }
       /**
        * Every existing group path, deduplicated (datalist source). `kind`
        * narrows it to the name layer the dialog is about: workspace rows
@@ -5371,19 +5451,16 @@ window.__ModuleLoader__.load({
       // write target: `scope` is the store's bags key (the disk level's idPrefix
       // for workspaces, the workspaceId for sessions) and `path` is the parent
       // group's name path — the dialog appends the new name to it.
-      const wsGroupNodesOf = (node) => {
-        const out = []
-        for (const f of node.folders || []) {
-          out.push({ id: f.scope + '|' + f.path, scope: f.scope, path: f.path, label: f.name, kind: 'folder', children: wsGroupNodesOf(f) })
-        }
-        for (const w of node.workspaces || []) {
-          out.push({
-            id: w.subPrefix + '|', scope: w.subPrefix, path: '', label: w.leaf || w.title, kind: 'ws',
-            children: w.sub ? wsGroupNodesOf(w.sub) : [],
-          })
-        }
-        return out
-      }
+      // Workspace-GROUP containers: name-group folders only, never the
+      // workspaces themselves. A workspace title is "group/leaf", so with
+      // members A/B, A/C, D and E/F the only groups that exist are A and E —
+      // B, C, D and F are leaves (they are workspaces, not containers), and
+      // offering them would invite a group named after a leaf. Disk nesting is
+      // a workspace fact too, so it is skipped for the same reason.
+      const wsFolderNodesOf = (node) => (node.folders || []).map((f) => ({
+        id: f.scope + '|' + f.path, scope: f.scope, path: f.path, label: folderLabelOf(f), kind: 'folder',
+        children: wsFolderNodesOf(f),
+      }))
       const sessGroupNodesOf = (node, workspaceId) => (node.groups || []).map((g) => ({
         id: workspaceId + '|' + g.path, scope: workspaceId, path: g.path, label: g.name, kind: 'sgroup',
         children: sessGroupNodesOf(g, workspaceId),
@@ -5399,12 +5476,18 @@ window.__ModuleLoader__.load({
         if (kind === 'workspace') {
           // "Top level" IS a real target here (a group at the root of the
           // workspace tree), so it is a node like any other.
+          // A dedicated top-level row, not a root node that both expands AND
+          // accepts the new name: that read as "pick a spot inside the top
+          // level", and it left no way to say "give me a group NEXT TO A and
+          // E". The row below is that way, and A / E sit beside it as the
+          // top-level groups they actually are.
+          const groups = treeView ? wsFolderNodesOf(rawTree) : []
           return {
-            hint: null,
-            nodes: [{
-              id: '|', scope: '', path: '', label: t('group.new.root'), kind: 'folder',
-              children: treeView ? wsGroupNodesOf(tree) : [],
-            }],
+            hint: t('group.new.where'),
+            // The "top level" row sits LAST (user's call): it reads as "and
+            // here is one more, belonging to none of the above" instead of as
+            // a header the others hang under.
+            nodes: [...groups, { id: '@top', scope: '', path: '', label: t('group.new.independent'), kind: 'new', children: [] }],
           }
         }
         // A session group lives INSIDE one workspace (folders.sess is keyed by
@@ -5422,7 +5505,7 @@ window.__ModuleLoader__.load({
         const sessNodesOf = (node) => {
           const out = []
           for (const f of node.folders || []) {
-            out.push({ id: f.scope + '|' + f.path, scope: '', path: '', label: f.name, kind: 'folder', pickable: false, children: sessNodesOf(f) })
+            out.push({ id: f.scope + '|' + f.path, scope: '', path: '', label: folderLabelOf(f), kind: 'folder', pickable: false, children: sessNodesOf(f) })
           }
           for (const w of node.workspaces || []) {
             const inner = sessGroupNodesOf(buildSessionTree(sessionsOf(w), sessionSlash, sessFolders, w.workspaceId), w.workspaceId)
@@ -5434,7 +5517,7 @@ window.__ModuleLoader__.load({
           }
           return out
         }
-        if (treeView) return { hint: t('group.new.pickWorkspace'), nodes: sessNodesOf(tree) }
+        if (treeView) return { hint: t('group.new.pickWorkspace'), nodes: sessNodesOf(rawTree) }
         // One-level modes: every workspace sits at the root, exactly as the
         // sidebar draws it (raw items — there is no .sub level to nest here).
         const flat = []
@@ -5615,6 +5698,22 @@ window.__ModuleLoader__.load({
           setDrag(null)
         },
         onDragOver: (event) => {
+          // A SESSION dragged onto the workspace row lands at the root level of
+          // its session tree — the way OUT of any group (v0.18.0). Only for
+          // rows that actually sit in a group: a top-level session gains
+          // nothing here, so this row must not light up for it (the browser
+          // then shows its plain "no drop" cursor, which tells the truth).
+          if (dragMatches('session')) {
+            if (!sessionSlash || drag.source.workspaceId !== workspace.workspaceId) return
+            if (leafOf(drag.source.title) === drag.source.title) return
+            event.preventDefault()
+            event.stopPropagation()
+            try { event.dataTransfer.dropEffect = 'move' } catch { }
+            setDrag(current => (current && current.over && current.over.kind === 'ws-root' && current.over.target === workspace.workspaceId)
+              ? current
+              : (current ? { ...current, over: { kind: 'ws-root', target: workspace.workspaceId } } : current))
+            return
+          }
           if (!dragMatches('workspace')) return
           event.preventDefault()
           event.stopPropagation()
@@ -5625,6 +5724,14 @@ window.__ModuleLoader__.load({
             : (current ? { ...current, over: { kind: 'workspace', target: workspace.workspaceId, half } } : current))
         },
         onDrop: (event) => {
+          if (dragMatches('session')) {
+            if (!sessionSlash || drag.source.workspaceId !== workspace.workspaceId) return
+            if (leafOf(drag.source.title) === drag.source.title) return
+            event.preventDefault()
+            event.stopPropagation()
+            commitSessionMoveOut(workspace.workspaceId)
+            return
+          }
           if (!dragMatches('workspace')) return
           event.preventDefault()
           event.stopPropagation()
@@ -5768,17 +5875,55 @@ window.__ModuleLoader__.load({
         const anchor = half === 'after'
           ? (index === -1 ? undefined : (flat[index + 1] ? flat[index + 1].id : undefined))
           : targetSessionId
-        if (typeof insertSessionBefore === 'function') {
-          Promise.resolve()
-            .then(() => (anchor !== undefined ? insertSessionBefore(workspaceId, source.sessionId, anchor) : insertSessionBefore(workspaceId, source.sessionId)))
-            .catch(fail)
-          return
-        }
-        // Host channel gone: commit the same move into the browser-local order.
-        if (actions && typeof actions.setSessionOrder === 'function') {
-          actions.setSessionOrder(workspaceId, reorderIds(flat.map((s) => s.id), source.sessionId, anchor))
+        // v0.18.0 — a drop on a row of ANOTHER group MOVES the row (the name
+        // prefix is rewritten to the target row's group). Until then only the
+        // flat list was reordered while the visible order is decided by the
+        // groups, so a cross-group drop left the row exactly where it was and
+        // read as "the drag did nothing" (user report). Same group keeps the
+        // pure reorder; with the name layer off every group is '' — which is
+        // the same thing.
+        const target = flat.find(s => s.id === targetSessionId)
+        const nextTitle = sessionSlash && target ? titleMovedToGroup(source.title, target.title) : null
+        const reorder = () => {
+          if (typeof insertSessionBefore === 'function') {
+            return (anchor !== undefined ? insertSessionBefore(workspaceId, source.sessionId, anchor) : insertSessionBefore(workspaceId, source.sessionId))
+          }
+          // Host channel gone: commit the same move into the browser-local order.
+          if (actions && typeof actions.setSessionOrder === 'function') {
+            actions.setSessionOrder(workspaceId, reorderIds(flat.map((s) => s.id), source.sessionId, anchor))
+          }
+          return undefined
         }
+        const chain = nextTitle !== null && nextTitle !== source.title
+          ? Promise.resolve().then(() => renameByUser(source.sessionId, nextTitle))
+          : Promise.resolve()
+        chain.then(reorder).catch(fail)
+      }
+      /**
+       * Drop a session ON ITS OWN WORKSPACE ROW = leave the group (v0.18.0).
+       * The workspace row is the root of the session tree, so it is the one
+       * drop target that always exists OUTSIDE every group — the user's "drag
+       * it out of 测试1" gesture had nowhere to land before this.
+       */
+      const commitSessionMoveOut = (workspaceId) => {
+        const source = drag.source
+        setDrag(null)
+        if (!source || source.workspaceId !== workspaceId) return
+        const leaf = leafOf(source.title)
+        if (leaf === source.title) return
+        Promise.resolve()
+          .then(() => renameByUser(source.sessionId, leaf))
+          .then(() => {
+            // Append to the end of the workspace's flat order: the row now
+            // lives at the root level, and the host order is what the tree
+            // renders there — without this it would surface somewhere in the
+            // middle of the top-level rows, wherever its id happens to sit.
+            if (typeof insertSessionBefore === 'function') return insertSessionBefore(workspaceId, source.sessionId)
+            return undefined
+          })
+          .catch(fail)
       }
+      const wsRootDropActive = (workspaceId) => dragMatches('session') && drag.over !== null && drag.over.kind === 'ws-root' && drag.over.target === workspaceId
       const commitSessionMoveInto = (workspaceId, groupPath) => {
         const source = drag.source
         setDrag(null)
@@ -5993,6 +6138,7 @@ window.__ModuleLoader__.load({
           onStart: () => { actions.setSessionsExpanded(workspace.workspaceId, true); startSession(workspace.workspaceId) },
           onContextMenu: (e) => openCtx('workspace', workspace, e),
           dropHalf: wsDropHalf(workspace.workspaceId),
+          dropInto: wsRootDropActive(workspace.workspaceId),
           dragEvents: workspaceDragEvents(workspace),
           custStyle: rowStyleOf('workspace:' + workspace.workspaceId),
           iconMode: (styleEntry('workspace:' + workspace.workspaceId) || {}).icon || 'solid',
@@ -6112,8 +6258,14 @@ window.__ModuleLoader__.load({
         // probing it silently yielded a glyph-less row. IconFolderOpenOutline16
         // is present and reads as "move into a group" just as well.
         const groupItem = { id: 'move-group', label: t('menu.moveToGroup'), icon: icon('IconFolderOpenOutline16', 16) }
+        // "Leave the group" (v0.18.0) — the counterpart of move-group, offered
+        // only where a group actually exists to leave: a SESSION row whose own
+        // title carries a "/" prefix, with the session name layer on. A
+        // top-level row gets no entry (there is nothing to leave).
+        const ungroupItem = { id: 'move-out', label: t('menu.moveOutGroup'), icon: icon('IconRightUpOutline16', 16) }
         const wsGroupItems = workspaceSlash ? [groupItem] : []
         const sgroupItems = sessionSlash ? [groupItem] : []
+        const sessionUngroupItems = sessionSlash && ctx.kind === 'session' && ctx.payload && groupPrefixOf(String(ctx.payload.title || '')) !== '' ? [ungroupItem] : []
         // "Delete group" only makes sense for a DECLARED group that holds
         // nothing (v0.17.0): a group with members is a projection of their
         // titles, so removing the declaration would change nothing on screen
@@ -6142,6 +6294,7 @@ window.__ModuleLoader__.load({
           // deliberately NOT styled destructive.
           { id: 'archive', label: ot ? ot('menu.archiveSession') : t('menu.archive'), icon: icon('IconArchiveOutline20', 16) },
           { type: 'separator', id: 'bw-sep' },
+          ...sessionUngroupItems,
           ...sgroupItems,
           customizeEntry,
         ]
@@ -6184,6 +6337,12 @@ window.__ModuleLoader__.load({
         else if (kind === 'session' && id === 'rename') setDialog({ kind: 'sess-rename', session: payload })
         else if (kind === 'session' && id === 'fork') forkSession(payload.id)
         else if (kind === 'session' && id === 'archive') { Promise.resolve().then(() => archiveSession(payload.id)).catch(fail) }
+        // Plain retitle back to the leaf: the row leaves its group and returns
+        // to the top level of its workspace (v0.18.0).
+        else if (kind === 'session' && id === 'move-out') {
+          const leaf = leafOf(String(payload.title || ''))
+          if (leaf !== payload.title) Promise.resolve().then(() => renameByUser(payload.id, leaf)).catch(fail)
+        }
       }
 
       /* --------------------------- dialogs --------------------------- */
@@ -6272,6 +6431,10 @@ window.__ModuleLoader__.load({
           kinds: newGroupLayers(),
           initialKind: dialog.layer === 'workspace' ? 'workspace' : 'session',
           treeOf: newGroupTreeOf,
+          // The heading names the layer(s) the button promised: with both
+          // layers live the switch below decides, so the generic wording is
+          // accurate there and only there.
+          label: newGroupLabel(),
           onConfirm: (kind, scope, path) => { actions.addFolder(kind, scope, path); setDialog(null) },
           onClose: () => setDialog(null),
           t,
@@ -6343,7 +6506,27 @@ window.__ModuleLoader__.load({
           .catch((reason) => { fail(messageOf(reason)) })
       }
 
-      return E('div', { className: 'bw-root' },
+      // v0.18.0 — "drag it OUT" must never land on nothing. The row level
+      // already covers the workspace row and the root-level session rows; this
+      // catches everything else (the empty space below the tree, the header
+      // gap), so a drop outside every group always means the same thing:
+      // leave the group. Row handlers stopPropagation, so this only fires
+      // where no row claimed the drop.
+      const sessionCouldLeaveGroup = dragMatches('session') && sessionSlash && drag.source && leafOf(drag.source.title) !== drag.source.title
+      const rootDropEvents = {
+        onDragOver: (event) => {
+          if (!sessionCouldLeaveGroup) return
+          event.preventDefault()
+          try { event.dataTransfer.dropEffect = 'move' } catch { }
+        },
+        onDrop: (event) => {
+          if (!sessionCouldLeaveGroup) return
+          event.preventDefault()
+          commitSessionMoveOut(drag.source.workspaceId)
+        },
+      }
+
+      return E('div', { className: cls('bw-root', sessionCouldLeaveGroup && 'bw-root-drop-out'), ...rootDropEvents },
         StyleNode(),
         E('div', { className: 'bw-header' },
           E('div', { className: 'bw-header-title' }, t('title')),