dsh-bash-terminal-ts 0.6.4 → 0.7.1

package/src/client.tsx

@@ -1,207 +1,249 @@
-// dsh-bash-terminal-ts 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 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 { IconChevronDownOutlineMedium, Menu } from "@deepseek-ai/dsh-client-ui-primitives";
-
-const SETTINGS_NS = "settings.bash-terminal";
-/** Entry id of this plugin in the active profile (cordis.patch.yml). */
-const ENTRY_ID = "tool-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-ts";
-  tag.dataset.pluginCss = "bash-terminal-row";
-  tag.textContent = ROW_CSS;
-  document.head.appendChild(tag);
-}
-
-const zh: Record<string, string> = {
-  "shell.title": "默认终端",
-  "shell.description": "shell 工具执行命令时使用的终端",
-  "shell.powershell": "PowerShell",
-  "shell.gitbash": "Git Bash",
-  "shell.msys2": "MSYS2",
-  "shell.wsl": "WSL",
-  "shell.unavailable": "设置面不可用：宿主未提供本插件的 configForms 条目（检查 cordis.patch.yml 的 entry id）"
-};
-const en: Record<string, string> = {
-  "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)"
-};
-
-export const inject = ["slots", "locale", "configForms"];
-
-/** Row state snapshot served through the settings store. */
-interface RowState {
-  shell: string;
-  revision: number;
-  writable: boolean;
-  status: "loading" | "ready" | "unavailable";
-}
-
-interface ShellPreferenceRowProps {
-  t: (key: string) => string;
-  useStore: <S>(selector: (state: RowState) => S) => S;
-  setShell: (id: string) => void;
-}
-
-function ShellPreferenceRow({ t, useStore, setShell }: ShellPreferenceRowProps) {
-  const shell = useStore((s) => s.shell);
-  const writable = useStore((s) => s.writable);
-  const status = useStore((s) => s.status);
-  const [open, setOpen] = useState(false);
-  const items = SHELLS.map((id) => ({ id, label: t("shell." + id) }));
-  if (status === "unavailable") {
-    return (
-      <div className="btRow">
-        <div className="btRowText">
-          <div className="btTitle">{t("shell.title")}</div>
-          <div className="btDesc">{t("shell.unavailable")}</div>
-        </div>
-      </div>
-    );
-  }
-  return (
-    <div className="btRow">
-      <div className="btRowText">
-        <div className="btTitle">{t("shell.title")}</div>
-        <div className="btDesc">{t("shell.description")}</div>
-      </div>
-      <Menu
-        open={open}
-        onClose={() => setOpen(false)}
-        items={items}
-        selectedId={shell}
-        onSelect={(id) => {
-          setOpen(false);
-          setShell(id);
-        }}
-        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)}
-            <IconChevronDownOutlineMedium className="btChevron" />
-          </button>
-        }
-      />
-    </div>
-  );
-}
-
-interface SettingsSnapshot {
-  status: "loading" | "ready" | "unavailable";
-  value?: { defaultShell?: string };
-  revision: number | undefined;
-  writable: boolean;
-}
-
-interface ConfigFormBinding {
-  getSnapshot(): SettingsSnapshot;
-  subscribe(fn: () => void): () => void;
-  set(field: string, value: string): Promise<boolean>;
-  unset(field: string): Promise<boolean>;
-}
-
-interface ClientContext {
-  effect(fn: () => unknown, name?: string): unknown;
-  locale: { register(ns: string, dicts: Record<string, Record<string, string>>): unknown };
-  configForms: { get(entryId: string): ConfigFormBinding };
-  slots: {
-    inject(slot: string, fn: () => unknown, name?: string): void;
-    register(options: Record<string, unknown>, Component: unknown): Record<string, unknown>;
-  };
-}
-
-interface RowStoreActions {
-  sync(shell?: string, revision?: number, writable?: boolean, status?: RowState["status"]): void;
-}
-
-interface RowStore {
-  actions: RowStoreActions;
-}
-
-/** 账本 label：从 zh/en 字典取「默认终端」标题（无宿主 locale 依赖）。 */
-const zhDictTitle = (): string => (zh as Record<string, string>)["shell.title"] ?? "终端";
-
-export function apply(ctx: ClientContext): void {
-  ctx.effect(() => ctx.locale.register(SETTINGS_NS, { zh, en }), "bash-terminal: settings dictionaries");
-  const scope = ctx.configForms.get(ENTRY_ID);
-  const store = defineStore<RowState, { sync: (draft: RowState, shell?: string, revision?: number, writable?: boolean, status?: RowState["status"]) => void }>({
-    init: (): RowState => ({ shell: "powershell", revision: -1, writable: false, status: "loading" }),
-    actions: {
-      sync: (d, shell, revision, writable, status) => {
-        if (revision !== undefined && revision <= d.revision) return;
-        if (shell !== undefined) d.shell = shell;
-        if (revision !== undefined) d.revision = revision;
-        if (writable !== undefined) d.writable = writable;
-        if (status !== undefined) d.status = status;
-      }
-    }
-  });
-  let bound: RowStoreActions | undefined;
-  const push = (snap: SettingsSnapshot): void => {
-    bound?.sync(snap.value?.defaultShell, snap.revision, snap.writable, snap.status);
-  };
-  // 插件族共用设置 tab（dsh-thinking-levels 顶级「起子插件设置」节声明该子席位）。
-  // thinking-levels 缺席时本 inject 静默等待，不阻塞客户端半。
-  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: unknown) => {
-            bound = actions as RowStoreActions;
-            push(scope.getSnapshot());
-            return { setShell: (value: string) => void scope.set("defaultShell", value) };
-          }
-        },
-        ShellPreferenceRow
-      ),
-    "bash-terminal: settings row"
-  );
-  ctx.effect(() => scope.subscribe(() => push(scope.getSnapshot())), "bash-terminal: settings watch");
-}
+// dsh-bash-terminal-ts 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 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 { IconChevronDownOutlineMedium, Menu } from "@deepseek-ai/dsh-client-ui-primitives";
+
+const SETTINGS_NS = "settings.bash-terminal";
+/** Entry id of this plugin in the active profile (cordis.patch.yml). */
+const ENTRY_ID = "tool-bash-terminal";
+const SHELLS = ["powershell", "gitbash", "msys2", "wsl"] as const;
+
+// 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-ts";
+  tag.dataset.pluginCss = "bash-terminal-row";
+  tag.textContent = ROW_CSS;
+  document.head.appendChild(tag);
+}
+
+const zh: Record<string, string> = {
+  "shell.title": "默认终端",
+  "shell.description": "shell 工具执行命令时使用的终端",
+  "shell.powershell": "PowerShell",
+  "shell.gitbash": "Git Bash",
+  "shell.msys2": "MSYS2",
+  "shell.wsl": "WSL",
+  "shell.unavailable": "设置面不可用：宿主未提供本插件的 configForms 条目（检查 cordis.patch.yml 的 entry id）"
+};
+const en: Record<string, string> = {
+  "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)"
+};
+const fr: Record<string, string> = {
+  "shell.title": "Terminal par défaut",
+  "shell.description": "Terminal utilisé par l'outil shell",
+  "shell.powershell": "PowerShell",
+  "shell.gitbash": "Git Bash",
+  "shell.msys2": "MSYS2",
+  "shell.wsl": "WSL",
+  "shell.unavailable": "Paramètres indisponibles : l'hôte n'expose aucune entrée configForms pour ce plugin (vérifiez l'entry id du cordis.patch.yml)"
+};
+const de: Record<string, string> = {
+  "shell.title": "Standard-Terminal",
+  "shell.description": "Terminal, das vom Shell-Tool verwendet wird",
+  "shell.powershell": "PowerShell",
+  "shell.gitbash": "Git Bash",
+  "shell.msys2": "MSYS2",
+  "shell.wsl": "WSL",
+  "shell.unavailable": "Einstellungen nicht verfügbar: Der Host stellt keinen configForms-Eintrag für dieses Plugin bereit (Entry-ID in cordis.patch.yml prüfen)"
+};
+const it: Record<string, string> = {
+  "shell.title": "Terminale predefinito",
+  "shell.description": "Terminale usato dallo strumento shell",
+  "shell.powershell": "PowerShell",
+  "shell.gitbash": "Git Bash",
+  "shell.msys2": "MSYS2",
+  "shell.wsl": "WSL",
+  "shell.unavailable": "Impostazioni non disponibili: l'host non espone alcuna voce configForms per questo plugin (verifica l'entry id in cordis.patch.yml)"
+};
+const ru: Record<string, string> = {
+  "shell.title": "Терминал по умолчанию",
+  "shell.description": "Терминал, используемый инструментом shell",
+  "shell.powershell": "PowerShell",
+  "shell.gitbash": "Git Bash",
+  "shell.msys2": "MSYS2",
+  "shell.wsl": "WSL",
+  "shell.unavailable": "Настройки недоступны: хост не предоставляет запись configForms для этого плагина (проверьте entry id в cordis.patch.yml)"
+};
+const es: Record<string, string> = {
+  "shell.title": "Terminal predeterminado",
+  "shell.description": "Terminal que usa la herramienta shell",
+  "shell.powershell": "PowerShell",
+  "shell.gitbash": "Git Bash",
+  "shell.msys2": "MSYS2",
+  "shell.wsl": "WSL",
+  "shell.unavailable": "Configuración no disponible: el host no expone ninguna entrada configForms para este plugin (comprueba el entry id de cordis.patch.yml)"
+};
+
+export const inject = ["slots", "locale", "configForms"];
+
+/** Row state snapshot served through the settings store. */
+interface RowState {
+  shell: string;
+  revision: number;
+  writable: boolean;
+  status: "loading" | "ready" | "unavailable";
+}
+
+interface ShellPreferenceRowProps {
+  t: (key: string) => string;
+  useStore: <S>(selector: (state: RowState) => S) => S;
+  setShell: (id: string) => void;
+}
+
+function ShellPreferenceRow({ t, useStore, setShell }: ShellPreferenceRowProps) {
+  const shell = useStore((s) => s.shell);
+  const writable = useStore((s) => s.writable);
+  const status = useStore((s) => s.status);
+  const [open, setOpen] = useState(false);
+  const items = SHELLS.map((id) => ({ id, label: t("shell." + id) }));
+  if (status === "unavailable") {
+    return (
+      <div className="btRow">
+        <div className="btRowText">
+          <div className="btTitle">{t("shell.title")}</div>
+          <div className="btDesc">{t("shell.unavailable")}</div>
+        </div>
+      </div>
+    );
+  }
+  return (
+    <div className="btRow">
+      <div className="btRowText">
+        <div className="btTitle">{t("shell.title")}</div>
+        <div className="btDesc">{t("shell.description")}</div>
+      </div>
+      <Menu
+        open={open}
+        onClose={() => setOpen(false)}
+        items={items}
+        selectedId={shell}
+        onSelect={(id) => {
+          setOpen(false);
+          setShell(id);
+        }}
+        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)}
+            <IconChevronDownOutlineMedium className="btChevron" />
+          </button>
+        }
+      />
+    </div>
+  );
+}
+
+interface SettingsSnapshot {
+  status: "loading" | "ready" | "unavailable";
+  value?: { defaultShell?: string };
+  revision: number | undefined;
+  writable: boolean;
+}
+
+interface ConfigFormBinding {
+  getSnapshot(): SettingsSnapshot;
+  subscribe(fn: () => void): () => void;
+  set(field: string, value: string): Promise<boolean>;
+  unset(field: string): Promise<boolean>;
+}
+
+interface ClientContext {
+  effect(fn: () => unknown, name?: string): unknown;
+  locale: { register(ns: string, dicts: Record<string, Record<string, string>>): unknown };
+  configForms: { get(entryId: string): ConfigFormBinding };
+  slots: {
+    inject(slot: string, fn: () => unknown, name?: string): void;
+    register(options: Record<string, unknown>, Component: unknown): Record<string, unknown>;
+  };
+}
+
+interface RowStoreActions {
+  sync(shell?: string, revision?: number, writable?: boolean, status?: RowState["status"]): void;
+}
+
+/** 账本 label：从 zh/en 字典取「默认终端」标题（无宿主 locale 依赖）。 */
+const zhDictTitle = (): string => (zh as Record<string, string>)["shell.title"] ?? "终端";
+
+export function apply(ctx: ClientContext): void {
+  // Single call for every locale: the registry rejects a duplicate
+  // (namespace, locale) pair, so one bundle keeps the namespace atomic
+  // (fr/de/it/ru/es ride the untyped dicts overload; only zh/en are built in).
+  ctx.effect(() => ctx.locale.register(SETTINGS_NS, { zh, en, fr, de, it, ru, es }), "bash-terminal: settings dictionaries");
+  const scope = ctx.configForms.get(ENTRY_ID);
+  const store = defineStore<RowState, { sync: (draft: RowState, shell?: string, revision?: number, writable?: boolean, status?: RowState["status"]) => void }>({
+    init: (): RowState => ({ shell: "powershell", revision: -1, writable: false, status: "loading" }),
+    actions: {
+      sync: (d, shell, revision, writable, status) => {
+        if (revision !== undefined && revision <= d.revision) return;
+        if (shell !== undefined) d.shell = shell;
+        if (revision !== undefined) d.revision = revision;
+        if (writable !== undefined) d.writable = writable;
+        if (status !== undefined) d.status = status;
+      }
+    }
+  });
+  let bound: RowStoreActions | undefined;
+  const push = (snap: SettingsSnapshot): void => {
+    bound?.sync(snap.value?.defaultShell, snap.revision, snap.writable, snap.status);
+  };
+  // 插件族共用设置 tab（dsh-thinking-levels 顶级「起子插件设置」节声明该子席位）。
+  // thinking-levels 缺席时本 inject 静默等待，不阻塞客户端半。
+  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: unknown) => {
+            bound = actions as RowStoreActions;
+            push(scope.getSnapshot());
+            return { setShell: (value: string) => void scope.set("defaultShell", value) };
+          }
+        },
+        ShellPreferenceRow
+      ),
+    "bash-terminal: settings row"
+  );
+  ctx.effect(() => scope.subscribe(() => push(scope.getSnapshot())), "bash-terminal: settings watch");
+}

package/src/terminal.ts

@@ -22,8 +22,7 @@ import type {
   JobsRegistry,
   ResolvedPaths,
   TerminalHandle,
-  TerminalSpawnSpec,
-  ToolRunContext
+  TerminalSpawnSpec
 } from "./dsh-types.js";
 
 const MAX_BUFFER_BYTES = 1024 * 1024;
@@ -140,6 +139,20 @@ type NodePtySpawn = (
   options: { name: string; cols: number; rows: number; cwd: string; env: Record<string, string | undefined> }
 ) => NodePtyTerm;
 
+/**
+ * node-pty >=1.2.0-beta (ConPTY dll path) assigns the inner pid only after the
+ * agent connects its data pipe; it reads 0 before that. The 1.1.x line reports
+ * it synchronously, so waiting is a no-op there.
+ */
+async function waitForPid(term: NodePtyTerm, timeoutMs = 5000): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  while (term.pid <= 0 && Date.now() < deadline) await delay(25);
+  if (term.pid <= 0) {
+    try { term.kill(); } catch { /* already dead */ }
+    throw new Error("terminal: node-pty did not report a process id within " + timeoutMs + "ms (ConPTY agent did not connect)");
+  }
+}
+
 /**
  * Direct node-pty handle with the same surface the official seam returns:
  * output (stream), pid, done, write / signalForeground / terminate. Used on
@@ -156,6 +169,7 @@ async function spawnPtyHandle(spec: TerminalSpawnSpec): Promise<TerminalHandle>
     cwd,
     env: { ...env, TERM: "dumb", NO_COLOR: "1" }
   });
+  await waitForPid(term);
   const output = new PassThrough();
   term.onData((chunk) => output.write(Buffer.from(chunk, "utf8")));
   const done = new Promise<{ exitCode: number; signal: string | null }>((resolveDone) => {