dsh-bash-terminal-ts 0.2.6 → 0.5.0

package/screenshots.json

@@ -0,0 +1,3 @@
+{
+  "screenshots": []
+}

package/scripts/build-client.mjs

@@ -1,7 +1,8 @@
-// Build the browser client bundle for dsh-bash-terminal-ts.
-// Output: dist/client.js — a __ModuleLoader__.load({ id, factory }) wrapper
-// around the esbuild CJS bundle; shared deps (react, @deepseek-ai/*) resolve
-// through the loader's require.
+// Build the browser client bundle for dsh-bash-terminal.
+// Output: lib/client.js (primary, consumed by DSH loader/reload precheck) and
+// dist/client.js (legacy compatibility) — a __ModuleLoader__.load({ id, factory })
+// wrapper around the esbuild CJS bundle; shared deps (react, @deepseek-ai/*)
+// resolve through the loader's require.
 
 import { build } from "esbuild";
 import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
@@ -10,6 +11,7 @@ import { dirname, join } from "node:path";
 
 const root = dirname(dirname(fileURLToPath(import.meta.url)));
 mkdirSync(join(root, "dist"), { recursive: true });
+mkdirSync(join(root, "lib"), { recursive: true });
 
 await build({
   entryPoints: [join(root, "src", "client.tsx")],
@@ -20,20 +22,18 @@ await build({
   external: ["react", "react/jsx-runtime", "react-dom", "@deepseek-ai/*"],
   jsx: "automatic",
   // Pin the TS options instead of letting esbuild discover a tsconfig by walking
-  // up from the entry point. The repo root has a tsconfig.json, so in-repo builds
-  // silently inherited it and emitted a leading "use strict"; while a byte-for-byte
-  // identical build from a worktree outside the repo (no tsconfig above it) did not
-  // — same source, two different committed artifacts. These values are what the
-  // root tsconfig actually supplied. The one observable delta is that stray
-  // "use strict"; (inert: the core is wrapped in a function expression by the
-  // loader shim below, so it was never a directive prologue), now gone everywhere.
+  // up from the entry point: an in-repo build found the repo-root tsconfig.json
+  // (emitting a leading "use strict";) while the same source built from an
+  // out-of-repo worktree did not — two different committed artifacts for one
+  // source. These are the values that tsconfig actually supplied, so behavior is
+  // unchanged; only the stray line disappears.
   tsconfigRaw: { compilerOptions: { target: "ES2022", useDefineForClassFields: true } },
   logLevel: "warning"
 });
 
 const core = readFileSync(join(root, "dist", "client.core.js"), "utf8");
 const wrapper = `window.__ModuleLoader__.load({
-	id: "dsh-bash-terminal-ts",
+	id: "dsh-bash-terminal",
 	factory: (require) => {
 		var module = { exports: {} };
 		var exports = module.exports;
@@ -42,5 +42,6 @@ ${core}
 	}
 });
 `;
+writeFileSync(join(root, "lib", "client.js"), wrapper);
 writeFileSync(join(root, "dist", "client.js"), wrapper);
-console.log("built dist/client.js (" + wrapper.length + " bytes)");
+console.log("built lib/client.js + dist/client.js (" + wrapper.length + " bytes)");

package/src/client.tsx

@@ -1,20 +1,46 @@
-// dsh-bash-terminal-ts client plugin: a "Default terminal" preference row in the
-// Web UI General settings. The user picks powershell / gitbash / msys2 / wsl;
-// the host shell tool obeys that choice (the model cannot change it).
+// dsh-bash-terminal client plugin: a "Default terminal" preference row in the
+// Web UI General settings, mirroring the shipped EnterBehaviorRow grammar
+// (row layout, capsule selector with chevron, --dsw-* tokens).
 //
-// The option list below must stay in lockstep with SHELLS in ./index.ts: every
-// id gets an <option> here and a `shell.<id>` entry in both dictionaries. The
-// shipped bundle cannot import the host module (it pulls node: builtins), so
-// test/client.ts asserts the bundle covers every host shell id instead.
+// The row offers one entry per host shell id — powershell / gitbash / msys2 /
+// wsl — in the same order as SHELLS in ./index.ts.
+//
+// DSH >= 0.1.5: the browser module table (PLATFORM_MODULES) seeds react,
+// @deepseek-ai/cordis, @deepseek-ai/dsh-client-store, @deepseek-ai/dsh-client-ui-slots,
+// @deepseek-ai/dsh-client-ui-primitives and @deepseek-ai/dsh-client-ui-dockkit by
+// exact bare specifier. The old dsh-client-runtime name is gone from that table
+// (and so is its /client subpath), so this bundle requests dsh-client-store.
 
+import { useState } from "react";
 import { defineStore } from "@deepseek-ai/dsh-client-store";
+import { IconChevronDownOutline14, Menu } from "@deepseek-ai/dsh-client-ui-primitives";
 
 const SETTINGS_NS = "settings.bash-terminal";
 const SETTINGS_NAMESPACE = "bash-terminal";
+const SHELLS = ["powershell", "gitbash", "msys2", "wsl"] as const;
+
+type ShellOption = (typeof SHELLS)[number];
+
+// Injected once when the browser loads the bundle (node tests guard on document).
+const 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);
+}
 
 const zh: Record<string, string> = {
   "shell.title": "默认终端",
-  "shell.description": "shell 工具执行命令时使用的终端（由你决定，AI 无法更改）",
+  "shell.description": "shell 工具执行命令时使用的终端",
   "shell.powershell": "PowerShell",
   "shell.gitbash": "Git Bash",
   "shell.msys2": "MSYS2",
@@ -22,7 +48,7 @@ const zh: Record<string, string> = {
 };
 const en: Record<string, string> = {
   "shell.title": "Default terminal",
-  "shell.description": "Terminal used by the shell tool (you control this; the AI cannot change it)",
+  "shell.description": "Terminal used by the shell tool",
   "shell.powershell": "PowerShell",
   "shell.gitbash": "Git Bash",
   "shell.msys2": "MSYS2",
@@ -47,43 +73,40 @@ interface ShellPreferenceRowProps {
 function ShellPreferenceRow({ t, useStore, setShell }: ShellPreferenceRowProps) {
   const shell = useStore((s) => s.shell);
   const writable = useStore((s) => s.writable);
+  const [open, setOpen] = useState(false);
+  const items = SHELLS.map((id) => ({ id, label: t("shell." + id) }));
   return (
-    <div
-      style={{
-        display: "flex",
-        alignItems: "center",
-        justifyContent: "space-between",
-        gap: 16,
-        padding: "12px 0"
-      }}
-    >
-      <div style={{ minWidth: 0 }}>
-        <div style={{ fontSize: 14, fontWeight: 500, lineHeight: "22px", color: "var(--dsw-alias-label-primary, inherit)" }}>
-          {t("shell.title")}
-        </div>
-        <div style={{ fontSize: 12, lineHeight: "18px", opacity: 0.65 }}>{t("shell.description")}</div>
+    <div className="btRow">
+      <div className="btRowText">
+        <div className="btTitle">{t("shell.title")}</div>
+        <div className="btDesc">{t("shell.description")}</div>
       </div>
-      <select
-        value={shell}
-        disabled={!writable}
-        onChange={(e) => setShell(e.target.value)}
-        style={{
-          fontSize: 14,
-          padding: "6px 10px",
-          borderRadius: 8,
-          border: "1px solid var(--dsw-alias-line-strong, #ccc)",
-          background: "var(--dsw-alias-bg-layer-2, #fff)",
-          color: "var(--dsw-alias-label-primary, inherit)",
-          outline: "none",
-          cursor: writable ? "pointer" : "not-allowed",
-          maxWidth: 180
+      <Menu
+        open={open}
+        onClose={() => setOpen(false)}
+        items={items}
+        selectedId={shell}
+        onSelect={(id) => {
+          setOpen(false);
+          setShell(id);
         }}
-      >
-        <option value="powershell">{t("shell.powershell")}</option>
-        <option value="gitbash">{t("shell.gitbash")}</option>
-        <option value="msys2">{t("shell.msys2")}</option>
-        <option value="wsl">{t("shell.wsl")}</option>
-      </select>
+        align="end"
+        portal
+        anchor={
+          <button
+            type="button"
+            className="btSelector"
+            aria-haspopup="menu"
+            aria-expanded={open}
+            disabled={!writable}
+            onClick={() => setOpen(!open)}
+            style={!writable ? { opacity: 0.5, cursor: "not-allowed" } : undefined}
+          >
+            {t("shell." + shell)}
+            <IconChevronDownOutline14 className="btChevron" />
+          </button>
+        }
+      />
     </div>
   );
 }
@@ -116,6 +139,10 @@ interface RowStoreActions {
   sync(shell?: string, revision?: number, writable?: boolean): void;
 }
 
+interface RowStore {
+  actions: RowStoreActions;
+}
+
 export function apply(ctx: ClientContext): void {
   ctx.effect(() => ctx.locale.register(SETTINGS_NS, { zh, en }), "bash-terminal: settings dictionaries");
   const scope = ctx.settingsScope.bind({ namespace: SETTINGS_NAMESPACE });
@@ -130,9 +157,6 @@ export function apply(ctx: ClientContext): void {
       }
     }
   });
-  // defineStore() yields a { spec, create } factory; slots.register creates
-  // the live store, so we bind the actions in the inject callback and push
-  // the initial snapshot there too (mirrors the theme row pattern).
   let bound: RowStoreActions | undefined;
   const push = (snap: SettingsSnapshot): void => {
     bound?.sync(snap.value?.defaultShell, snap.revision, snap.writable);

package/src/dsh-types.ts

@@ -294,7 +294,7 @@ export interface ApprovalSeam {
 // ---- plugin context (server side) ----------------------------------------------
 
 /**
- * The structural context face dsh-bash-terminal-ts programs against: the union
+ * The structural context face dsh-bash-terminal programs against: the union
  * of every `ctx.*` member touched by src/index.ts and src/terminal.ts.
  */
 export interface BashTerminalContext {

package/src/index.ts

@@ -1,4 +1,4 @@
-// dsh-bash-terminal-ts - one shell tool, four Windows terminals.
+// dsh-bash-terminal - one shell tool, four Windows terminals.
 //
 // Registers a model-facing shell tool. The terminal backend (powershell /
 // gitbash / msys2 / wsl) is chosen by the USER in the Web UI settings (default
@@ -6,11 +6,7 @@
 // choice:
 //   - powershell: pwsh -NoLogo -NoProfile -NonInteractive -Command <cmd>
 //   - gitbash:    Git for Windows bash -lc <cmd>  (POSIX; /d/... paths)
-//   - msys2:      C:\msys64\usr\bin\bash.exe -lc <cmd>  (POSIX; full GCC/mingw64
-//                 toolchain). NOT msys2.exe: that Cygwin launcher allocates a
-//                 console and returns exit 0 with zero bytes under piped stdio.
-//                 MSYSTEM=MINGW64 is injected via buildEnv so /etc/profile picks
-//                 the MINGW64 environment and /mingw64/bin lands on PATH.
+//   - msys2:      MSYS2 bash -lc <cmd>  (POSIX; /c/... paths, full GCC/mingw64 toolchain)
 //   - wsl:        wsl [-d <distro>] -e bash -lc <cmd>  (Linux; /mnt/d/... paths)
 //
 // The tool spawns through the shared ctx.subprocess seam (process-tree
@@ -18,8 +14,13 @@
 // handles with the generic ctx.jobs registry, mirroring the shipped
 // dsh-tool-bash / dsh-tool-pwsh story call-for-call. It deliberately
 // does NOT consume the ctx.shell capability seam: the platform's own
-// sandboxed PowerShell executor keeps serving the pwsh tool, and this tool
-// is an additional, user-selected terminal that runs outside the sandbox.
+// sandboxed PowerShell executor keeps serving the pwsh tool. This tool is
+// an additional, user-selected terminal that still honors the DSH sandbox:
+// confined modes wrap PowerShell's spawn argv through ctx.sandbox
+// (fail-closed), while danger-full-access, Git Bash, MSYS2, and WSL run
+// unconfined. Git Bash and MSYS2 are unconfined because the DSH Windows ACL
+// restricted-token runner cannot host Cygwin/MSYS2: bash aborts with
+// "CreateFileMapping ... Win32 error 5" during startup.
 
 import { lstatSync } from "node:fs";
 import { isAbsolute, join, resolve } from "node:path";
@@ -161,33 +162,29 @@ export function candidateGitBashPaths(env: NodeJS.ProcessEnv = process.env): str
 }
 
 /**
- * MSYS2 locations, in preference order: the real `bash.exe` under usr\bin first,
- * then bin\bash.exe, and `msys2.exe` dead last.
+ * MSYS2 locations, in preference order: the real `bash.exe` under usr\bin
+ * first, then bin\bash.exe, and `msys2.exe` dead last.
  *
  * msys2.exe is NOT a usable backend for piped execution: it is the console-
  * allocating Cygwin launcher, so a spawn with piped stdio returns exit 0 with
- * zero bytes on both stdout and stderr (measured on MSYS2 with bash 5.3.15).
- * Keeping it in the list only as a last-resort fallback preserves the path the
- * config docs reference, but a working bash.exe always wins.
+ * zero bytes on both stdout and stderr (measured on this machine against
+ * MSYS2 with bash 5.3.15). Keeping it in the list only as a last-resort
+ * fallback preserves the path the config docs reference, but a working
+ * bash.exe always wins.
  *
- * MSYS2 uses the same Cygwin/MSYS2 runtime as Git Bash, so it cannot run under
- * the DSH Windows ACL restricted-token sandbox.
+ * MSYS2 uses the same Cygwin/MSYS2 runtime as Git Bash, so it cannot run
+ * under the DSH Windows ACL restricted-token sandbox.
  */
 export function candidateMsys2Paths(env: NodeJS.ProcessEnv = process.env): string[] {
-  const programFiles = env.ProgramFiles ?? "C:\\Program Files";
   const candidates = [
     "C:\\msys64\\usr\\bin\\bash.exe",
     "C:\\msys64\\bin\\bash.exe"
   ];
-  // Also check 32-bit variant
-  const programFilesX86 = env["ProgramFiles(x86)"] ?? "C:\\Program Files (x86)";
-  if (programFilesX86 !== programFiles) {
-    candidates.push("C:\\msys64\\usr\\bin\\bash.exe"); // same path regardless of arch
-  }
   for (const entry of (env.PATH ?? "").split(";")) {
     const trimmed = entry.trim().replace(/^"|"$/g, "");
     if (trimmed.length === 0) continue;
-    if (trimmed.toLowerCase().includes("msys64") || trimmed.toLowerCase().includes("mingw64")) {
+    const lower = trimmed.toLowerCase();
+    if (lower.includes("msys64") || lower.includes("mingw64")) {
       candidates.push(join(trimmed, "bash.exe"));
     }
   }
@@ -250,16 +247,16 @@ export function buildArgv(
 
 /**
  * Merge the DSH_* environment over the process environment. For WSL, only
- * variables explicitly listed in WSLENV cross the boundary, so every DSH_* key is
- * appended to it (WSLENV is a `:` separated VAR[/flag] list).
- *
- * WSLENV usually already exists for reasons unrelated to us -- Windows Terminal
- * exports e.g. `WT_SESSION:WT_PROFILE_ID:` -- so the list is layered rather than
- * rebuilt, or those entries would be silently dropped from every WSL call.
- * Callers that spawn through a seam which replaces the parent environment
- * wholesale (the PTY path) must pass the inherited value explicitly.
+ * variables explicitly listed in WSLENV cross the boundary, so every DSH_*
+ * key is appended there — and the list is *layered onto* whatever WSLENV the
+ * host already had (Windows Terminal exports e.g. `WT_SESSION:WT_PROFILE_ID:`),
+ * never rebuilt from scratch: WSLENV is an allow-list, so dropping the
+ * inherited entries would silently stop them crossing into WSL.
  *
- * @param inheritedWslenv - the WSLENV the child would otherwise inherit.
+ * @param inheritedWslenv - the ambient WSLENV to layer onto. Callers that
+ *   replace the child environment wholesale (the PTY path) must pass
+ *   `process.env.WSLENV` explicitly, because the ambient value is not visible
+ *   through `dshEnv`.
  */
 export function buildEnv(
   shell: string,
@@ -268,25 +265,27 @@ export function buildEnv(
 ): Record<string, string | undefined> {
   const env: Record<string, string | undefined> = { ...ENV_OVERRIDES, ...dshEnv };
   if (shell === "msys2") {
-    // Picks the MINGW64 environment, so /mingw64/bin (gcc, make, ...) joins PATH
-    // via /etc/profile. Without it MSYS2 defaults to the bare MSYS environment.
+    // Picks the MINGW64 environment, so /mingw64/bin (gcc, make, ...) joins
+    // PATH via /etc/profile. Without it MSYS2 defaults to the bare MSYS
+    // environment. An explicit caller-supplied value wins.
     if (env.MSYSTEM === undefined) env.MSYSTEM = "MINGW64";
   }
   if (shell === "wsl") {
     const keys = Object.keys(dshEnv ?? {});
     if (keys.length > 0) {
-      // An explicit WSLENV from the caller wins over what we would inherit.
+      // An explicit WSLENV in dshEnv wins over the inherited one; otherwise the
+      // inherited value is the base. Either way the base is SPLIT into entries
+      // (the host value ends with a trailing ":", so string concatenation would
+      // produce a malformed empty entry) and the WSLENV key itself is excluded
+      // (it is a key of dshEnv too, and appending it would add a bogus entry).
       const declared = Object.prototype.hasOwnProperty.call(dshEnv ?? {}, "WSLENV");
       const base = declared
         ? env.WSLENV
         : (typeof inheritedWslenv === "string" && inheritedWslenv.length > 0 ? inheritedWslenv : env.WSLENV);
-      // Windows Terminal's own value ends with a trailing ':' and the caller's
-      // may too, so split/normalise instead of string-concatenating -- a naive
-      // join yields an empty entry ("A:B::DSH_X"), which WSL flags as malformed.
       const parts = typeof base === "string" ? base.split(":") : [];
       env.WSLENV = [...parts, ...keys.filter((k) => k !== "WSLENV").flatMap((k) => k.split(":"))]
-        .map((part) => part.trim())
-        .filter((part) => part.length > 0)
+        .map((p) => p.trim())
+        .filter((p) => p.length > 0)
         .join(":");
     }
   }
@@ -322,7 +321,7 @@ function spawnSpec(resolved: SpawnResolution, argv: string[], env: Record<string
 function collectedOutput(handle: { collected: { stdout: unknown; stderr: unknown } }) {
   const { stdout, stderr } = handle.collected;
   if (!isCollectedStream(stdout) || !isCollectedStream(stderr)) {
-    throw new Error("dsh-bash-terminal-ts: subprocess implementation dropped a requested collect stream");
+    throw new Error("dsh-bash-terminal: subprocess implementation dropped a requested collect stream");
   }
   return { stdout, stderr };
 }
@@ -393,7 +392,7 @@ async function runForeground(
 function requireSubprocess(ctx: BashTerminalContext) {
   const subprocess = ctx.subprocess;
   if (subprocess === null) {
-    throw new Error("dsh-bash-terminal-ts: ctx.subprocess seam unavailable (missing inject service)");
+    throw new Error("dsh-bash-terminal: ctx.subprocess seam unavailable (missing inject service)");
   }
   return subprocess;
 }
@@ -586,8 +585,9 @@ export function validateArgs(args: Record<string, unknown>): ValidatedShellArgs
  * Git Bash and MSYS2 are also not confined: DSH's Windows ACL restricted-token
  * runner cannot start Cygwin/MSYS2 (CreateFileMapping Win32 error 5), so
  * attempting to wrap them would abort every Git Bash / MSYS2 command. A
- * requested confined mode with no usable backend throws the fail-closed
- * SandboxUnavailableError, exactly like the shipped executors.
+ * requested confined mode
+ * with no usable backend throws the fail-closed SandboxUnavailableError,
+ * exactly like the shipped executors.
  */
 function confineSpawn(
   ctx: BashTerminalContext,
@@ -666,14 +666,14 @@ const BACKGROUND_OUTPUT_PROPERTIES: Record<string, JsonSchemaNode> = {
 
 export function apply(ctx: BashTerminalContext, config: Partial<ConfigValues> = {}): void {
   if (process.platform !== "win32") {
-    ctx.logger?.info?.("dsh-bash-terminal-ts: only meaningful on win32; skipping tool registration");
+    ctx.logger?.info?.("dsh-bash-terminal: only meaningful on win32; skipping tool registration");
     return;
   }
   const backgroundEnabled = true;
   const paths = resolveAllPaths(config);
   const defaultShell = config.defaultShell ?? DEFAULT_SHELL;
   if (!(SHELLS as readonly string[]).includes(defaultShell)) {
-    throw new Error(`dsh-bash-terminal-ts: invalid defaultShell ${JSON.stringify(defaultShell)}`);
+    throw new Error(`dsh-bash-terminal: invalid defaultShell ${JSON.stringify(defaultShell)}`);
   }
   const settingsScope = ctx.settings.register(
     SETTINGS_NAMESPACE,
@@ -706,7 +706,7 @@ export function apply(ctx: BashTerminalContext, config: Partial<ConfigValues> =
   ctx.systemPrompt.section({
     name: "tool:bash-terminal",
     order: 105,
-    text: "Use the shell tool for terminal commands: it runs in the terminal the user chose in Settings -> General -> Default terminal (PowerShell, Git Bash, or WSL) and honors the DSH sandbox. Prefer it over the pwsh tool for everyday commands; keep the pwsh tool for cases that specifically need the sandboxed PowerShell surface."
+    text: "Use the shell tool for terminal commands: it runs in the terminal the user chose in Settings -> General -> Default terminal (PowerShell, Git Bash, MSYS2, or WSL) and honors the DSH sandbox. Prefer it over the pwsh tool for everyday commands; keep the pwsh tool for cases that specifically need the sandboxed PowerShell surface."
   });
 
   const toolName = "shell";
@@ -829,7 +829,7 @@ export function apply(ctx: BashTerminalContext, config: Partial<ConfigValues> =
       const shell = settingsScope.get().defaultShell;
       const argv0 = buildArgv(shell, v.command, paths, v.distro);
       if (argv0[0] === undefined) {
-        throw new Error(`dsh-bash-terminal-ts: ${shell} backend unavailable - executable not found. Install it or set the corresponding *Path config.`);
+        throw new Error(`dsh-bash-terminal: ${shell} backend unavailable - executable not found. Install it or set the corresponding *Path config.`);
       }
       // Only element 0 (the resolved executable) can be undefined; guarded above.
       const argv = argv0 as string[];