dsh-wsl-tool 1.10.4 → 1.10.5

package/lib/client.js

@@ -306,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)
@@ -360,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,
@@ -497,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)
@@ -523,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,
@@ -580,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-wsl-tool",
-  "version": "1.10.4",
+  "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",