dsh-wsl-tool 1.8.2 → 1.9.1

package/PUBLISHING.md

@@ -61,10 +61,11 @@ both that the entry stays relative and that it resolves.
    ```
 
    `npm run sync` defaults to
-   `%USERPROFILE%/.dsh/profiles/web/node_modules/dsh-wsl` — the folder the
+   `%USERPROFILE%/.dsh/profiles/desktop/node_modules/dsh-wsl` — the folder the
    profile's dependency key created, which need not match the npm name. Pass a
    path to target another profile. Restart DSH afterwards: the plugin is imported
-   once at load.
+   once at load. A patch change (the tool row, or the sidebar terminal override)
+   is read at composition time, so it needs that restart too.
 
 3. The tag runs the pipeline. The order is deliberate — the release asset goes
    **first** because it is the market's critical path, then npm, so a failing npm
@@ -100,6 +101,14 @@ both that the entry stays relative and that it resolves.
    artifact, not just the metadata. Scripted requests to `npmjs.com`'s HTML hit a
    Cloudflare challenge; the registry API is the source of truth.
 
+   Expect the registry's caches to lag a publish by minutes, and to lag
+   *inconsistently*: the full packument, the abbreviated (install) packument,
+   `/-/package/<name>/dist-tags` and the tarball URL each cache separately, so one
+   endpoint can already report the new version while `npm install` still answers
+   `404` for its tarball. Re-query instead of concluding the publish failed, and
+   cache-bust the tarball URL (`?cb=<random>`) to tell a stale negative entry apart
+   from an artifact that is genuinely missing.
+
    **Market asset** (this is what users install, and it is independent of npm):
 
    ```sh

package/README.md

@@ -134,6 +134,40 @@ A background job is owned by the calling session (`owner: exec.agent.id`), which
 is what lets the model read it back with `job_output`/`job_kill` and what keeps
 other sessions out; an execution with no agent starts the job unowned.
 
+## Optional: a WSL terminal in the sidebar
+
+The desktop app's sidebar terminal can open WSL instead of a Windows shell. It is
+**opt-in** — installing this plugin does not change which shell your terminals
+open — and the patch that enables it ships in the package as
+[`extras/terminal-wsl.patch.yml`](extras/terminal-wsl.patch.yml).
+
+To turn it on, copy that entry into your profile's own patch layer
+(`$DSH_HOME/profiles/<profile>/cordis.patch.yml`); a CLI launch can instead pass
+`--patch <path to the installed file>`. It applies at the next app start.
+
+```yaml
+- id: terminal-controller
+  config:
+    shell:
+      path: 'C:\Windows\System32\wsl.exe'
+      name: WSL
+      args: ['-e', 'bash', '-l']
+```
+
+- The sidebar's 新建终端 list is built from the composed `terminal-controller`
+  row: it lists the configured `shell` first and keeps the shells it discovers
+  (`powershell`, `cmd`, `bash`, …) selectable. The picker is core UI, so overriding
+  that row is the supported way in — which is also why this cannot be a plain
+  plugin entry.
+- No distribution is pinned, so `wsl.exe` follows the system default — the same
+  rule the tools use when `DSH_WSL_DISTRO` is unset. Add `-d <name>` to `args` to
+  pin one.
+- The session workspace is a Windows path that `wsl.exe` translates, so the
+  terminal opens in `/mnt/<drive>/…` exactly like the Windows shells do; and it is
+  a real PTY (`xterm-256color`), so full-screen programs work.
+- An id-targeted patch replaces that row's whole config, so restate anything else
+  you had set on it (terminal limits, scrollback, a custom `shellCandidates` list).
+
 ## `wsl` parameters
 
 | Param | Required | Type | Notes |
@@ -342,7 +376,7 @@ A `file:` dependency is a **copy**, so editing this checkout does not change wha
 DSH loads. After any change:
 
 ```sh
-npm run sync                  # copies into ~/.dsh/profiles/web/node_modules/dsh-wsl
+npm run sync                  # copies into ~/.dsh/profiles/desktop/node_modules/dsh-wsl
 npm run sync -- /path/to/profiles/<profile>/node_modules/<your-key>
 ```
 

package/README.zh-CN.md

@@ -116,6 +116,34 @@ DSH_SUBPROCESS_LOCAL=/path/to/dsh/node_modules npm run test:real
 `job_output`/`job_kill` 读回它的依据，也是其他会话读不到它的围栏；exec 里没有 agent 时
 任务则是无主的。
 
+## 可选：在侧边栏开一个 WSL 终端
+
+桌面版侧边栏终端可以开 WSL 而不是 Windows shell。这是**可选**的 —— 装插件**不会**改你终端默认
+开什么 —— 启用用的 patch 随包提供：[`extras/terminal-wsl.patch.yml`](extras/terminal-wsl.patch.yml)。
+
+启用方式：把里面的条目复制进你自己 profile 的 patch 层
+（`$DSH_HOME/profiles/<profile>/cordis.patch.yml`）；命令行启动也可以改成
+`--patch <已安装文件路径>`。**下次启动应用时生效。**
+
+```yaml
+- id: terminal-controller
+  config:
+    shell:
+      path: 'C:\Windows\System32\wsl.exe'
+      name: WSL
+      args: ['-e', 'bash', '-l']
+```
+
+- 「新建终端」的列表来自组合里的 `terminal-controller` 行：它把配置的 `shell` 排在最前，同时保留
+  它发现的 `powershell`/`cmd`/`bash` 等可选。那个选择列表属于核心 UI，所以**按 id 覆盖该行**是
+  受支持的入口 —— 这也是它没法做成普通插件条目的原因。
+- **不锁定发行版**：`wsl.exe` 跟随系统默认，与工具在未设 `DSH_WSL_DISTRO` 时的规则一致。要锁定就
+  在 `args` 里加 `-d <名字>`。
+- 会话工作区是 Windows 路径，`wsl.exe` 会自动翻译，因此终端像 Windows shell 一样落在
+  `/mnt/<盘>/…`；而且是**真 PTY**（`xterm-256color`），全屏程序可用。
+- 按 id 的 patch 会**整段替换**该行 config，你之前在该行上设过的东西（终端上限、scrollback、
+  自定义 `shellCandidates`）要一并重述。
+
 ## `wsl` 参数
 
 | 参数 | 必填 | 类型 | 说明 |
@@ -318,7 +346,7 @@ DSH_SUBPROCESS_LOCAL=/path/to/dsh/node_modules npm run test:real
 `file:` 依赖是**副本**，改本仓库不会改变 DSH 实际加载的内容。任何改动之后：
 
 ```sh
-npm run sync                  # 复制到 ~/.dsh/profiles/web/node_modules/dsh-wsl
+npm run sync                  # 复制到 ~/.dsh/profiles/desktop/node_modules/dsh-wsl
 npm run sync -- /path/to/profiles/<profile>/node_modules/<你的依赖名>
 ```
 

package/cordis.patch.yml

@@ -6,6 +6,10 @@
 # `tool "wsl" is already registered in this scope`. To keep the tools out of a
 # composition, override this row by id in a later patch layer (`- id: tool-wsl`
 # with `disabled: true`) instead of duplicating it.
+#
+# This file deliberately changes nothing else: installing a tool plugin must not
+# reshape someone's session. Pointing the desktop app's sidebar terminal at WSL is
+# offered as an opt-in instead — see `extras/terminal-wsl.patch.yml`.
 
 # The entry name is PATH-RELATIVE on purpose. DSH anchors a relative `name:` to
 # the directory of the patch file that declared it (`anchorInsertedPluginNames`),

package/extras/terminal-wsl.patch.yml

@@ -0,0 +1,34 @@
+# OPTIONAL — give the desktop app's sidebar terminal a WSL shell.
+#
+# This is deliberately NOT part of the bundle patch: installing a tool plugin must
+# not change which shell someone's terminals open by default. To opt in, copy the
+# entry below into the profile's own patch layer
+# (`$DSH_HOME/profiles/<profile>/cordis.patch.yml`), or hand this file to a CLI
+# launch with `--patch <path to this file>`. It applies at the next app start.
+#
+# Why an id-targeted override: the sidebar's 新建终端 list is built from the
+# composed `terminal-controller` row, which discovers shells from
+# `shellCandidates` and lists the configured `shell` first. A candidate entry
+# cannot do it — a shell found by name gets `-i` appended, and `wsl.exe -i` is a
+# hard error. The picker itself is core UI, so a plugin cannot add an entry to it;
+# overriding the row is the supported way in.
+#
+# The path is absolute because a configured shell that fails to resolve makes every
+# new terminal fail, not just this one, and wsl.exe ships with Windows at a fixed
+# location whether or not a distribution is installed yet.
+#
+# No distribution is pinned, so `wsl.exe` follows the system default — the same
+# rule the tools use when `DSH_WSL_DISTRO` is unset. Add `-d <name>` to `args` to
+# pin one.
+#
+# An id-targeted patch replaces that row's whole config, so anything a layer below
+# set on it (terminal limits, scrollback, a custom `shellCandidates` list) falls
+# back to its schema default; only `shell` is set here on purpose. Never add
+# `disabled:` — that would switch the whole terminal feature off instead of
+# adjusting it.
+- id: terminal-controller
+  config:
+    shell:
+      path: 'C:\Windows\System32\wsl.exe'
+      name: WSL
+      args: ['-e', 'bash', '-l']

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-wsl-tool",
-  "version": "1.8.2",
-  "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. WSL calls run below the DSH sandbox, and a project on a Windows drive keeps Windows filesystem semantics.",
+  "version": "1.9.1",
+  "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. Optionally 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",
   "license": "MIT",
@@ -30,6 +30,7 @@
     "README.md",
     "README.zh-CN.md",
     "PUBLISHING.md",
+    "extras",
     "screenshots.json",
     "assets",
     "LICENSE"