dsh-bash-terminal-ts 0.5.0 → 0.5.1

package/README.en.md

@@ -20,7 +20,7 @@ A DeepSeek Harness (DSH) plugin: one `shell` tool that runs commands through **P
 | Backend | Runs | Syntax / paths | Env vars |
 |---------|------|----------------|----------|
 | `powershell` (default) | `pwsh -NoLogo -NoProfile -NonInteractive -Command <cmd>` | PowerShell; `C:\\...` | `$env:NAME` |
-| `gitbash` | Git for Windows `bash -lc <cmd>` | POSIX; `/d/WorkSpace`; PATH includes `/usr/bin` and `/mingw64/bin` | `$NAME` |
+| `gitbash` | Git for Windows `bash -lc <cmd>` | POSIX; `/d/workspace`; PATH includes `/usr/bin` and `/mingw64/bin` | `$NAME` |
 | `msys2` | MSYS2 `bash -lc <cmd>` (`C:\msys64\usr\bin\bash.exe`) | POSIX; `/c/...`; PATH includes `/usr/bin` and `/mingw64/bin` (gcc / make) | `$NAME` (MSYSTEM=MINGW64 injected) |
 | `wsl` | `wsl [-d <distro>] -e bash -lc <cmd>` | Linux; `/mnt/d/...` | `$NAME` (via WSLENV) |
 
@@ -29,6 +29,12 @@ A DeepSeek Harness (DSH) plugin: one `shell` tool that runs commands through **P
 - **Interactive terminal**: the `terminal` tool opens persistent real-PTY sessions over node-pty — on non-Windows via the official `ctx.subprocess.spawnTerminal` seam, on Windows directly through node-pty because the upstream seam's process inspector is POSIX-only. Actions `open` / `send` / `read` / `signal` / `close`; shell state persists across calls; sessions are managed as background jobs and auto-close when idle.
 - **Background execution** via the generic jobs registry (`run_in_background` / `job_output` / `job_kill`).
 
+## Screenshots
+
+The **Default terminal** row in Settings -> General: the user picks PowerShell / Git Bash / MSYS2 / WSL, and the `shell` tool obeys that choice — the model cannot override it.
+
+![Default terminal setting row](assets/shells.png)
+
 ## Install
 
 The package ships the official `dsh.bundle` manifest (its own `cordis.patch.yml`): listing `dsh-bash-terminal` in a profile's `dsh.profile.bundles` auto-applies the mount — no manual profile edits.

package/README.md

@@ -18,12 +18,18 @@ DSH（DeepSeek Harness）插件：一个 `shell` 工具，在 Windows 上统一
 | 后端 | 实际执行 | 语法 / 路径 | 环境变量 |
 |------|----------|-------------|----------|
 | `powershell`（默认） | `pwsh -NoLogo -NoProfile -NonInteractive -Command <cmd>` | PowerShell；`C:\...` | `$env:NAME` |
-| `gitbash` | Git for Windows `bash -lc <cmd>` | POSIX；`/d/WorkSpace`；PATH 含 `/usr/bin`、`/mingw64/bin` | `$NAME` |
+| `gitbash` | Git for Windows `bash -lc <cmd>` | POSIX；`/d/workspace`；PATH 含 `/usr/bin`、`/mingw64/bin` | `$NAME` |
 | `msys2` | MSYS2 `bash -lc <cmd>`（`C:\msys64\usr\bin\bash.exe`） | POSIX；`/c/...`；PATH 含 `/usr/bin`、`/mingw64/bin`（gcc / make） | `$NAME`（自动注入 `MSYSTEM=MINGW64`） |
 | `wsl` | `wsl [-d <distro>] -e bash -lc <cmd>` | Linux；`/mnt/d/...` | `$NAME`（经 WSLENV） |
 
 每次调用都启动全新 shell：**不保留状态**（cwd / 变量 / 别名）——请传 `workdir` 而不是用 `cd`。
 
+## 界面预览
+
+设置 → 通用 里的「默认终端」行：用户在 PowerShell / Git Bash / MSYS2 / WSL 之间选择，`shell` 工具只按这个设置执行，模型无法覆盖：
+
+![默认终端设置行](assets/shells.png)
+
 ## 设计要点
 
 - **终端由用户决定，AI 无法更改**：Web UI 设置页（设置 → 通用）出现"默认终端"下拉（PowerShell / Git Bash / MSYS2 / WSL）；`shell` 工具永远只使用该设置，不暴露终端参数给模型。设置通过 DSH settings 系统持久化（settings.yaml）。
@@ -56,14 +62,14 @@ powershell -ExecutionPolicy Bypass -File install.ps1 install
 ```powershell
 # 1. 链接插件包到 profile 的 node_modules（junction，改源码即时生效）
 $profile = "$env:USERPROFILE\.dsh\profiles\web"
-New-Item -ItemType Junction -Path "$profile\node_modules\dsh-bash-terminal" -Target "D:\WorkSpace\projects\dsh-bash-terminal" | Out-Null
+New-Item -ItemType Junction -Path "$profile\node_modules\dsh-bash-terminal" -Target "D:\workspace\projects\dsh-bash-terminal" | Out-Null
 
 # 2. 让插件能解析 @deepseek-ai/* 依赖（junction 到 profile 的依赖树，插件与宿主共用同一份模块实例）
-New-Item -ItemType Junction -Path "D:\WorkSpace\projects\dsh-bash-terminal\node_modules\@deepseek-ai" -Target "$profile\..\node_modules\@deepseek-ai" | Out-Null
+New-Item -ItemType Junction -Path "D:\workspace\projects\dsh-bash-terminal\node_modules\@deepseek-ai" -Target "$profile\..\node_modules\@deepseek-ai" | Out-Null
 
 # 3. 让 profile 通过官方 bundle 挂载插件（install.ps1 install 会自动做；等价于在 dsh.profile.bundles 加 "dsh-bash-terminal"）
 # 4. （仅修改前端源码后）重新打包 client bundle:
-#    cd D:\WorkSpace\projects\dsh-bash-terminal && node scripts/build-client.mjs
+#    cd D:\workspace\projects\dsh-bash-terminal && node scripts/build-client.mjs
 # 5. 重启 dsh web
 ```
 
@@ -83,7 +89,7 @@ New-Item -ItemType Junction -Path "D:\WorkSpace\projects\dsh-bash-terminal\node_
 验证组合树（无需重启）：
 
 ```powershell
-node "$env:APPDATA\nvm\v24.16.0\node_modules\@deepseek-ai\dsh\lib\bin.js" --profile web --dump-config | Select-String dsh-bash-terminal
+node "$env:APPDATA\nvm\<node-version>\node_modules\@deepseek-ai\dsh\lib\bin.js" --profile web --dump-config | Select-String dsh-bash-terminal
 ```
 
 ## 使用
@@ -94,7 +100,7 @@ node "$env:APPDATA\nvm\v24.16.0\node_modules\@deepseek-ai\dsh\lib\bin.js" --prof
 
 - 默认终端 = Git Bash 时：`shell(command: "git status")` 走 Git Bash
 - 默认终端 = MSYS2 时：`shell(command: "gcc --version")` 走 MSYS2（MINGW64 环境，`/mingw64/bin` 的 gcc、make 可用）
-- 默认终端 = WSL 时：`shell(command: "ls -la /mnt/d/WorkSpace")` 走 WSL；传 `distro: "Ubuntu"` 可指定发行版
+- 默认终端 = WSL 时：`shell(command: "ls -la /mnt/d/workspace")` 走 WSL；传 `distro: "Ubuntu"` 可指定发行版
 - 默认终端 = PowerShell 时：`shell(command: "Get-Process node")` 走 PowerShell
 
 ## 模型使用示例
@@ -126,7 +132,7 @@ node "$env:APPDATA\nvm\v24.16.0\node_modules\@deepseek-ai\dsh\lib\bin.js" --prof
 npm 账号已启用 2FA 发布验证，需一次性验证码：
 
 ```powershell
-cd D:\WorkSpace\projects\dsh-bash-terminal
+cd D:\workspace\projects\dsh-bash-terminal
 npm publish --otp <验证码>   # 验证码来自你的认证器
 ```
 
@@ -188,7 +194,7 @@ powershell -ExecutionPolicy Bypass -File install.ps1 uninstall
 ## 测试
 
 ```powershell
-cd D:\WorkSpace\projects\dsh-bash-terminal
+cd D:\workspace\projects\dsh-bash-terminal
 npm install          # 安装依赖（含 typescript）
 npm run build        # tsc 编译 src/*.ts → lib/*.js；client.tsx → lib/client.js + dist/client.js；test/*.ts → test-dist/
 npm test             # node test-dist/unit.js → apply.js → client.js → terminal.js

package/dist/client.core.js

@@ -1,139 +1,139 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/client.tsx
-var client_exports = {};
-__export(client_exports, {
-  apply: () => apply,
-  inject: () => inject
-});
-module.exports = __toCommonJS(client_exports);
-var import_react = require("react");
-var import_dsh_client_store = require("@deepseek-ai/dsh-client-store");
-var import_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
-var import_jsx_runtime = require("react/jsx-runtime");
-var SETTINGS_NS = "settings.bash-terminal";
-var SETTINGS_NAMESPACE = "bash-terminal";
-var SHELLS = ["powershell", "gitbash", "msys2", "wsl"];
-var ROW_CSS = ".btRow{border-bottom:1px solid var(--dsw-alias-border-l2);align-items:center;gap:8px;padding:16px 0;display:flex}.btRowText{flex-direction:column;flex:1;gap:4px;min-width:0;padding-right:48px;display:flex}.btTitle{color:var(--dsw-alias-label-primary);font-size:14px;font-weight:400;line-height:22px}.btDesc{color:var(--dsw-alias-label-tertiary);font-size:12px;font-weight:400;line-height:18px}.btSelector{background:var(--dsw-alias-bg-module-platform);height:36px;font:inherit;color:var(--dsw-alias-label-primary);cursor:pointer;border:none;border-radius:18px;align-items:center;gap:12px;padding:0 14px;font-size:14px;line-height:22px;display:inline-flex}.btSelector:hover{background:var(--dsw-alias-interactive-bg-hover)}.btChevron{flex:none}";
-if (typeof document !== "undefined" && document.querySelector('style[data-plugin-css="bash-terminal-row"]') === null) {
-  const tag = document.createElement("style");
-  tag.dataset.plugin = "dsh-bash-terminal";
-  tag.dataset.pluginCss = "bash-terminal-row";
-  tag.textContent = ROW_CSS;
-  document.head.appendChild(tag);
-}
-var zh = {
-  "shell.title": "\u9ED8\u8BA4\u7EC8\u7AEF",
-  "shell.description": "shell \u5DE5\u5177\u6267\u884C\u547D\u4EE4\u65F6\u4F7F\u7528\u7684\u7EC8\u7AEF",
-  "shell.powershell": "PowerShell",
-  "shell.gitbash": "Git Bash",
-  "shell.msys2": "MSYS2",
-  "shell.wsl": "WSL"
-};
-var en = {
-  "shell.title": "Default terminal",
-  "shell.description": "Terminal used by the shell tool",
-  "shell.powershell": "PowerShell",
-  "shell.gitbash": "Git Bash",
-  "shell.msys2": "MSYS2",
-  "shell.wsl": "WSL"
-};
-var inject = ["slots", "locale", "settingsScope"];
-function ShellPreferenceRow({ t, useStore, setShell }) {
-  const shell = useStore((s) => s.shell);
-  const writable = useStore((s) => s.writable);
-  const [open, setOpen] = (0, import_react.useState)(false);
-  const items = SHELLS.map((id) => ({ id, label: t("shell." + id) }));
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "btRow", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "btRowText", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "btTitle", children: t("shell.title") }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "btDesc", children: t("shell.description") })
-    ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-      import_dsh_client_ui_primitives.Menu,
-      {
-        open,
-        onClose: () => setOpen(false),
-        items,
-        selectedId: shell,
-        onSelect: (id) => {
-          setOpen(false);
-          setShell(id);
-        },
-        align: "end",
-        portal: true,
-        anchor: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
-          "button",
-          {
-            type: "button",
-            className: "btSelector",
-            "aria-haspopup": "menu",
-            "aria-expanded": open,
-            disabled: !writable,
-            onClick: () => setOpen(!open),
-            style: !writable ? { opacity: 0.5, cursor: "not-allowed" } : void 0,
-            children: [
-              t("shell." + shell),
-              /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.IconChevronDownOutline14, { className: "btChevron" })
-            ]
-          }
-        )
-      }
-    )
-  ] });
-}
-function apply(ctx) {
-  ctx.effect(() => ctx.locale.register(SETTINGS_NS, { zh, en }), "bash-terminal: settings dictionaries");
-  const scope = ctx.settingsScope.bind({ namespace: SETTINGS_NAMESPACE });
-  const store = (0, import_dsh_client_store.defineStore)({
-    init: () => ({ shell: "powershell", revision: -1, writable: false }),
-    actions: {
-      sync: (d, shell, revision, writable) => {
-        if (revision !== void 0 && revision <= d.revision) return;
-        if (shell !== void 0) d.shell = shell;
-        if (revision !== void 0) d.revision = revision;
-        if (writable !== void 0) d.writable = writable;
-      }
-    }
-  });
-  let bound;
-  const push = (snap) => {
-    bound?.sync(snap.value?.defaultShell, snap.revision, snap.writable);
-  };
-  ctx.slots.inject(
-    "settings.general.item",
-    () => ctx.slots.register(
-      {
-        name: "settings.general.item",
-        id: "bash-terminal-shell",
-        order: 20,
-        store,
-        locale: SETTINGS_NS,
-        inject: (actions) => {
-          bound = actions;
-          push(scope.getSnapshot());
-          return { setShell: (value) => void scope.set("defaultShell", value) };
-        }
-      },
-      ShellPreferenceRow
-    ),
-    "bash-terminal: settings row"
-  );
-  ctx.effect(() => scope.subscribe(() => push(scope.getSnapshot())), "bash-terminal: settings watch");
-}
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/client.tsx
+var client_exports = {};
+__export(client_exports, {
+  apply: () => apply,
+  inject: () => inject
+});
+module.exports = __toCommonJS(client_exports);
+var import_react = require("react");
+var import_dsh_client_store = require("@deepseek-ai/dsh-client-store");
+var import_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
+var import_jsx_runtime = require("react/jsx-runtime");
+var SETTINGS_NS = "settings.bash-terminal";
+var SETTINGS_NAMESPACE = "bash-terminal";
+var SHELLS = ["powershell", "gitbash", "msys2", "wsl"];
+var ROW_CSS = ".btRow{border-bottom:1px solid var(--dsw-alias-border-l2);align-items:center;gap:8px;padding:16px 0;display:flex}.btRowText{flex-direction:column;flex:1;gap:4px;min-width:0;padding-right:48px;display:flex}.btTitle{color:var(--dsw-alias-label-primary);font-size:14px;font-weight:400;line-height:22px}.btDesc{color:var(--dsw-alias-label-tertiary);font-size:12px;font-weight:400;line-height:18px}.btSelector{background:var(--dsw-alias-bg-module-platform);height:36px;font:inherit;color:var(--dsw-alias-label-primary);cursor:pointer;border:none;border-radius:18px;align-items:center;gap:12px;padding:0 14px;font-size:14px;line-height:22px;display:inline-flex}.btSelector:hover{background:var(--dsw-alias-interactive-bg-hover)}.btChevron{flex:none}";
+if (typeof document !== "undefined" && document.querySelector('style[data-plugin-css="bash-terminal-row"]') === null) {
+  const tag = document.createElement("style");
+  tag.dataset.plugin = "dsh-bash-terminal";
+  tag.dataset.pluginCss = "bash-terminal-row";
+  tag.textContent = ROW_CSS;
+  document.head.appendChild(tag);
+}
+var zh = {
+  "shell.title": "\u9ED8\u8BA4\u7EC8\u7AEF",
+  "shell.description": "shell \u5DE5\u5177\u6267\u884C\u547D\u4EE4\u65F6\u4F7F\u7528\u7684\u7EC8\u7AEF",
+  "shell.powershell": "PowerShell",
+  "shell.gitbash": "Git Bash",
+  "shell.msys2": "MSYS2",
+  "shell.wsl": "WSL"
+};
+var en = {
+  "shell.title": "Default terminal",
+  "shell.description": "Terminal used by the shell tool",
+  "shell.powershell": "PowerShell",
+  "shell.gitbash": "Git Bash",
+  "shell.msys2": "MSYS2",
+  "shell.wsl": "WSL"
+};
+var inject = ["slots", "locale", "settingsScope"];
+function ShellPreferenceRow({ t, useStore, setShell }) {
+  const shell = useStore((s) => s.shell);
+  const writable = useStore((s) => s.writable);
+  const [open, setOpen] = (0, import_react.useState)(false);
+  const items = SHELLS.map((id) => ({ id, label: t("shell." + id) }));
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "btRow", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "btRowText", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "btTitle", children: t("shell.title") }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "btDesc", children: t("shell.description") })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+      import_dsh_client_ui_primitives.Menu,
+      {
+        open,
+        onClose: () => setOpen(false),
+        items,
+        selectedId: shell,
+        onSelect: (id) => {
+          setOpen(false);
+          setShell(id);
+        },
+        align: "end",
+        portal: true,
+        anchor: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
+          "button",
+          {
+            type: "button",
+            className: "btSelector",
+            "aria-haspopup": "menu",
+            "aria-expanded": open,
+            disabled: !writable,
+            onClick: () => setOpen(!open),
+            style: !writable ? { opacity: 0.5, cursor: "not-allowed" } : void 0,
+            children: [
+              t("shell." + shell),
+              /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.IconChevronDownOutline14, { className: "btChevron" })
+            ]
+          }
+        )
+      }
+    )
+  ] });
+}
+function apply(ctx) {
+  ctx.effect(() => ctx.locale.register(SETTINGS_NS, { zh, en }), "bash-terminal: settings dictionaries");
+  const scope = ctx.settingsScope.bind({ namespace: SETTINGS_NAMESPACE });
+  const store = (0, import_dsh_client_store.defineStore)({
+    init: () => ({ shell: "powershell", revision: -1, writable: false }),
+    actions: {
+      sync: (d, shell, revision, writable) => {
+        if (revision !== void 0 && revision <= d.revision) return;
+        if (shell !== void 0) d.shell = shell;
+        if (revision !== void 0) d.revision = revision;
+        if (writable !== void 0) d.writable = writable;
+      }
+    }
+  });
+  let bound;
+  const push = (snap) => {
+    bound?.sync(snap.value?.defaultShell, snap.revision, snap.writable);
+  };
+  ctx.slots.inject(
+    "settings.general.item",
+    () => ctx.slots.register(
+      {
+        name: "settings.general.item",
+        id: "bash-terminal-shell",
+        order: 20,
+        store,
+        locale: SETTINGS_NS,
+        inject: (actions) => {
+          bound = actions;
+          push(scope.getSnapshot());
+          return { setShell: (value) => void scope.set("defaultShell", value) };
+        }
+      },
+      ShellPreferenceRow
+    ),
+    "bash-terminal: settings row"
+  );
+  ctx.effect(() => scope.subscribe(() => push(scope.getSnapshot())), "bash-terminal: settings watch");
+}