dsh-wsl-tool 1.10.4 → 1.10.6

package/PUBLISHING.md

@@ -160,6 +160,36 @@ package. "Not published" verdicts are re-probed daily, so a freshly published
 version can take a day to appear; when it does, `install` switches from the
 tarball URL to `dsh plugin --profile web add dsh-wsl-tool`.
 
+## Market screenshots
+
+The catalog's `screenshots` array is **generated from this repository**, not written
+by hand: `screenshots.json` lists repo-relative paths and the site turns each one
+into `https://raw.githubusercontent.com/XINY11451/dsh-wsl/HEAD/<path>`. That has two
+consequences worth remembering:
+
+- **Changing a preview is a commit here, not a listing PR.** The listing file's
+  hand-written keys are `url`, `name`, `category`, `tarball` and `description`;
+  everything else (including `screenshots`) is generated and must not be written by
+  hand. Only the description needs a PR against `awesome-dsh-plugin`.
+- **Replacing a file in place refreshes the preview at the same URL**, which is why
+  `assets/screenshot-1.png` keeps its name across redesigns. GitHub's raw endpoint
+  caches, so a stale image can survive a few minutes to a day.
+
+The current preview is rendered from `assets/market-preview.html` (the editable
+source of truth) with headless Edge:
+
+```powershell
+& 'C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe' --headless=new `
+  --disable-gpu --hide-scrollbars --force-device-scale-factor=2 `
+  --window-size=1280,800 --virtual-time-budget=3000 `
+  --user-data-dir="$env:TEMP\edge-shot" `
+  --screenshot="assets\screenshot-1.png" "file:///$PWD/assets/market-preview.html"
+```
+
+It renders 2560×1600 (1280×800 at 2×) in a few seconds with no browser window. The
+`--user-data-dir` keeps it away from the user's real Edge profile. Edit the HTML,
+re-run, and commit the PNG: no build step, no design tool.
+
 ## Things that bite
 
 - **A tag event runs the workflow from the tag's commit.** To change the

package/README.md

@@ -15,6 +15,8 @@ project kept on a Windows drive keeps **Windows** filesystem semantics — no PO
 permissions, case-insensitive names, no file-change notifications — at a fraction
 of the speed (see [Notes](#notes)).
 
+![The three tools, the left-sidebar switch panel, and the two limits](assets/screenshot-1.png)
+
 ## Tools
 
 The plugin registers three tools:

package/README.zh-CN.md

@@ -11,6 +11,8 @@ Linux 原生 DSH：真实的 Linux 内核与 bash、退出码与信号、超时
 （见[沙箱边界](#沙箱边界)）；项目放在 Windows 盘上时仍是 **Windows** 的文件系统语义——没有 POSIX
 权限位、文件名大小写不敏感、收不到文件变更通知——速度也低一个数量级（见[注意事项](#注意事项)）。
 
+![三个工具、左侧栏开关面板与两条限制](assets/screenshot-1.png)
+
 ## 工具
 
 插件注册三个工具：

package/assets/market-preview.html

@@ -0,0 +1,217 @@
+<!doctype html>
+<html lang="zh-CN">
+<head>
+<meta charset="utf-8">
+<title>dsh-wsl 功能介绍</title>
+<style>
+  :root {
+    --bg: #0d1017;
+    --panel: #141922;
+    --panel-2: #1a212c;
+    --line: #263041;
+    --text: #e7ecf3;
+    --dim: #9aa7b8;
+    --dim-2: #6d7a8c;
+    --accent: #4f8cff;
+    --accent-2: #46d3a4;
+    --warn: #f0a33c;
+  }
+  * { box-sizing: border-box; margin: 0; padding: 0; }
+  html, body { width: 1280px; height: 800px; overflow: hidden; }
+  body {
+    background: radial-gradient(1100px 520px at 12% -12%, #1b2740 0%, var(--bg) 62%), var(--bg);
+    color: var(--text);
+    font-family: "Segoe UI", "Microsoft YaHei", system-ui, -apple-system, sans-serif;
+    padding: 40px 44px;
+    display: flex; flex-direction: column; gap: 22px;
+  }
+  header { display: flex; align-items: flex-start; justify-content: space-between; }
+  .title { display: flex; align-items: center; gap: 14px; }
+  .mark {
+    width: 46px; height: 46px; border-radius: 12px;
+    background: linear-gradient(140deg, #2d6ae0, #46d3a4);
+    display: flex; align-items: center; justify-content: center;
+    font-size: 22px; font-weight: 700; color: #071018; letter-spacing: -1px;
+  }
+  h1 { font-size: 27px; letter-spacing: .3px; }
+  h1 span { color: var(--accent); }
+  .sub { color: var(--dim); font-size: 13.5px; margin-top: 5px; }
+  .badges { display: flex; gap: 8px; }
+  .badge {
+    border: 1px solid var(--line); background: var(--panel);
+    border-radius: 999px; padding: 5px 11px; font-size: 12px; color: var(--dim);
+  }
+  .badge.on { color: var(--accent-2); border-color: #2b5c4c; background: #10231d; }
+  main { display: grid; grid-template-columns: 1fr 430px; gap: 26px; flex: 1; min-height: 0; }
+  .col { display: flex; flex-direction: column; gap: 18px; min-height: 0; }
+  section .head {
+    font-size: 12px; letter-spacing: 2px; color: var(--dim-2);
+    text-transform: uppercase; margin-bottom: 9px;
+  }
+  .cards { display: grid; grid-template-columns: 1fr 1fr; gap: 10px; }
+  .card {
+    background: linear-gradient(180deg, var(--panel), #121721);
+    border: 1px solid var(--line); border-radius: 10px; padding: 12px 13px;
+  }
+  .card b { font-size: 14px; display: block; }
+  .card code {
+    font-family: Consolas, "Cascadia Mono", monospace; font-size: 12.5px;
+    color: var(--accent-2); background: #0e1a18; border: 1px solid #1e3d36;
+    border-radius: 5px; padding: 1px 5px;
+  }
+  .card p { color: var(--dim); font-size: 12px; margin-top: 6px; line-height: 1.55; }
+  .card.wide { grid-column: 1 / -1; }
+  .limits { border-color: #3a2f1d; background: linear-gradient(180deg, #1b1710, #14120c); }
+  .limits b { color: var(--warn); }
+  .panel {
+    background: linear-gradient(180deg, #151b25, #10151d);
+    border: 1px solid var(--line); border-radius: 14px; padding: 15px 16px;
+    display: flex; flex-direction: column; gap: 11px; min-height: 0;
+  }
+  .panel .bar { display: flex; justify-content: space-between; align-items: center; }
+  .panel .bar .t { font-size: 15px; font-weight: 600; }
+  .panel .bar .r { font-size: 11.5px; color: var(--accent); border: 1px solid #24406e; background: #101b2e; border-radius: 6px; padding: 3px 8px; }
+  .panel .note { font-size: 11.5px; color: var(--dim-2); }
+  .row { display: flex; align-items: flex-start; justify-content: space-between; gap: 12px; }
+  .row .l { min-width: 0; }
+  .row .l b { font-size: 13px; font-weight: 600; display: block; }
+  .row .l p { font-size: 11.5px; color: var(--dim); margin-top: 3px; line-height: 1.5; }
+  .sw {
+    flex: none; width: 34px; height: 19px; border-radius: 999px;
+    background: #263041; position: relative; margin-top: 2px;
+  }
+  .sw::after { content: ""; position: absolute; top: 2px; left: 2px; width: 15px; height: 15px; border-radius: 50%; background: #6d7a8c; }
+  .sw.on { background: #1d4ed8; }
+  .sw.on::after { left: 17px; background: #dce8ff; }
+  .sw.risk { background: #4a3416; }
+  .sw.risk::after { left: 17px; background: #f0c37a; }
+  .group { display: flex; flex-direction: column; gap: 9px; }
+  .group + .group { border-top: 1px dashed var(--line); padding-top: 10px; }
+  .reset { display: flex; justify-content: flex-end; align-items: center; gap: 8px; font-size: 11.5px; color: var(--dim); }
+  .reset .pill { border: 1px solid #24406e; background: #101b2e; color: #b9cdf5; border-radius: 6px; padding: 3px 8px; }
+  footer {
+    display: flex; justify-content: space-between; align-items: center;
+    border-top: 1px solid var(--line); padding-top: 14px;
+    color: var(--dim-2); font-size: 12px;
+  }
+  footer code {
+    font-family: Consolas, "Cascadia Mono", monospace; color: var(--text);
+    background: #0b0f15; border: 1px solid var(--line); border-radius: 6px; padding: 4px 8px;
+  }
+  footer .right { text-align: right; }
+</style>
+</head>
+<body>
+  <header>
+    <div class="title">
+      <div class="mark">W&#8203;SL</div>
+      <div>
+        <h1>DSH <span>×</span> WSL</h1>
+        <div class="sub">在 Windows 上执行 Linux 命令 —— 命令执行层基本对齐原生 Linux DSH</div>
+      </div>
+    </div>
+    <div class="badges">
+      <div class="badge on">左侧栏开关面板</div>
+      <div class="badge">可选：侧边栏 WSL 终端</div>
+      <div class="badge">零依赖</div>
+    </div>
+  </header>
+
+  <main>
+    <div class="col">
+      <section>
+        <div class="head">三个工具</div>
+        <div class="cards">
+          <div class="card">
+            <b><code>wsl</code> 命令执行</b>
+            <p>每次调用一个全新 shell；可喂 stdin、可设超时；退出码 / 信号 / 截断都如实回传。</p>
+          </div>
+          <div class="card">
+            <b><code>wsl-path</code> 路径互转</b>
+            <p>Windows 路径 ↔ <code>/mnt/...</code>、<code>\\wsl.localhost\</code> 双向转换。</p>
+          </div>
+          <div class="card">
+            <b><code>wsl-env</code> 能力体检</b>
+            <p>发行版、内核、systemd、cgroup、GPU 直通、docker、挂载盘与两侧配置一次看清。</p>
+          </div>
+          <div class="card">
+            <b>长任务后台跑</b>
+            <p><code>runInBackground</code> 交给内置 job 工具读回 / 中止，前台超时不再拖死。</p>
+          </div>
+          <div class="card wide">
+            <b>安全与可观测</b>
+            <p>危险命令守卫（删除 / 分区 / 关机需显式放行）；输出按流上限截断，超限会自动落盘完整文件并提供路径。</p>
+          </div>
+        </div>
+      </section>
+
+      <section>
+        <div class="head">如实说明的限制</div>
+        <div class="cards">
+          <div class="card wide limits">
+            <b>两条边界</b>
+            <p>① WSL 调用发生在 DSH 沙箱层之下，文件策略约束不到它；② 项目放在 Windows 盘时仍是 Windows 文件系统语义（9p：慢、无 inotify、权限位不生效）。</p>
+          </div>
+        </div>
+      </section>
+
+      <section>
+        <div class="head">一次真实调用</div>
+        <div class="card wide">
+          <b><code>wsl</code> · <code>wsl "cd /mnt/d/proj &amp;&amp; npm test"</code></b>
+          <p>返回 stdout / stderr / exitCode，并标记信号、超时与截断；长任务加 <code>runInBackground: true</code> 拿 jobId，用 <code>job_output</code> / <code>job_kill</code> 读回或中止。可选一条 patch 还能把桌面版「新建终端」指向 WSL（真 PTY，默认不开）。</p>
+        </div>
+      </section>
+    </div>
+
+    <div class="panel">
+      <div class="bar">
+        <div class="t">WSL</div>
+        <div class="r">全部恢复默认</div>
+      </div>
+      <div class="note">工具开关下次启动生效；其余开关即时生效。</div>
+
+      <div class="group">
+        <div class="row">
+          <div class="l"><b>wsl 命令执行</b><p>注册 <code>wsl</code> 工具：在 WSL 里执行 Linux 命令</p></div>
+          <div class="sw on"></div>
+        </div>
+        <div class="row">
+          <div class="l"><b>wsl-path 路径转换</b><p>注册 <code>wsl-path</code> 工具：路径互转</p></div>
+          <div class="sw on"></div>
+        </div>
+        <div class="row">
+          <div class="l"><b>wsl-env 能力体检</b><p>注册 <code>wsl-env</code> 工具：汇总 WSL 能力</p></div>
+          <div class="sw on"></div>
+        </div>
+      </div>
+
+      <div class="group">
+        <div class="row">
+          <div class="l"><b>后台任务</b><p>允许 <code>runInBackground</code>，由 job 工具读回</p></div>
+          <div class="sw on"></div>
+        </div>
+        <div class="row">
+          <div class="l"><b>自动转换路径</b><p>命令里的 Windows 路径自动转成 <code>/mnt/...</code></p></div>
+          <div class="sw on"></div>
+        </div>
+        <div class="row">
+          <div class="l"><b>默认跟随会话工作区</b><p>未传 workdir 时从会话目录开始</p></div>
+          <div class="sw"></div>
+        </div>
+        <div class="row">
+          <div class="l"><b>危险命令守卫</b><p>删除、分区、关机等必须显式放行</p></div>
+          <div class="sw on risk"></div>
+        </div>
+      </div>
+
+      <div class="reset"><span>已覆盖项可一键清除</span><span class="pill">每行只留「已覆盖」标记</span></div>
+    </div>
+  </main>
+
+  <footer>
+    <div>安装：<code>dsh plugin --profile web add dsh-wsl-tool</code></div>
+    <div class="right">github.com/XINY11451/dsh-wsl &nbsp;·&nbsp; dsh-wsl-tool</div>
+  </footer>
+</body>
+</html>

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.6",
   "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",