dsh-wsl-tool 1.10.3 → 1.10.5

package/lib/client.js

@@ -191,7 +191,12 @@ window.__ModuleLoader__.load({
         if (cursor === null || typeof cursor !== 'object') return undefined
         cursor = cursor[step]
       }
-      return cursor
+      // A `.volatile()` field can arrive as a cosmokit cell rather than its value;
+      // the platform's own form model hands out plain values, but unwrapping here
+      // costs nothing and keeps a switch from rendering a cell object as "on".
+      return cursor !== null && typeof cursor === 'object' && typeof cursor.get === 'function'
+        ? cursor.get()
+        : cursor
     }
 
     /**
@@ -301,12 +306,17 @@ window.__ModuleLoader__.load({
          * a refusal, so this panel does the same — `false` means "not saved", and
          * the panel words it instead of pretending the switch moved.
          */
-        write: async (op) => {
+        write: async (ops) => {
           const snapshot = read()
           if (scope === undefined || typeof scope.mutate !== 'function') return false
           if (snapshot.writable !== true) return false
+          // One op or an ordered batch: the service applies a batch in one
+          // revision-fenced write, which is what the panel's single "restore every
+          // default" control uses.
+          const batch = Array.isArray(ops) ? ops : [ops]
+          if (batch.length === 0) return true
           try {
-            const landed = await scope.mutate([op], snapshot.revision)
+            const landed = await scope.mutate(batch, snapshot.revision)
             return Boolean(landed)
           } catch (error) {
             console.error('dsh-wsl-tool: writing the configuration failed', error)
@@ -355,6 +365,14 @@ window.__ModuleLoader__.load({
     const ROW_COPY_STYLE = { display: 'flex', flexDirection: 'column', gap: '2px', minWidth: 0 }
     const ROW_LABEL_STYLE = { display: 'flex', alignItems: 'center', gap: '6px', fontWeight: 500 }
     const ROW_ACTIONS_STYLE = { display: 'flex', alignItems: 'center', gap: '8px', flexShrink: 0 }
+    /** The panel's single override bar; `rowGap` keeps it readable above the rows. */
+    const OVERRIDE_BAR_STYLE = {
+      display: 'flex',
+      alignItems: 'center',
+      gap: '8px',
+      justifyContent: 'flex-end',
+      padding: '6px 0',
+    }
     const HINT_STYLE = { margin: 0, color: LABEL_TERTIARY, fontSize: '12px', lineHeight: '18px', maxWidth: '66ch' }
     const BADGE_STYLE = {
       border: '0.5px solid ' + BORDER_BADGE,
@@ -492,8 +510,9 @@ window.__ModuleLoader__.load({
         })
       }
 
-      /** One switch row: switch, label and hint on the left, override controls and
-       *  the switch itself on the right. */
+      /** One switch row: copy on the left, an override badge and the switch on the
+       *  right. Clearing overrides is NOT offered per row — the panel has one
+       *  control for that, so eleven rows do not repeat the same button. */
       const rowElement = (row) => {
         const key = row.path.join('.')
         const overridden = hasPath(snapshot.user, row.path)
@@ -518,21 +537,6 @@ window.__ModuleLoader__.load({
             'div',
             { style: ROW_ACTIONS_STYLE },
             overridden ? React.createElement('span', { style: BADGE_STYLE }, '已覆盖') : null,
-            overridden
-              ? React.createElement(
-                  'button',
-                  {
-                    type: 'button',
-                    style: RESET_STYLE,
-                    disabled,
-                    // Returned as well as performed: React ignores a handler's
-                    // return value, but awaiting it is how a test sees the write
-                    // settle.
-                    onClick: () => submit({ op: 'unset', path: row.path }, key),
-                  },
-                  '恢复默认',
-                )
-              : null,
             React.createElement(primitives.Switch, {
               checked,
               label: row.label,
@@ -575,9 +579,37 @@ window.__ModuleLoader__.load({
           React.createElement('p', { key: 'note-unavailable', style: NOTE_STYLE }, '此 DSH 未提供该插件的配置作用域'),
         )
       } else {
+        const overriddenPaths = SECTIONS
+          .flatMap((group) => group.rows)
+          .filter((row) => hasPath(snapshot.user, row.path))
+          .map((row) => row.path)
         const blocks = SECTIONS.map((group) =>
           section(group.id, group.title, React.createElement('div', { style: ROWS_STYLE }, group.rows.map(rowElement))),
         )
+        // ONE place to clear every override, instead of the same button repeated on
+        // every row. "Put this panel back the way the composition had it" is one
+        // intention, and the settings service takes it as one revision-fenced write.
+        if (overriddenPaths.length > 0) {
+          blocks.unshift(
+            React.createElement(
+              'div',
+              { key: 'overrides', style: OVERRIDE_BAR_STYLE },
+              React.createElement('span', { style: BADGE_STYLE }, '已覆盖 ' + overriddenPaths.length + ' 项'),
+              React.createElement(
+                'button',
+                {
+                  type: 'button',
+                  style: RESET_STYLE,
+                  disabled: snapshot.writable !== true || busy !== undefined,
+                  // Returned as well as performed: React ignores a handler's return
+                  // value, but awaiting it is how a test sees the write settle.
+                  onClick: () => submit(overriddenPaths.map((path) => ({ op: 'unset', path })), 'all-overrides'),
+                },
+                '全部恢复默认',
+              ),
+            ),
+          )
+        }
         if (refused) {
           blocks.unshift(
             React.createElement('p', { key: 'note-refused', style: NOTE_STYLE }, '保存被拒绝：配置没有被写入，请重试'),

package/lib/config.js

@@ -92,7 +92,25 @@ function envInt(env, name, fallback, min, max) {
 
 /** A configured boolean, or the fallback when the layer did not set one. */
 function setting(value, fallback) {
-  return typeof value === 'boolean' ? value : fallback
+  const raw = unbox(value)
+  return typeof raw === 'boolean' ? raw : fallback
+}
+
+/**
+ * Read one configuration value, unwrapping a volatile cell.
+ *
+ * A `.volatile()` schema field does NOT resolve to its value: schemastery wraps it
+ * with cosmokit's `createVolatile(default)`, which is why the shipped plugins read
+ * theirs as `config.timeoutMs.get()` (`dsh-bash-local`). The cell is written in
+ * place when the user edits the field, and that in-place write is exactly what makes
+ * an edit apply without remounting the plugin — so reading through `.get()` is both
+ * required for correctness and how live updates arrive. A plain value (an older
+ * host, or a hand-built settings object in a test) passes through untouched.
+ */
+function unbox(value) {
+  return value !== null && typeof value === 'object' && typeof value.get === 'function'
+    ? value.get()
+    : value
 }
 
 /**
@@ -101,7 +119,8 @@ function setting(value, fallback) {
  * @returns a distribution name to pin, or null to use the system default.
  */
 function resolveDistro(env, configured) {
-  if (typeof configured === 'string' && configured.trim() !== '') return configured.trim()
+  const distro = unbox(configured)
+  if (typeof distro === 'string' && distro.trim() !== '') return distro.trim()
   const raw = env.DSH_WSL_DISTRO
   return typeof raw === 'string' && raw.trim() !== '' ? raw.trim() : null
 }
@@ -121,7 +140,7 @@ function resolveWorkdir(env, settings) {
   // Only the ON position is authoritative: off means "whatever the layers below
   // say", so `DSH_WSL_WORKDIR=session` keeps working for a user who never opened
   // the panel, and a fresh install still starts in `~`.
-  if (settings.startInSessionWorkspace === true) return null
+  if (unbox(settings.startInSessionWorkspace) === true) return null
   const raw = env.DSH_WSL_WORKDIR
   if (typeof raw !== 'string' || raw.trim() === '') return DEFAULTS.workdir
   const value = raw.trim()
@@ -148,11 +167,12 @@ export function resolveConfig(env = process.env, settings = {}) {
   const maxCommandTimeoutMs = envInt(
     env, 'DSH_WSL_MAX_TIMEOUT_MS', DEFAULTS.maxCommandTimeoutMs, TIMEOUT_MS_MIN, DEFAULTS.maxTimerDelayMs,
   )
-  const tools = settings.tools ?? {}
+  const tools = unbox(settings.tools) ?? {}
   // 0 means "not configured", so the environment and the built-in default still
   // decide; a positive value is the user's own deadline.
-  const configuredTimeoutMs = Number.isInteger(settings.timeoutMs) && settings.timeoutMs > 0
-    ? settings.timeoutMs
+  const configuredTimeout = unbox(settings.timeoutMs)
+  const configuredTimeoutMs = Number.isInteger(configuredTimeout) && configuredTimeout > 0
+    ? configuredTimeout
     : undefined
   return {
     ...DEFAULTS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-wsl-tool",
-  "version": "1.10.3",
+  "version": "1.10.5",
   "description": "Run Linux commands from Windows through WSL, essentially matching a native Linux DSH for command execution: background jobs, stdin, path translation, a destructive-command guard and a WSL capability report. A left-sidebar panel switches each capability on or off, each with a one-line explanation, and an opt-in patch gives the desktop app's sidebar terminal a WSL shell. WSL calls run below the DSH sandbox, and a project on a Windows drive keeps Windows filesystem semantics.",
   "type": "module",
   "main": "index.js",