dsh-better-workspace 0.21.1 → 0.22.0

package/README.md

@@ -25,7 +25,7 @@
 
 ### 添加工作区:官方目录流
 
-点「添加工作区」走的是 **DSH 官方的目录拾取流**(v0.12.0 起):webserver 只绑本机 loopback 且有显示会话时,弹出宿主桌面上的**原生选择器**;绑到 `0.0.0.0`(局域网访问)、SSH 转发或宿主没有可用显示会话时,自动切换为官方**应用内目录浏览器**(多栏目录、从根开始的面包屑、可编辑路径、行内新建文件夹、隐藏文件开关)——这正是 0.11.x 自绘浏览器打磨的场景,官方补齐后整体让位。选完目录即创建工作区并开始一个新会话,与官方浏览器行为一致;对话空态页的「添加工作区」同样回归官方。
+点「添加工作区」走的是 **DSH 官方的目录拾取流**(v0.12.0 起):webserver 只绑本机 loopback 且有显示会话时,弹出宿主桌面上的**原生选择器**;绑到 `0.0.0.0`(局域网访问)、SSH 转发或宿主没有可用显示会话时,自动切换为官方**应用内目录浏览器**(多栏目录、从根开始的面包屑、可编辑路径、行内新建文件夹、隐藏文件开关)——这正是 0.11.x 自绘浏览器打磨的场景,官方补齐后整体让位。选完目录即创建工作区并开始一个新会话,与官方浏览器行为一致;对话空态页的「添加工作区」用的是**同一套官方占用者**,只是入口由本插件渲染(见下)。
 
 分组不靠添加时弹窗——**改名即归组**:新建后重命名工作区(名称里的 `/` 就是分组),或直接拖拽进分组行。
 
@@ -72,7 +72,14 @@
 - **拖拽还原原版能力**:工作区行可拖拽——拖到另一工作区行上/下半即调整顺序(写回宿主 registry 序),拖到分组行则移动进该分组(改写名称前缀);会话行可拖拽——同组内拖到另一会话上/下即调整顺序,拖到**别组的会话行**会把名字前缀改写到那个组(拖到根层的行 = 移出分组),拖到会话子分组行即移动进该分组,拖到**自己的工作区行**或**树里任何组外的地方**(含空白区域)同样移出分组 —— 拖拽期间工作区行整行高亮、树底部有一条淡虚线提示这个出口;带分组前缀的会话行右键还多一项「移出分组」。显示顺序 = 宿主手动序,拖拽结果立即生效。**磁盘层是文件系统事实,不随拖拽改变**:跨磁盘层的放置只重组名称分组(工作区落回自身磁盘层的末尾),同层放置才走锚点序。拖拽工作区期间,单链合并显示的行(如 工作/A)临时展开回文件夹树——路径里的每一级都是可投放的分组行,松手后自动合并回去。
 - **不丢原生能力**:会话行(打开/重命名/分叉/归档)、每工作区「新会话」(点 + 总是先展开该工作区,让新会话立刻可见)、当前会话高亮、官方状态灯(蓝色运行环 / 琥珀待交互 / 绿色完成提醒)、**状态呼吸灯**(折叠藏起的状态灯向外冒泡:工作区/分组行图标按状态色呼吸发光——琥珀待交互/绿完成,自定义过发光的标题一起呼吸;运行中只在会话行本层蓝色呼吸,不外渗;可在设置关闭)、**活跃定时任务角标**(有活动 Schedule 的会话显示闹钟图标,与官方行一致)、未分组会话兜底、界面文案跟随 DSH 的语言设置(内置 21 种语言,含简繁中文)。
 - **URL/斜杠标题不拆层**:宿主自动生成的会话标题落地时若含 `/`(如复述了 URL),整串自动包上 `“”` 原样显示,绝不解析成层级——只对本次启动后**新建的会话**生效,并等命名稳定(约 20 秒,让原生 AI 命名先落地)才处理;存量会话与你手动命名的 `/` 分组标题永不被改动。引号内(含手动添加)的 `/` 永不切分,孤立引号只当普通字符;无引号但含 URL 的旧标题也有平铺兜底。
-- **对话空态页同样生效**:会话空态页的「添加工作区」菜单同样回归官方目录流(原生选择器 / 官方应用内浏览器)。
+- **新会话页的工作区选择器 = 侧栏那棵树(v0.22.0)**:会话空态页「工作区」按钮的弹层原本是官方的一层平铺标题列表(连磁盘目录嵌套都没有);本插件接管该座位后,弹层绘制与侧栏**同一棵**树——磁盘目录嵌套、「/」名称分组三态、单链合并全部读同一个视图 store,所以侧栏的视图选项一改,**这边立刻跟着变**;当前工作区带勾选标记,分组行可开合(选择器内本地记忆,默认全展开),标题按侧栏的层级叶子显示。底部「添加工作区」仍由**官方目录拾取占用者**承载(原生选择器 / 官方应用内浏览器),不是仿制品。
+
+<table>
+<tr>
+<td align="center" width="34%"><img src="docs/screenshots/6-hero-picker.png" alt="新会话页的工作区选择器(侧栏同源的树)"/></td>
+<td valign="top"><b>同一棵树,两个入口</b><br/>左图是「新会话」页工作区按钮的弹层:分组行带 chevron(可开合)、工作区行带文件夹图标与层级缩进、当前工作区带勾选,底部是官方目录流驱动的「添加工作区」。它和左侧栏共用同一份视图状态——在侧栏把「工作区分组」从「磁盘 + 名称」换成「磁盘目录」或「仅名称」,这里的分组结构立即跟着变,不需要刷新,也没有第二份需要同步的数据。</td>
+</tr>
+</table>
 
 ## 安装
 
@@ -100,7 +107,9 @@ dsh plugin --profile web add dsh-better-workspace   # npm 公开包
 
 DSH 的侧边栏浏览区是一个公开插槽 `sidebar.workspaces`(single),官方工作区浏览器是它的占用者;本插件以更低优先级注册同一插槽,**整区替换**为层级树版本。数据全部来自插槽标准注入(`useWorkspaces` / `useSessions` 快照钩子),动作(打开会话、重命名/删除工作区、归档等)也走注入的宿主动作——不碰任何私有 API。
 
-「添加工作区」完全交给官方:本插件为 `sidebar.workspaces` 注册**声明** directoryFlow 子洞并经 `renderSlot` 消费(官方 WorkspaceBrowser 同款 children 模式),官方组合占用者(原生选择器 / 应用内浏览器)承载全部拾取交互;本插件作为 owner 只负责选完目录后的创建与新会话。该机制 0.1.2+ 宿主即可用,升级先后都收敛。
+「添加工作区」完全交给官方:官方组合占用者(原生选择器 / 应用内浏览器)承载全部拾取交互;本插件作为 owner 只负责选完目录后的创建与新会话。**两个 directoryFlow 子洞自 v0.16.0 起都不由本插件声明**——子洞声明是独占的,接管座位的一方永远拿不到 `renderSlot` 授权(相关事故见 CHANGELOG)。侧栏的添加动作因此改为直接驱动官方目录服务(native → 官方 OS 选择器;browse → 提示指向空态页),而**空态页的添加动作直接渲染官方占用者组件本身**:从 slot ledger 读出该洞的占用项(组件 + 它自己的注入面),由本插件补上 owner 对话(open / busy / onPicked / onCancel / onError)。原生与 browse 宿主各自保留出厂交互;ledger 读不到占用项时,少的只是「添加工作区」这一项,选择器照常工作。该机制 0.1.2+ 宿主即可用,升级先后都收敛。
+
+会话空态页的工作区座位(`conversation.hero.workspace`)与侧栏同理:本插件以更低优先级注册同一座位,弹层换成侧栏同源的树;该座位**不声明任何子洞**,所以官方 picker entry 的所有权不受影响。
 
 视图状态(分组折叠、会话展开)、外观自定义与插件设置都通过 dsh 客户端 store 持久化在浏览器本地(`dsh.betterWorkspace.view.v1`)。注意:该 store 的 hydration 是整值替换、不合并默认值——升级后如果遇到状态字段缺失,重启前的旧状态按旧结构保留,缺的键自动回退默认。
 
@@ -118,7 +127,8 @@ DSH 的侧边栏浏览区是一个公开插槽 `sidebar.workspaces`(single),官
 
 - 会话**跨工作区**拖拽仍被拒绝(会话归属工作区);同一工作区内的分组归属已随拖拽生效(v0.18.0:拖到别组的行改写前缀,拖到自己的工作区行移出分组,右键也有「移出分组」)。
 - 搜索为本地标题过滤(两层扁平化后逐工作区匹配);宿主内容搜索(`session.search`)计划接回。
-- flat(平铺)视图未接管,层级树即视图。
+- flat(平铺)视图未接管,层级树即视图。侧栏切到「单列表 / 按工作区」时,新会话页的选择器退化为**一层完整标题**的工作区列表(仍可选,不再分组)。
+- 新会话页选择器里的分组开合是**选择器本地状态**(默认全展开):它不写侧栏的折叠状态,免得选工作区时被侧栏的折叠挡住目标。
 
 ## 开发
 

package/README_EN.md

@@ -25,7 +25,7 @@ disk layer (paths, automatic)         name layer (titles, virtual)
 
 ### Add workspace: the official directory flow
 
-"Add workspace" runs the **official DSH picking flow** (since v0.12.0): a loopback-only webserver bind with a display session opens the host's **native OS chooser**; an all-interfaces/LAN bind, an SSH launch, or a headless host switches to the official **in-app directory browser** (Miller columns, root-anchored breadcrumbs, editable path, inline new-folder row, hidden-file toggle) — the exact scenario this plugin's hand-rolled browser polished until the official one landed. Picking a directory creates the workspace and starts a new session in it, exactly like the shipped browser; the conversation empty-state "Add workspace" returns to the official flow too.
+"Add workspace" runs the **official DSH picking flow** (since v0.12.0): a loopback-only webserver bind with a display session opens the host's **native OS chooser**; an all-interfaces/LAN bind, an SSH launch, or a headless host switches to the official **in-app directory browser** (Miller columns, root-anchored breadcrumbs, editable path, inline new-folder row, hidden-file toggle) — the exact scenario this plugin's hand-rolled browser polished until the official one landed. Picking a directory creates the workspace and starts a new session in it, exactly like the shipped browser; the conversation empty-state picker drives that same official flow from this plugin's tree popover (v0.22.0).
 
 Grouping happens by naming, not by a popup: rename the workspace after creation (every `/` in the title is a group) or drag it onto a folder row.
 
@@ -72,7 +72,7 @@ Session titles nest on `/` too (e.g. `test1/plugin maintenance`). Session groups
 - **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).
+- **The New Session workspace picker IS the sidebar tree (v0.22.0)**: the empty-state "Workspace" chip used to open the shipped one-level list of flat titles (no disk nesting at all). This plugin shadows that seat (lowest priority renders) and draws the **same** tree the sidebar draws — disk nesting, the tri-state "/" name layer, chain compression — all from the one view store, so changing a view option on the sidebar moves this popover immediately. The current workspace carries a check, folder rows fold (picker-local, fully expanded by default), and the pinned "Add workspace" action still renders the **shipped directory-picking occupant** (native chooser / official in-app browser) instead of a copy.
 
 ## Install
 

package/dsh.plugin.json

@@ -1,8 +1,8 @@
 {
   "id": "dsh-external/dsh-better-workspace",
-  "version": "0.21.1",
+  "version": "0.22.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.",
+  "description": "侧边栏工作区树:按官方磁盘目录嵌套(官方 workspace-tree 语义),可选按名称中的 / 分组(默认关闭,设置里开启);新会话页的工作区选择器同树。Workspace tree for the DSH sidebar workspace list, nested by official disk folders with optional \"/\"-name grouping; the New Session workspace picker shows the same tree.",
   "engines": {
     "dsh": ">=0.0.1"
   },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-better-workspace",
-  "version": "0.21.1",
-  "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.",
+  "version": "0.22.0",
+  "description": "侧边栏工作区树:按官方磁盘目录嵌套(官方 workspace-tree 语义),可选按名称中的 / 分组(默认关闭,设置里开启);新会话页的工作区选择器同树(同一份视图选项即时同步);添加工作区走官方目录流。Workspace tree for the DSH sidebar: disk-path nesting (official workspace-tree semantics), with optional \"/\"-name grouping (off by default), and the same tree in the New Session workspace picker; add-workspace rides the official directory flow.",
   "type": "module",
   "repository": {
     "type": "git",

package/src/client.js

@@ -139,6 +139,8 @@ window.__ModuleLoader__.load({
       'flow.creating': '正在创建…',
       'add.guide.title': "应用内添加工作区",
       'add.guide': "此主机不提供桌面目录选择器。请到「新会话」页,用官方的「添加工作区」打开应用内浏览器。",
+      'heroPicker.error.title': "无法添加工作区",
+      'heroPicker.retry': "重试",
       'error.title': '出错了',
       'cancel': '取消',
       'create': '创建',
@@ -280,6 +282,8 @@ window.__ModuleLoader__.load({
       'flow.creating': 'Creating…',
       'add.guide.title': "Add workspace in-app",
       'add.guide': "This host has no desktop directory chooser. Use the official \"Add workspace\" entry on the New Session page.",
+      'heroPicker.error.title': "Could not add workspace",
+      'heroPicker.retry': "Retry",
       'error.title': 'Something went wrong',
       'cancel': 'Cancel',
       'create': 'Create',
@@ -429,6 +433,8 @@ window.__ModuleLoader__.load({
         'flow.creating': 'جارٍ الإنشاء…',
         'add.guide.title': "إضافة مساحة عمل داخل التطبيق",
         'add.guide': "لا يوفر هذا المضيف منتقي مجلدات سطح المكتب. استخدم إدخال \"إضافة مساحة عمل\" الرسمي في صفحة الجلسة الجديدة.",
+        'heroPicker.error.title': "تعذر إضافة مساحة العمل",
+        'heroPicker.retry': "إعادة المحاولة",
         'error.title': 'حدث خطأ ما',
         'cancel': 'إلغاء',
         'create': 'إنشاء',
@@ -570,6 +576,8 @@ window.__ModuleLoader__.load({
         'flow.creating': 'Wird erstellt…',
         'add.guide.title': "Arbeitsbereich in der App hinzufügen",
         'add.guide': "Dieser Host bietet keinen Desktop-Ordnerdialog. Nutze den offiziellen Eintrag „Arbeitsbereich hinzufügen“ auf der Seite „Neue Sitzung“.",
+        'heroPicker.error.title': "Arbeitsbereich konnte nicht hinzugefügt werden",
+        'heroPicker.retry': "Erneut versuchen",
         'error.title': 'Etwas ist schiefgelaufen',
         'cancel': 'Abbrechen',
         'create': 'Erstellen',
@@ -711,6 +719,8 @@ window.__ModuleLoader__.load({
         'flow.creating': 'Création…',
         'add.guide.title': "Ajouter un espace de travail dans l’application",
         'add.guide': "Cet hôte n’a pas de sélecteur de dossier natif. Utilisez l’entrée officielle « Ajouter un espace de travail » sur la page Nouvelle session.",
+        'heroPicker.error.title': "Impossible d'ajouter l'espace de travail",
+        'heroPicker.retry': "Réessayer",
         'error.title': 'Une erreur est survenue',
         'cancel': 'Annuler',
         'create': 'Créer',
@@ -852,6 +862,8 @@ window.__ModuleLoader__.load({
         'flow.creating': 'बनाया जा रहा है…',
         'add.guide.title': "ऐप में कार्यस्थान जोड़ें",
         'add.guide': "इस होस्ट में डेस्कटॉप फ़ोल्डर चयनकर्ता नहीं है। नए सत्र पृष्ठ पर आधिकारिक \"कार्यस्थान जोड़ें\" प्रविष्टि का उपयोग करें।",
+        'heroPicker.error.title': "कार्यस्थान जोड़ा नहीं जा सका",
+        'heroPicker.retry': "पुनः प्रयास करें",
         'error.title': 'कुछ गड़बड़ हो गई',
         'cancel': 'रद्द करें',
         'create': 'बनाएँ',
@@ -993,6 +1005,8 @@ window.__ModuleLoader__.load({
         'flow.creating': 'Membuat…',
         'add.guide.title': "Tambah ruang kerja di aplikasi",
         'add.guide': "Host ini tidak punya pemilih folder desktop. Gunakan entri resmi \"Tambah ruang kerja\" di halaman Sesi Baru.",
+        'heroPicker.error.title': "Tidak dapat menambahkan ruang kerja",
+        'heroPicker.retry': "Coba lagi",
         'error.title': 'Terjadi kesalahan',
         'cancel': 'Batal',
         'create': 'Buat',
@@ -1134,6 +1148,8 @@ window.__ModuleLoader__.load({
         'flow.creating': 'Creazione…',
         'add.guide.title': "Aggiungi area di lavoro nell’app",
         'add.guide': "Questo host non ha un selettore di cartelle desktop. Usa la voce ufficiale «Aggiungi area di lavoro» nella pagina Nuova sessione.",
+        'heroPicker.error.title': "Impossibile aggiungere l'area di lavoro",
+        'heroPicker.retry': "Riprova",
         'error.title': 'Si è verificato un errore',
         'cancel': 'Annulla',
         'create': 'Crea',
@@ -1275,6 +1291,8 @@ window.__ModuleLoader__.load({
         'flow.creating': '作成中…',
         'add.guide.title': "アプリ内でワークスペースを追加",
         'add.guide': "このホストにはデスクトップのフォルダー選択画面がありません。「新規セッション」ページの公式の「ワークスペースを追加」から開いてください。",
+        'heroPicker.error.title': "ワークスペースを追加できません",
+        'heroPicker.retry': "再試行",
         'error.title': 'エラーが発生しました',
         'cancel': 'キャンセル',
         'create': '作成',
@@ -1416,6 +1434,8 @@ window.__ModuleLoader__.load({
         'flow.creating': '만드는 중…',
         'add.guide.title': "앱에서 워크스페이스 추가",
         'add.guide': "이 호스트에는 데스크톱 폴더 선택기가 없습니다. 새 세션 페이지의 공식 \"워크스페이스 추가\" 항목을 사용하세요.",
+        'heroPicker.error.title': "워크스페이스를 추가할 수 없습니다",
+        'heroPicker.retry': "다시 시도",
         'error.title': '문제가 발생했습니다',
         'cancel': '취소',
         'create': '만들기',
@@ -1557,6 +1577,8 @@ window.__ModuleLoader__.load({
         'flow.creating': 'Bezig met aanmaken…',
         'add.guide.title': "Werkruimte in de app toevoegen",
         'add.guide': "Deze host heeft geen systeemmapkiezer. Gebruik de officiële optie \"Werkruimte toevoegen\" op de pagina Nieuwe sessie.",
+        'heroPicker.error.title': "Kan werkruimte niet toevoegen",
+        'heroPicker.retry': "Opnieuw proberen",
         'error.title': 'Er is iets misgegaan',
         'cancel': 'Annuleren',
         'create': 'Aanmaken',
@@ -1698,6 +1720,8 @@ window.__ModuleLoader__.load({
         'flow.creating': 'Tworzenie…',
         'add.guide.title': "Dodaj obszar roboczy w aplikacji",
         'add.guide': "Ten host nie ma systemowego wyboru folderów. Użyj oficjalnej pozycji „Dodaj obszar roboczy” na stronie Nowa sesja.",
+        'heroPicker.error.title': "Nie można dodać obszaru roboczego",
+        'heroPicker.retry': "Ponów",
         'error.title': 'Coś poszło nie tak',
         'cancel': 'Anuluj',
         'create': 'Utwórz',
@@ -1839,6 +1863,8 @@ window.__ModuleLoader__.load({
         'flow.creating': 'Criando…',
         'add.guide.title': "Adicionar área de trabalho no app",
         'add.guide': "Este host não tem seletor de pastas do sistema. Use a entrada oficial \"Adicionar área de trabalho\" na página Nova sessão.",
+        'heroPicker.error.title': "Não foi possível adicionar o espaço de trabalho",
+        'heroPicker.retry': "Tentar novamente",
         'error.title': 'Algo deu errado',
         'cancel': 'Cancelar',
         'create': 'Criar',
@@ -1980,6 +2006,8 @@ window.__ModuleLoader__.load({
         'flow.creating': 'Создание…',
         'add.guide.title': "Добавить рабочую область в приложении",
         'add.guide': "На этом хосте нет системного выбора папок. Используйте официальный пункт «Добавить рабочую область» на странице «Новый сеанс».",
+        'heroPicker.error.title': "Не удалось добавить рабочую область",
+        'heroPicker.retry': "Повторить",
         'error.title': 'Что-то пошло не так',
         'cancel': 'Отмена',
         'create': 'Создать',
@@ -2121,6 +2149,8 @@ window.__ModuleLoader__.load({
         'flow.creating': 'Skapar…',
         'add.guide.title': "Lägg till arbetsyta i appen",
         'add.guide': "Den här värden har ingen systemmappväljare. Använd den officiella posten \"Lägg till arbetsyta\" på sidan Ny session.",
+        'heroPicker.error.title': "Kunde inte lägga till arbetsytan",
+        'heroPicker.retry': "Försök igen",
         'error.title': 'Något gick fel',
         'cancel': 'Avbryt',
         'create': 'Skapa',
@@ -2262,6 +2292,8 @@ window.__ModuleLoader__.load({
         'flow.creating': 'กำลังสร้าง…',
         'add.guide.title': "เพิ่มเวิร์กสเปซในแอป",
         'add.guide': "โฮสต์นี้ไม่มีตัวเลือกโฟลเดอร์ของระบบ ใช้รายการ \"เพิ่มเวิร์กสเปซ\" อย่างเป็นทางการในหน้าเซสชันใหม่",
+        'heroPicker.error.title': "ไม่สามารถเพิ่มพื้นที่ทำงานได้",
+        'heroPicker.retry': "ลองอีกครั้ง",
         'error.title': 'เกิดข้อผิดพลาด',
         'cancel': 'ยกเลิก',
         'create': 'สร้าง',
@@ -2403,6 +2435,8 @@ window.__ModuleLoader__.load({
         'flow.creating': 'Oluşturuluyor…',
         'add.guide.title': "Uygulama içinde çalışma alanı ekle",
         'add.guide': "Bu ana makinede masaüstü klasör seçici yok. Yeni Oturum sayfasındaki resmî \"Çalışma alanı ekle\" girişini kullanın.",
+        'heroPicker.error.title': "Çalışma alanı eklenemedi",
+        'heroPicker.retry': "Yeniden dene",
         'error.title': 'Bir şeyler ters gitti',
         'cancel': 'İptal',
         'create': 'Oluştur',
@@ -2544,6 +2578,8 @@ window.__ModuleLoader__.load({
         'flow.creating': 'Đang tạo…',
         'add.guide.title': "Thêm không gian làm việc trong ứng dụng",
         'add.guide': "Máy chủ này không có trình chọn thư mục trên màn hình. Dùng mục chính thức \"Thêm không gian làm việc\" ở trang Phiên mới.",
+        'heroPicker.error.title': "Không thể thêm không gian làm việc",
+        'heroPicker.retry': "Thử lại",
         'error.title': 'Đã xảy ra lỗi',
         'cancel': 'Hủy',
         'create': 'Tạo',
@@ -2685,6 +2721,8 @@ window.__ModuleLoader__.load({
         'flow.creating': '建立緊…',
         'add.guide.title': "應用程式內新增工作區",
         'add.guide': "呢部主機冇桌面資料夾選擇器。請去「新工作階段」頁,用官方嘅「新增工作區」開應用程式內瀏覽器。",
+        'heroPicker.error.title': "無法新增工作區",
+        'heroPicker.retry': "重試",
         'error.title': '出咗錯',
         'cancel': '取消',
         'create': '建立',
@@ -2826,6 +2864,8 @@ window.__ModuleLoader__.load({
         'flow.creating': '建立緊…',
         'add.guide.title': "應用程式內新增工作區",
         'add.guide': "呢部主機冇桌面資料夾選擇器。請去「新工作階段」頁,用官方嘅「新增工作區」開應用程式內瀏覽器。",
+        'heroPicker.error.title': "無法新增工作區",
+        'heroPicker.retry': "重試",
         'error.title': '出咗錯',
         'cancel': '取消',
         'create': '建立',
@@ -2967,6 +3007,8 @@ window.__ModuleLoader__.load({
         'flow.creating': '正在建立…',
         'add.guide.title': "應用程式內新增工作區",
         'add.guide': "此主機沒有桌面資料夾選擇器。請至「新工作階段」頁,用官方的「新增工作區」開啟應用程式內瀏覽器。",
+        'heroPicker.error.title': "無法新增工作區",
+        'heroPicker.retry': "重試",
         'error.title': '發生錯誤',
         'cancel': '取消',
         'create': '建立',
@@ -3657,6 +3699,20 @@ window.__ModuleLoader__.load({
       '.bw-row-icon{flex:none;display:grid;place-items:center;color:var(--dsw-alias-label-tertiary,#9a9a9a)}',
       '.bw-chevron{flex:none;display:grid;place-items:center;color:var(--dsw-alias-label-tertiary,#9a9a9a);transition:transform .15s ease}',
       '.bw-chevron-open{transform:rotate(90deg)}',
+      // Hero picker rows (v0.22.0): hierarchy rides the row itself — an
+      // indentation gutter, a folder chevron or workspace glyph, and the
+      // trailing check. The row mirrors the primitives menu cell (same hover
+      // and focus fill) because the fixed 14px icon cell of that row crops any
+      // indentation nested inside it.
+      '.bw-pick-row{display:flex;align-items:center;gap:6px;width:100%;min-height:30px;padding:4px 8px;border:none;border-radius:8px;background:transparent;color:inherit;font:inherit;font-size:13px;cursor:pointer;text-align:left}',
+      '.bw-pick-row:hover{background:var(--dsw-alias-interactive-bg-hover,rgba(127,127,127,.15))}',
+      '.bw-pick-row:focus-visible{background:var(--dsw-alias-interactive-bg-hover,rgba(127,127,127,.15));outline:none}',
+      '.bw-pick-indent{flex:none}',
+      '.bw-pick-glyph{flex:none;display:inline-flex;align-items:center;justify-content:center;width:16px;height:16px;color:var(--dsw-alias-label-tertiary,#9a9a9a)}',
+      '.bw-pick-glyph svg{width:16px;height:16px}',
+      '.bw-pick-name{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}',
+      '.bw-pick-folder{font-weight:600}',
+      '.bw-pick-check{flex:none;display:inline-flex;align-items:center;color:var(--dsw-alias-brand-primary,#5b8def)}',
       // overflow:hidden (needed for the ellipsis) clips the outline: 3px of
       // padding covers the widest rim (2px at the top of the slider). margin
       // cancels it, so text still starts and truncates where it did.
@@ -5138,7 +5194,7 @@ window.__ModuleLoader__.load({
      * solid icon) clears the row's entry instead of pinning a redundant copy;
      * Reset removes the entry outright.
      */
-    function CustomizeDialog({ open, initial, defaults, kind, onChange, onReset, onClose, t }) {
+    function CustomizeDialog({ open, seedKey, initial, defaults, kind, onChange, onReset, onClose, t }) {
       // Icons render only for workspace / workspace-folder rows. Session rows
       // already carry the official status dot (pending/running/done) in the
       // leading slot, and session sub-group rows have no icon either — so the
@@ -5146,11 +5202,20 @@ window.__ModuleLoader__.load({
       const allowIcon = kind === 'folder' || kind === 'workspace'
       const fallback = readAppearance(defaults)
       const [draft, setDraft] = React.useState(DEFAULT_APPEARANCE)
+      // The seed reads the CURRENT initial through a ref, and the effect keys
+      // on the edited row (seedKey) instead of the initial object: the owner
+      // rebuilds that object on every render, and a running Session re-renders
+      // the browser every few seconds — keying on the object re-seeded the
+      // draft mid-edit and threw the operator's picks away (the "flash back to
+      // default" report). Only opening the dialog or switching rows re-seeds.
+      const initialRef = React.useRef(initial)
+      initialRef.current = initial
       React.useEffect(() => {
         if (!open) return
-        const base = readAppearance(initial)
-        setDraft({ ...base, icon: (initial && initial.icon) || 'solid' })
-      }, [open, initial])
+        const seed = initialRef.current
+        const base = readAppearance(seed)
+        setDraft({ ...base, icon: (seed && seed.icon) || 'solid' })
+      }, [open, seedKey])
       if (!open) return null
       const unchanged = APPEARANCE_FIELDS.every((field) => draft[field] === fallback[field])
         && (!allowIcon || (draft.icon || 'solid') === 'solid')
@@ -5417,6 +5482,256 @@ window.__ModuleLoader__.load({
       )
     }
 
+    /* ====================== hero workspace picker ===================== */
+
+    /** The conversation empty-state picker's directory-flow hole (declared and owned by the shipped picker entry). */
+    const HERO_FLOW_HOLE = 'conversation.hero.workspace.directoryFlow'
+    /** Menu id of the picker's pinned add action — namespaced so it can never collide with a workspace id. */
+    const HERO_ADD_ID = '::bw-hero-add'
+    /** Stable empty array for memo dependencies. */
+    const EMPTY_LIST = []
+
+    /**
+     * One picker row. The row is drawn here rather than through the primitives
+     * MenuItemButton because the tree needs its own layout — an indentation
+     * gutter, the folder chevron and the trailing check — while the fixed
+     * 14px icon cell of that row crops any indentation placed inside it. The
+     * list chrome (card, scroll, outside click, arrow walk, focus return) is
+     * still the primitives Menu's: its keyboard walk reads
+     * `button[role="menuitem"]`, which is exactly what this renders.
+     */
+    function PickerRow({ depth, glyph, label, folder, checked, onSelect }) {
+      return E('button', {
+        type: 'button',
+        role: 'menuitem',
+        className: 'bw-pick-row',
+        onClick: onSelect,
+      },
+        E('span', { className: 'bw-pick-indent', style: { width: (depth * 14) + 'px' } }),
+        E('span', { className: 'bw-pick-glyph' }, glyph),
+        E('span', { className: cls('bw-pick-name', folder && 'bw-pick-folder') }, label),
+        checked ? E('span', { className: 'bw-pick-check' }, icon('IconCheckOutlineRegular', 14)) : null,
+      )
+    }
+
+    /**
+     * Conversation empty-state workspace picker (v0.22.0).
+     *
+     * The shipped picker lists every workspace title flat, in one level, with
+     * no disk nesting at all; this seat shadows it (priority -1 — lowest
+     * renders) and draws the SAME store-backed tree the sidebar draws: disk
+     * nesting by the official owning-parent semantics, the tri-state "/" name
+     * layer and chain compression all read the one view store, so a view
+     * option changed on either surface moves both. The chip, its anchor and
+     * the pick semantics stay with ui-conversation — this component renders the
+     * popover only and reports a pick through the owner's onPick.
+     *
+     * Adding a workspace stays official. Shadowing the seat forfeits the
+     * child-hole render authorization (a children declaration is exclusive,
+     * and the shipped entry keeps owning HERO_FLOW_HOLE), so the shipped
+     * occupant COMPONENT is read off the slot ledger and rendered directly —
+     * with this surface supplying the same owner conversation the shipped
+     * picker would, plus that entry's own injected face. Native and browse
+     * hosts therefore keep the interaction they shipped with; a host whose
+     * ledger hides the entry loses the add action, never the picker.
+     */
+    function HeroWorkspacePicker(props) {
+      const t = typeof props.t === 'function' ? props.t : (key => key)
+      const useWorkspaces = props.useWorkspaces
+      const useStore = props.useStore
+      const useDirectoryFlow = props.useDirectoryFlow
+      // Hook order must not depend on the injection face arriving: the fallback
+      // is a plain function (not a hook), so both branches call the same way.
+      const useFlowOccupancy = typeof useDirectoryFlow === 'function' ? useDirectoryFlow : () => 0
+      const anchorRef = props.anchorRef
+      const selectedId = props.selectedId
+      const onPick = props.onPick
+      const onClose = props.onClose
+      const heroFlowEntry = props.heroFlowEntry
+      const createWorkspace = props.createWorkspace
+
+      const snapshot = typeof useWorkspaces === 'function' ? useWorkspaces(state => state) : null
+      const groupBy = typeof useStore === 'function'
+        ? useStore(state => (state && state.groupBy) || 'workspace-tree')
+        : 'workspace-tree'
+      const groupMode = typeof useStore === 'function'
+        ? useStore(state => workspaceGroupModeOf(state && state.workspaceGroupMode, state && state.workspaceTitleSlash))
+        : 'disk'
+      const compactChains = typeof useStore === 'function'
+        ? useStore(state => !state || !state.prefs || state.prefs.compactChains !== false)
+        : true
+      const wsFolders = typeof useStore === 'function'
+        ? useStore(state => (state && state.folders && state.folders.ws) || EMPTY_FOLDERS)
+        : EMPTY_FOLDERS
+      // Occupancy is the only reactive fact here: the ledger read re-runs on
+      // every render, so the count just forces the re-render when the shipped
+      // occupant loads or unloads (its identity is stable while occupied).
+      const flowCount = useFlowOccupancy(count => count)
+      /** Picker-local collapse: the tree opens fully expanded (a chooser must show its targets) and a folder row folds only here. */
+      const [folded, setFolded] = React.useState(EMPTY_FOLDERS)
+      const [flowOpen, setFlowOpen] = React.useState(false)
+      const [picking, setPicking] = React.useState(false)
+      const [errorText, setErrorText] = React.useState(null)
+
+      const items = snapshot && Array.isArray(snapshot.items) ? snapshot.items : EMPTY_LIST
+      // Same construction the sidebar runs (buildTree + optional chain
+      // compression), so both surfaces answer the same view options.
+      const tree = React.useMemo(() => {
+        const built = buildTree(items, groupMode, wsFolders)
+        if (!compactChains) return built
+        return { ...built, folders: built.folders.map((f) => materializeChain(compressTree(f))), workspaces: built.workspaces }
+      }, [items, groupMode, wsFolders, compactChains])
+
+      const rows = React.useMemo(() => {
+        const out = []
+        const flatMode = groupBy !== 'workspace-tree'
+        const isFolded = (key) => folded[key] === true
+        const toggle = (key) => {
+          setFolded((prev) => {
+            const next = { ...prev }
+            if (next[key] === true) delete next[key]
+            else next[key] = true
+            return next
+          })
+        }
+        const pick = (workspace) => {
+          if (!workspace || workspace.workspaceId === undefined) return
+          if (typeof onPick === 'function') onPick(workspace.workspaceId)
+        }
+        // Tree rows carry the leaf the sidebar shows; flat rows carry the full
+        // title (official 'workspace' mode shows whole titles, and a picker
+        // must stay unambiguous once the folder context is gone).
+        const labelOf = (workspace) => String((flatMode ? workspace.title : workspace.leaf)
+          || workspace.title || workspace.leaf || '')
+        const workspaceRows = (entry, depth, deep) => {
+          const workspace = entry.workspace || entry
+          out.push(E(PickerRow, {
+            key: 'w:' + String(workspace.workspaceId),
+            depth,
+            glyph: icon('IconFolderCloseRegular', 16),
+            label: labelOf(workspace),
+            checked: workspace.workspaceId === selectedId,
+            onSelect: () => pick(workspace),
+          }))
+          // Disk-nested child workspaces always render: folding them away would
+          // put them out of reach of a chooser.
+          if (deep !== false && entry.sub) levelRows(entry.sub, depth + 1)
+        }
+        const folderRows = (node, depth) => {
+          // compressTree materialises a single-child chain ending in exactly
+          // one workspace as a 'ws' row: that row IS the workspace row.
+          if (node.kind === 'ws') { workspaceRows({ workspace: node.workspace }, depth, true); return }
+          const idPath = node.idPath || node.path
+          const collapsed = isFolded(idPath)
+          out.push(E(PickerRow, {
+            key: 'f:' + String(idPath),
+            depth,
+            glyph: E('span', { className: cls('bw-chevron', !collapsed && 'bw-chevron-open') }, icon('IconTriangleRightFill14', 14)),
+            label: folderLabelOf(node),
+            folder: true,
+            checked: false,
+            onSelect: () => toggle(idPath),
+          }))
+          if (collapsed) return
+          for (const child of node.folders) folderRows(child, depth + 1)
+          for (const entry of node.workspaces) workspaceRows(entry, depth + 1, true)
+        }
+        const levelRows = (level, depth) => {
+          for (const node of level.folders) folderRows(node, depth)
+          for (const entry of level.workspaces) workspaceRows(entry, depth, true)
+        }
+        if (!flatMode) levelRows(tree, 0)
+        else {
+          // Flat surfaces (official 'workspace' mode, and 'flat' where the
+          // sidebar carries no workspace rows at all): one level, full titles —
+          // a picker still has to offer every workspace.
+          const all = []
+          const collect = (level) => {
+            for (const node of level.folders) collect(node)
+            for (const entry of level.workspaces) { all.push(entry); if (entry.sub) collect(entry.sub) }
+          }
+          collect(tree)
+          for (const entry of all) workspaceRows(entry, 0, false)
+        }
+        return out
+      }, [tree, groupBy, folded, selectedId, onPick])
+
+      const flowAvailable = flowCount > 0
+      const addEntry = flowAvailable
+        ? { id: HERO_ADD_ID, label: t('add'), icon: icon('IconPlusOutlineRegular', 16) }
+        : null
+      const flowEntry = flowAvailable && typeof heroFlowEntry === 'function' ? heroFlowEntry() : null
+      const flowComponent = flowEntry && flowEntry.component ? flowEntry.component : null
+      let flowFace = null
+      if (flowEntry && typeof flowEntry.inject === 'function') {
+        try { flowFace = flowEntry.inject() } catch (error) { flowFace = null }
+      }
+      const openFlow = () => {
+        setErrorText(null)
+        setFlowOpen(true)
+        if (typeof onClose === 'function') onClose()
+      }
+      const adoptPath = (path) => {
+        setPicking(true)
+        Promise.resolve()
+          .then(() => createWorkspace({ path: String(path) }))
+          .then((workspace) => {
+            setFlowOpen(false)
+            if (workspace && workspace.workspaceId !== undefined && typeof onPick === 'function') onPick(workspace.workspaceId)
+          })
+          .catch((reason) => {
+            // The picker's own error surface: the shared picker flow answers a
+            // failed adoption with a retryable notice, and so does this one.
+            setFlowOpen(false)
+            setErrorText(messageOf(reason))
+          })
+          .then(() => { setPicking(false) })
+      }
+      const menuReady = typeof ui.Menu === 'function'
+      const menuOpen = props.open === true && (rows.length > 0 || addEntry !== null)
+      const flowNode = flowComponent && flowOpen
+        ? E(flowComponent, {
+          key: 'bw-hero-flow',
+          open: true,
+          busy: picking,
+          onPicked: adoptPath,
+          onCancel: () => { setFlowOpen(false) },
+          onError: (message) => { setFlowOpen(false); setErrorText(String(message)) },
+          ...(flowFace || EMPTY_FOLDERS),
+        })
+        : null
+      const errorNode = menuReady && errorText !== null
+        ? E(ui.Modal, {
+          open: true,
+          title: t('heroPicker.error.title'),
+          closeLabel: t('close'),
+          onClose: () => { setErrorText(null) },
+          footer: E('div', { className: 'bw-modal-actions' },
+            E(BTN, { variant: 'outline', onClick: () => { setErrorText(null) } }, t('cancel')),
+            E(BTN, { variant: 'primary', disabled: !flowAvailable, onClick: openFlow }, t('heroPicker.retry')),
+          ),
+        }, E('div', { className: 'bw-modal-body' }, E('div', { role: 'alert' }, errorText)))
+        : null
+      return E(React.Fragment, null,
+        menuReady ? E(ui.Menu, {
+          open: menuOpen,
+          // portal mode anchored on the owner's chip: the menu is the popover,
+          // never the trigger (ui-conversation renders the chip itself).
+          anchor: null,
+          items: EMPTY_LIST,
+          ...(addEntry ? { footer: [addEntry] } : {}),
+          portal: true,
+          dense: true,
+          side: 'bottom',
+          getAnchorRect: () => (anchorRef && anchorRef.current ? anchorRef.current.getBoundingClientRect() : null),
+          onClose: () => { if (typeof onClose === 'function') onClose() },
+          onSelect: (id) => { if (id === HERO_ADD_ID) openFlow() },
+        }, rows) : null,
+        flowNode,
+        errorNode,
+      )
+    }
+
     /* ============================= browser ============================ */
 
     function BetterBrowser(props) {
@@ -7295,6 +7610,9 @@ window.__ModuleLoader__.load({
         E(CustomizeDialog, {
           open: customize !== null,
           kind: customize ? customize.kind : undefined,
+          // Row identity, not the rebuilt initial object, is what re-seeds the
+          // draft (see the dialog's seed effect).
+          seedKey: customize ? customize.entryKey : undefined,
           defaults: defaultAppearance,
           initial: customize
             ? { ...appearanceOf(customize.entryKey), icon: (styleEntry(customize.entryKey) || {}).icon || 'solid' }
@@ -7575,6 +7893,47 @@ window.__ModuleLoader__.load({
         },
         BetterBrowser,
       ))
+
+      // The HERO hole (v0.22.0): the shipped picker is shadowed at priority -1
+      // and this seat draws the sidebar's own tree instead of a flat title
+      // list. Same rules as the sidebar seat — NO children declaration (the
+      // shipped picker entry keeps owning HERO_FLOW_HOLE even while shadowed,
+      // and re-declaring throws), so the add action renders the shipped
+      // occupant component read off the ledger (see HeroWorkspacePicker).
+      // Hosts without a primitives Menu keep the shipped picker: shadowing
+      // there would leave the hero with no popover at all.
+      if (typeof ui.Menu === 'function') {
+        const heroInjected = () => ({
+          createWorkspace: (input) => workspaces.create(input),
+          /**
+           * The shipped occupant's ledger entry for the hero flow hole: the
+           * renderer picks the lowest-priority live entry, and so does this
+           * read (entries arrive priority-sorted). Best-effort by design — a
+           * host that hides the ledger costs the add action, never the picker.
+           */
+          heroFlowEntry: () => {
+            try {
+              const list = slots.entries(HERO_FLOW_HOLE)
+              const entry = Array.isArray(list) && list.length > 0 ? list[0] : null
+              return entry && entry.component ? entry : null
+            } catch (error) {
+              return null
+            }
+          },
+          hooks: { directoryFlow: flowSource(slots, HERO_FLOW_HOLE) },
+        })
+        slots.inject('conversation.hero.workspace', guarded(
+          'conversation.hero.workspace',
+          {
+            name: 'conversation.hero.workspace',
+            priority: -1,
+            store: viewStore,
+            inject: heroInjected,
+            locale: NS,
+          },
+          HeroWorkspacePicker,
+        ))
+      }
     }
 
     return {