dsh-bash-terminal-ts 0.6.4 → 0.7.0

package/README.en.md

@@ -6,14 +6,16 @@ A DeepSeek Harness (DSH) plugin: one `shell` tool that runs commands through **P
 
 ![test](https://github.com/drscrewdriver/dsh-bash-terminal-ts/actions/workflows/test.yml/badge.svg)
 
-> **TypeScript rewrite of `MAXeaglet/dsh-bash-terminal`**, with working MSYS2/MINGW64 support. Two compatibility lines:
+> **TypeScript rewrite of `MAXeaglet/dsh-bash-terminal`**, with working MSYS2/MINGW64 support. Compatibility lines are cut per DSH host segment; all lines share the package name `dsh-bash-terminal-ts` and are distinguished by npm dist-tag:
 >
-> | Branch | DSH segment | Package name | Status |
-> |--------|-------------|--------------|--------|
-> | `ts/0.1.5` | 0.1.5-alpha.1 – 0.1.5-rc.x | `dsh-bash-terminal-ts` | this branch; `build` / `unit` / `apply` / `client` / `terminal` green locally |
-> | `main` | 0.1.2-alpha.1 – 0.1.2-rc.x | `dsh-bash-terminal-ts` | the TypeScript rewrite's mainline |
+> | DSH segment | Branch | Plugin series | npm dist-tag |
+> |-------------|--------|---------------|--------------|
+> | `>=0.2.0-rc.1 <0.2.1-0` | `compat/0.2.0` (this branch) | 0.7.x | `dsh-0.2.0` |
+> | 0.1.7-rc.1 – 0.1.7.x | `compat/0.1.7` | 0.6.x | `dsh-0.1.7` |
+> | 0.1.5-alpha.1 – 0.1.5-rc.x | `ts/0.1.5` (historical, frozen) | ≤ 0.5.2 | `dsh-0.1.5` |
+> | 0.1.2-alpha.1 – 0.1.2-rc.x | `main` (historical, frozen) | ≤ 0.4.2 | `dsh-0.1.2` |
 >
-> The two lines **deliberately use different package names**, so they install side by side without overwriting each other. Pick the branch that covers your DSH build.
+> Pick the line that covers your DSH build; the version series never overlap, so a `^` install cannot resolve across lines.
 
 ## Features
 

package/README.md

@@ -6,14 +6,16 @@
 
 DSH（DeepSeek Harness）插件：一个 `shell` 工具，在 Windows 上统一执行 **PowerShell / Git Bash / MSYS2 / WSL** 四种终端命令。
 
-> **本仓库是 `MAXeaglet/dsh-bash-terminal` 的 TypeScript 重写**，带可用的 MSYS2/MINGW64 支持。两条兼容线：
+> **本仓库是 `MAXeaglet/dsh-bash-terminal` 的 TypeScript 重写**，带可用的 MSYS2/MINGW64 支持。兼容线按 DSH 宿主段划分，各线共用包名 `dsh-bash-terminal-ts`，以 npm dist-tag 区分：
 >
-> | 分支 | DSH 段 | 包名 | 状态 |
-> |------|--------|------|------|
-> | `ts/0.1.5` | 0.1.5-alpha.1 – 0.1.5-rc.x | `dsh-bash-terminal-ts` | 本分支；`build` / `unit` / `apply` / `client` / `terminal` 本机全绿 |
-> | `main` | 0.1.2-alpha.1 – 0.1.2-rc.x | `dsh-bash-terminal-ts` | TypeScript 重写主线 |
+> | DSH 段 | 分支 | 插件版本 | npm dist-tag |
+> |--------|------|----------|--------------|
+> | `>=0.2.0-rc.1 <0.2.1-0` | `compat/0.2.0`（本分支） | 0.7.x | `dsh-0.2.0` |
+> | 0.1.7-rc.1 – 0.1.7.x | `compat/0.1.7` | 0.6.x | `dsh-0.1.7` |
+> | 0.1.5-alpha.1 – 0.1.5-rc.x | `ts/0.1.5`（历史，冻结） | ≤ 0.5.2 | `dsh-0.1.5` |
+> | 0.1.2-alpha.1 – 0.1.2-rc.x | `main`（历史，冻结） | ≤ 0.4.2 | `dsh-0.1.2` |
 >
-> **两条线刻意使用不同包名**，因此可以并存安装、互不覆盖。请按你的 DSH 版本选分支。
+> 请按你的 DSH 版本选线安装；各线版本系列互不重叠，`^` 安装不会跨线解析。
 
 | 后端 | 实际执行 | 语法 / 路径 | 环境变量 |
 |------|----------|-------------|----------|
@@ -77,7 +79,8 @@ New-Item -ItemType Junction -Path "D:\workspace\projects\dsh-bash-terminal-ts\no
 > `@deepseek-ai/*` 副本 —— 插件和宿主就不再共用模块实例，宿主升级后插件会停在旧 API 上
 > （本项目曾因此停在 0.1.0-rc.6）。只刷新 lock 时用 `npm install --package-lock-only`。
 
-> **兼容性**：要求 DSH ≥ **0.1.5-rc.1**。0.1.5 把浏览器模块表里的 `@deepseek-ai/dsh-client-runtime`
+> **兼容性**：要求 DSH ≥ **0.1.7-rc.1**（`compat/0.1.7` 线）或 ≥ **0.2.0-rc.1**（`compat/0.2.0` 线，本分支）。
+> 历史背景：0.1.5 把浏览器模块表里的 `@deepseek-ai/dsh-client-runtime`
 > 改名为 `@deepseek-ai/dsh-client-store` 且只按精确裸名命中；旧 bundle 在新宿主上会报
 > `Failed to load plugins` / `require(...) missed the module table`。
 >

package/dist/client.core.js

@@ -1,151 +1,151 @@
-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 ENTRY_ID = "tool-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-ts";
-  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",
-  "shell.unavailable": "\u8BBE\u7F6E\u9762\u4E0D\u53EF\u7528\uFF1A\u5BBF\u4E3B\u672A\u63D0\u4F9B\u672C\u63D2\u4EF6\u7684 configForms \u6761\u76EE\uFF08\u68C0\u67E5 cordis.patch.yml \u7684 entry id\uFF09"
-};
-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",
-  "shell.unavailable": "Settings unavailable: the host exposes no configForms entry for this plugin (check the cordis.patch.yml entry id)"
-};
-var inject = ["slots", "locale", "configForms"];
-function ShellPreferenceRow({ t, useStore, setShell }) {
-  const shell = useStore((s) => s.shell);
-  const writable = useStore((s) => s.writable);
-  const status = useStore((s) => s.status);
-  const [open, setOpen] = (0, import_react.useState)(false);
-  const items = SHELLS.map((id) => ({ id, label: t("shell." + id) }));
-  if (status === "unavailable") {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("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.unavailable") })
-    ] }) });
-  }
-  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.IconChevronDownOutlineMedium, { className: "btChevron" })
-            ]
-          }
-        )
-      }
-    )
-  ] });
-}
-var zhDictTitle = () => zh["shell.title"] ?? "\u7EC8\u7AEF";
-function apply(ctx) {
-  ctx.effect(() => ctx.locale.register(SETTINGS_NS, { zh, en }), "bash-terminal: settings dictionaries");
-  const scope = ctx.configForms.get(ENTRY_ID);
-  const store = (0, import_dsh_client_store.defineStore)({
-    init: () => ({ shell: "powershell", revision: -1, writable: false, status: "loading" }),
-    actions: {
-      sync: (d, shell, revision, writable, status) => {
-        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;
-        if (status !== void 0) d.status = status;
-      }
-    }
-  });
-  let bound;
-  const push = (snap) => {
-    bound?.sync(snap.value?.defaultShell, snap.revision, snap.writable, snap.status);
-  };
-  ctx.slots.inject(
-    "dsh-family.tab",
-    () => ctx.slots.register(
-      {
-        name: "dsh-family.tab",
-        id: "bash-terminal-shell",
-        order: 60,
-        label: () => zhDictTitle(),
-        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 ENTRY_ID = "tool-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-ts";
+  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",
+  "shell.unavailable": "\u8BBE\u7F6E\u9762\u4E0D\u53EF\u7528\uFF1A\u5BBF\u4E3B\u672A\u63D0\u4F9B\u672C\u63D2\u4EF6\u7684 configForms \u6761\u76EE\uFF08\u68C0\u67E5 cordis.patch.yml \u7684 entry id\uFF09"
+};
+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",
+  "shell.unavailable": "Settings unavailable: the host exposes no configForms entry for this plugin (check the cordis.patch.yml entry id)"
+};
+var inject = ["slots", "locale", "configForms"];
+function ShellPreferenceRow({ t, useStore, setShell }) {
+  const shell = useStore((s) => s.shell);
+  const writable = useStore((s) => s.writable);
+  const status = useStore((s) => s.status);
+  const [open, setOpen] = (0, import_react.useState)(false);
+  const items = SHELLS.map((id) => ({ id, label: t("shell." + id) }));
+  if (status === "unavailable") {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("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.unavailable") })
+    ] }) });
+  }
+  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.IconChevronDownOutlineMedium, { className: "btChevron" })
+            ]
+          }
+        )
+      }
+    )
+  ] });
+}
+var zhDictTitle = () => zh["shell.title"] ?? "\u7EC8\u7AEF";
+function apply(ctx) {
+  ctx.effect(() => ctx.locale.register(SETTINGS_NS, { zh, en }), "bash-terminal: settings dictionaries");
+  const scope = ctx.configForms.get(ENTRY_ID);
+  const store = (0, import_dsh_client_store.defineStore)({
+    init: () => ({ shell: "powershell", revision: -1, writable: false, status: "loading" }),
+    actions: {
+      sync: (d, shell, revision, writable, status) => {
+        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;
+        if (status !== void 0) d.status = status;
+      }
+    }
+  });
+  let bound;
+  const push = (snap) => {
+    bound?.sync(snap.value?.defaultShell, snap.revision, snap.writable, snap.status);
+  };
+  ctx.slots.inject(
+    "dsh-family.tab",
+    () => ctx.slots.register(
+      {
+        name: "dsh-family.tab",
+        id: "bash-terminal-shell",
+        order: 60,
+        label: () => zhDictTitle(),
+        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");
+}