dsh-better-workspace 0.18.0 → 0.19.0

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-better-workspace",
-  "version": "0.18.0",
+  "version": "0.19.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/icon.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36" fill="none">
+  <path d="M4 10.5A2.5 2.5 0 0 1 6.5 8h6l2.4 2.8H29.5A2.5 2.5 0 0 1 32 13.3V26a2.5 2.5 0 0 1-2.5 2.5h-23A2.5 2.5 0 0 1 4 26V10.5z" stroke="#4493f8" stroke-width="1.7" stroke-linejoin="round"/>
+  <path d="M11 17.5h9M11 21.5h14" stroke="#4493f8" stroke-width="1.5" stroke-linecap="round"/>
+  <circle cx="24.5" cy="17.5" r="1.3" fill="#f0883e"/>
+</svg>

package/locale/en.json

@@ -0,0 +1,6 @@
+{
+  "meta": {
+    "title": "Better Workspace",
+    "description": "Upgrades the sidebar workspace list into a two-layer hierarchy tree (disk nesting by the official owningParentFolder semantics, optional name-slash grouping), explicit empty folders, appearance customization with live preview, and the official add-workspace flow for every backend."
+  }
+}

package/locale/zh.json

@@ -0,0 +1,6 @@
+{
+  "meta": {
+    "title": "更好的工作区",
+    "description": "把侧边栏工作区列表升级为两层层级树(磁盘层按官方 owningParentFolder 语义嵌套,名称层按标题里的 / 可选分组),支持显式空分组、带实时预览的外观自定义,添加工作区全程走官方目录流。"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-better-workspace",
-  "version": "0.18.0",
+  "version": "0.19.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": {
@@ -13,7 +13,8 @@
   "main": "src/index.js",
   "exports": {
     ".": "./src/index.js",
-    "./client": "./src/client.js"
+    "./client": "./src/client.js",
+    "./locale/*.json": "./locale/*.json"
   },
   "engines": {
     "node": ">=18",
@@ -41,7 +42,9 @@
     "dsh.plugin.json",
     "README.md",
     "README_EN.md",
-    "LICENSE"
+    "LICENSE",
+    "locale",
+    "icon.svg"
   ],
   "scripts": {
     "test": "node --test tests/smoke.mjs",
@@ -64,5 +67,9 @@
   "homepage": "https://github.com/KannaKuron/dsh-better-workspace",
   "bugs": {
     "url": "https://github.com/KannaKuron/dsh-better-workspace/issues"
+  },
+  "icon": "./icon.svg",
+  "devDependencies": {
+    "@deepseek-ai/schemastery": "^3.18.1"
   }
 }

package/src/client.js

@@ -3683,6 +3683,10 @@ window.__ModuleLoader__.load({
     // simply never mirror and never sync, which is exactly the pre-0.9.5
     // browser-local behavior.
     let prefsScopeRef = null
+    // 'settingsScope' (dsh <= 0.1.6, the shared ~/.dsh/settings.yaml home —
+    // the only world where CROSS-DEVICE sync makes sense) or 'configForms'
+    // (dsh >= 0.1.7, per-profile patch persistence). null = browser-local.
+    let prefsScopeVia = null
     const HOST_SNAP_UNAVAILABLE = { status: 'unavailable', value: undefined }
     const hostPrefsOf = (snap) => (snap && snap.status === 'ready' && snap.value && typeof snap.value === 'object'
       ? snap.value
@@ -4864,19 +4868,24 @@ window.__ModuleLoader__.load({
             E(BTN, { variant: 'outline', onClick: () => setAppearance(DEFAULT_APPEARANCE) }, t('settings.appearance.reset')),
           ),
         ),
-        E('div', { className: 'bw-setting-label', style: { marginTop: 16 } }, t('sync.title')),
-        E('div', { className: 'bw-hint' }, t('sync.desc')),
-        E('div', { className: 'bw-sync-modes' },
-          modeButton('overwrite', t('sync.mode.overwrite')),
-          modeButton('merge', t('sync.mode.merge')),
-        ),
-        E('div', { className: 'bw-sync-actions' },
-          syncActionButton(t(IS_DESKTOP_SURFACE ? 'sync.pull.web' : 'sync.pull.desktop'), onPull, true, !scopeLive || snap.status === 'loading'),
-          syncActionButton(t('sync.push'), onPush, false, !scopeLive),
-        ),
-        syncMsg !== null ? E('div', { className: 'bw-hint' }, syncMsg)
-          : (scopeLive ? null : E('div', { className: 'bw-hint' }, t('sync.off'))),
-        scopeLive && snap.status === 'loading' ? E('div', { className: 'bw-hint' }, t('sync.loading')) : null,
+        // Manual cross-device sync exists only where a SHARED host home does
+        // (dsh <= 0.1.6 settings.yaml; both surfaces read one file). On
+        // dsh >= 0.1.7 settings persist per profile, so the section hides.
+        prefsScopeVia === 'settingsScope' ? E(React.Fragment, null,
+          E('div', { className: 'bw-setting-label', style: { marginTop: 16 } }, t('sync.title')),
+          E('div', { className: 'bw-hint' }, t('sync.desc')),
+          E('div', { className: 'bw-sync-modes' },
+            modeButton('overwrite', t('sync.mode.overwrite')),
+            modeButton('merge', t('sync.mode.merge')),
+          ),
+          E('div', { className: 'bw-sync-actions' },
+            syncActionButton(t(IS_DESKTOP_SURFACE ? 'sync.pull.web' : 'sync.pull.desktop'), onPull, true, !scopeLive || snap.status === 'loading'),
+            syncActionButton(t('sync.push'), onPush, false, !scopeLive),
+          ),
+          syncMsg !== null ? E('div', { className: 'bw-hint' }, syncMsg)
+            : (scopeLive ? null : E('div', { className: 'bw-hint' }, t('sync.off'))),
+          scopeLive && snap.status === 'loading' ? E('div', { className: 'bw-hint' }, t('sync.loading')) : null,
+        ) : null,
       )
     }
 
@@ -6788,14 +6797,38 @@ window.__ModuleLoader__.load({
       // block). Binding is best-effort: a missing/failed bind leaves the
       // plugin fully browser-local — the pre-0.9.5 behavior.
       prefsScopeRef = null
+      prefsScopeVia = null
       try {
         if (ctx.settingsScope && typeof ctx.settingsScope.bind === 'function') {
           prefsScopeRef = ctx.settingsScope.bind({ namespace: 'better-workspace' })
+          prefsScopeVia = 'settingsScope'
         }
       } catch (error) {
         console.warn('[dsh-better-workspace] settings scope bind failed; sync stays local', error)
         prefsScopeRef = null
       }
+      // dsh >= 0.1.7: the settings service is gone; one ConfigForm per live
+      // profile entry replaces it (same getSnapshot/set/subscribe contract).
+      // Values then persist in THIS profile's patch — there is no shared home
+      // any more, so the manual cross-device sync section stays hidden.
+      try {
+        if (ctx.inject) {
+          ctx.inject(['configForms'], (fctx) => {
+            try {
+              if (prefsScopeVia === 'settingsScope') return
+              const forms = fctx && fctx.configForms
+              if (forms && typeof forms.get === 'function') {
+                prefsScopeRef = forms.get('better-workspace')
+                prefsScopeVia = 'configForms'
+              }
+            } catch (error) {
+              console.warn('[dsh-better-workspace] configForms acquisition failed', error)
+            }
+          })
+        }
+      } catch (error) {
+        console.warn('[dsh-better-workspace] configForms wiring failed', error)
+      }
 
       // Settings → Plugins card only (the tab dispatches the intersection of
       // served namespaces — registered host-side — and settings.plugin.item
@@ -6849,7 +6882,7 @@ window.__ModuleLoader__.load({
 
     return {
       name: 'dsh-better-workspace',
-      inject: ['slots', 'sessions', 'workspaces', 'locale', 'uiWorkspace', 'settingsScope'],
+      inject: ['slots', 'sessions', 'workspaces', 'locale', 'uiWorkspace'],
       apply,
     }
   },

package/src/index.js

@@ -1,3 +1,4 @@
+import Schema from '@deepseek-ai/schemastery'
 /**
  * dsh-better-workspace — host half (plain JavaScript, no build step).
  *
@@ -10,6 +11,36 @@
  */
 export const name = 'dsh-better-workspace'
 
+/**
+ * dsh >= 0.1.7 marks a Config field live-editable without remount; a
+ * 0.1.6-era schemastery predates the method and the guard keeps this module
+ * loadable there (values then behave as ordinary config, read through the
+ * registered settings namespace instead).
+ */
+function live(schema) {
+  return typeof schema.volatile === 'function' ? schema.volatile() : schema
+}
+
+/**
+ * Row Config = the settings surface on dsh >= 0.1.7 (values persist under the
+ * row id 'better-workspace' — the same string as the old settings namespace,
+ * so the one-shot legacy settings.yaml import maps old user values onto the
+ * new home). Inert metadata on older hosts. NOTE: settings are per-profile
+ * on the new host; the client hides the manual cross-device sync section
+ * accordingly (the shared settings.yaml home no longer exists).
+ */
+export const Config = Schema.object({
+  compactChains: live(Schema.boolean().default(true)),
+  statusPulse: live(Schema.boolean().default(true)),
+  styling: live(Schema.dict(Schema.any()).default({})),
+  appearance: live(Schema.dict(Schema.any()).default({})),
+})
+
+/** Read one Config value across eras: Volatile ref (>= 0.1.7) or plain value. */
+export function valueOf(value) {
+  return value && typeof value.get === 'function' ? value.get() : value
+}
+
 export function apply(ctx) {
   const log = ctx && ctx.logger && typeof ctx.logger.info === 'function'
     ? (msg) => ctx.logger.info(msg)
@@ -24,7 +55,18 @@ export function apply(ctx) {
   // The dsh-settings and zod modules resolve only through the dsh Loader; the
   // smoke test imports this file in plain Node with a logger-only ctx and
   // never reaches this path.
-  ctx.inject(['settings'], (sctx) => {
+  // OLD-era namespace registration (dsh <= 0.1.6): the row Config above IS
+  // the surface on dsh >= 0.1.7 — register() no longer exists there and this
+  // block is skipped entirely.
+  const legacySettings = (() => {
+    try {
+      const settings = ctx.get('settings')
+      return !!(settings && typeof settings.register === 'function')
+    } catch {
+      return false
+    }
+  })()
+  if (legacySettings) ctx.inject(['settings'], (sctx) => {
     log('[dsh-better-workspace] settings inject fired')
     // The settings service calls the schema AS A FUNCTION to resolve a value
     // (schema(mergeLayers(...))) — that is @deepseek-ai/schemastery's contract: