dsh-bash-terminal-ts 0.5.1 → 0.6.1

package/dist/client.core.js

@@ -28,7 +28,7 @@ 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 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) {
@@ -54,7 +54,7 @@ var en = {
   "shell.msys2": "MSYS2",
   "shell.wsl": "WSL"
 };
-var inject = ["slots", "locale", "settingsScope"];
+var inject = ["slots", "locale", "configForms"];
 function ShellPreferenceRow({ t, useStore, setShell }) {
   const shell = useStore((s) => s.shell);
   const writable = useStore((s) => s.writable);
@@ -100,7 +100,7 @@ function ShellPreferenceRow({ t, useStore, setShell }) {
 }
 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 scope = ctx.configForms.get(ENTRY_ID);
   const store = (0, import_dsh_client_store.defineStore)({
     init: () => ({ shell: "powershell", revision: -1, writable: false }),
     actions: {

package/dist/client.js

@@ -33,7 +33,7 @@ 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 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) {
@@ -59,7 +59,7 @@ var en = {
   "shell.msys2": "MSYS2",
   "shell.wsl": "WSL"
 };
-var inject = ["slots", "locale", "settingsScope"];
+var inject = ["slots", "locale", "configForms"];
 function ShellPreferenceRow({ t, useStore, setShell }) {
   const shell = useStore((s) => s.shell);
   const writable = useStore((s) => s.writable);
@@ -105,7 +105,7 @@ function ShellPreferenceRow({ t, useStore, setShell }) {
 }
 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 scope = ctx.configForms.get(ENTRY_ID);
   const store = (0, import_dsh_client_store.defineStore)({
     init: () => ({ shell: "powershell", revision: -1, writable: false }),
     actions: {

package/dsh.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "dsh-bash-terminal",
   "name": "dsh-bash-terminal",
-  "version": "0.5.1",
+  "version": "0.6.1",
   "description": {
     "en": "One shell tool that runs commands through PowerShell, Git Bash, MSYS2 or WSL on Windows, with a user-chosen default terminal in the Web UI settings.",
     "zh": "一个 shell 工具，可在 Windows 上通过 PowerShell / Git Bash / MSYS2 / WSL 执行命令，默认终端在 Web UI 设置中选择。"
@@ -13,7 +13,7 @@
   },
   "license": "MIT",
   "engines": {
-    "dsh": ">=0.1.5-rc.1 <0.1.6-0"
+    "dsh": ">=0.1.7-rc.1 <0.1.8-0"
   },
   "components": {
     "host": "lib/index.js",

package/lib/client.js

@@ -33,7 +33,7 @@ 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 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) {
@@ -59,7 +59,7 @@ var en = {
   "shell.msys2": "MSYS2",
   "shell.wsl": "WSL"
 };
-var inject = ["slots", "locale", "settingsScope"];
+var inject = ["slots", "locale", "configForms"];
 function ShellPreferenceRow({ t, useStore, setShell }) {
   const shell = useStore((s) => s.shell);
   const writable = useStore((s) => s.writable);
@@ -105,7 +105,7 @@ function ShellPreferenceRow({ t, useStore, setShell }) {
 }
 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 scope = ctx.configForms.get(ENTRY_ID);
   const store = (0, import_dsh_client_store.defineStore)({
     init: () => ({ shell: "powershell", revision: -1, writable: false }),
     actions: {

package/lib/dsh-types.d.ts

@@ -250,7 +250,6 @@ export interface BashTerminalContext {
     tools: ToolsSeam;
     on(event: "system-prompt/assemble", handler: AssembleHandler): void;
     shellEnv: ShellEnvSeam;
-    settings: SettingsSeam;
     sandboxPolicy: SandboxPolicySeam;
     sandbox: SandboxSeam;
     get(key: string): unknown;

package/lib/dsh.d.ts

@@ -20,6 +20,8 @@ export declare const escalationHintMarker: (subject: string) => string;
 /** Runtime config schema factory (schemastery fork). */
 export interface SchemasterySchema {
     default(value: unknown): SchemasterySchema;
+    /** 0.1.7+: expose the field on the auto-generated settings form. */
+    volatile(): SchemasterySchema;
 }
 export interface Schemastery {
     object(fields: Record<string, SchemasterySchema>): SchemasterySchema;

package/lib/index.d.ts

@@ -7,8 +7,6 @@ export declare const inject: string[];
 export declare const SHELLS: readonly ["powershell", "gitbash", "msys2", "wsl"];
 /** The backend used when the caller does not name one. */
 export declare const DEFAULT_SHELL: ShellId;
-/** Settings namespace backing the user-chosen default terminal. */
-export declare const SETTINGS_NAMESPACE = "bash-terminal";
 /** Static shape of the runtime configuration schema. */
 export interface ConfigValues {
     defaultShell: string;

package/lib/index.js

@@ -33,8 +33,6 @@ export const inject = ["tools", "systemPrompt", "shellEnv", "subprocess", "setti
 export const SHELLS = ["powershell", "gitbash", "msys2", "wsl"];
 /** The backend used when the caller does not name one. */
 export const DEFAULT_SHELL = "powershell";
-/** Settings namespace backing the user-chosen default terminal. */
-export const SETTINGS_NAMESPACE = "bash-terminal";
 /** Default per-command timeout (ms). */
 const DEFAULT_TIMEOUT_MS = 120000;
 /** Upper bound a caller's timeoutMs is capped to. */
@@ -56,7 +54,7 @@ const ENV_OVERRIDES = {
 };
 /** Runtime configuration schema. */
 export const Config = z.object({
-    defaultShell: z.string().default(DEFAULT_SHELL),
+    defaultShell: z.string().default(DEFAULT_SHELL).volatile(),
     timeoutMs: z.number().default(DEFAULT_TIMEOUT_MS),
     maxTimeoutMs: z.number().default(MAX_TIMEOUT_MS),
     pwshPath: z.string().default(""),
@@ -500,11 +498,19 @@ export function apply(ctx, config = {}) {
     }
     const backgroundEnabled = true;
     const paths = resolveAllPaths(config);
-    const defaultShell = config.defaultShell ?? DEFAULT_SHELL;
-    if (!SHELLS.includes(defaultShell)) {
-        throw new Error(`dsh-bash-terminal: invalid defaultShell ${JSON.stringify(defaultShell)}`);
+    // 0.1.7: `defaultShell` is a `.volatile()` config field — the loader hands
+    // `apply` a live ref and the latest value is resolved on every read; there
+    // is no settings registration call anymore (removed with the 0.1.7 host).
+    const currentShell = () => {
+        const v = config.defaultShell;
+        if (typeof v === "string")
+            return v;
+        const got = typeof v?.get === "function" ? v.get() : undefined;
+        return typeof got === "string" ? got : DEFAULT_SHELL;
+    };
+    if (!SHELLS.includes(currentShell())) {
+        throw new Error(`dsh-bash-terminal: invalid defaultShell ${JSON.stringify(currentShell())}`);
     }
-    const settingsScope = ctx.settings.register(SETTINGS_NAMESPACE, z.object({ defaultShell: z.union(SHELLS.map((s) => z.const(s))).default(defaultShell) }), { base: { defaultShell } });
     /** Official sandbox-escalation surface (mirrors tool-bash): advertise the
      * escalation modes whenever the deployment confines. */
     const escalationModes = ESCALATION_TARGETS;
@@ -529,7 +535,7 @@ export function apply(ctx, config = {}) {
     });
     const toolName = "shell";
     const terminalRegistry = createTerminalRegistry(ctx);
-    ctx.tools.register(terminalTool(ctx, terminalRegistry, paths, () => settingsScope.get().defaultShell));
+    ctx.tools.register(terminalTool(ctx, terminalRegistry, paths, () => currentShell()));
     // The model-facing description must track the user's chosen default
     // terminal: a static description listing every backend leaves the model
     // guessing which syntax applies. Re-render it on every prompt assembly —
@@ -537,7 +543,7 @@ export function apply(ctx, config = {}) {
     // without a restart.
     ctx.on("system-prompt/assemble", async (_assembly, _context, next) => {
         const assembled = await next();
-        const description = toolDescription(backgroundEnabled, settingsScope.get().defaultShell);
+        const description = toolDescription(backgroundEnabled, currentShell());
         const tools = Array.isArray(assembled.tools)
             ? assembled.tools.map((tool) => (tool.name === toolName ? { ...tool, description } : tool))
             : assembled.tools;
@@ -545,7 +551,7 @@ export function apply(ctx, config = {}) {
     });
     ctx.tools.register(defineTool({
         name: toolName,
-        description: toolDescription(backgroundEnabled, settingsScope.get().defaultShell),
+        description: toolDescription(backgroundEnabled, currentShell()),
         parameters: {
             command: {
                 type: "string",
@@ -644,7 +650,7 @@ export function apply(ctx, config = {}) {
         },
         async execute(args, exec) {
             const v = validateArgs(args);
-            const shell = settingsScope.get().defaultShell;
+            const shell = currentShell();
             const argv0 = buildArgv(shell, v.command, paths, v.distro);
             if (argv0[0] === undefined) {
                 throw new Error(`dsh-bash-terminal: ${shell} backend unavailable - executable not found. Install it or set the corresponding *Path config.`);

package/package.json

@@ -1,10 +1,8 @@
 {
   "name": "dsh-bash-terminal-ts",
-  "version": "0.5.1",
+  "version": "0.6.1",
   "publishConfig": {
-    "registry": "https://registry.npmjs.org",
-    "access": "public",
-    "tag": "dsh-0.1.5"
+    "tag": "dsh-0.1.7"
   },
   "description": "DSH plugin: one shell tool that runs commands through PowerShell, Git Bash, MSYS2, or WSL on Windows, with a user-chosen default terminal in the Web UI settings. TypeScript rewrite of MAXeaglet/dsh-bash-terminal with working MSYS2/MINGW64 support.",
   "author": "drscrewdriver",
@@ -31,7 +29,7 @@
   ],
   "engines": {
     "node": ">=22",
-    "dsh": ">=0.1.5-rc.1 <0.1.6-0"
+    "dsh": ">=0.1.7-rc.1 <0.1.8-0"
   },
   "type": "module",
   "main": "lib/index.js",
@@ -76,21 +74,21 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-tools": ">=0.1.5-rc.1 <0.1.6-0",
-    "@deepseek-ai/dsh-settings": ">=0.1.5-rc.1 <0.1.6-0",
-    "@deepseek-ai/dsh-llm": ">=0.1.5-rc.1 <0.1.6-0",
-    "@deepseek-ai/dsh-shell": ">=0.1.5-rc.1 <0.1.6-0",
-    "@deepseek-ai/dsh-sandbox": ">=0.1.5-rc.1 <0.1.6-0",
-    "@deepseek-ai/dsh-timeout": ">=0.1.5-rc.1 <0.1.6-0",
-    "@deepseek-ai/dsh-client-store": ">=0.1.5-rc.1 <0.1.6-0",
-    "@deepseek-ai/dsh-client-locale": ">=0.1.5-rc.1 <0.1.6-0",
-    "@deepseek-ai/dsh-client-ui-settings": ">=0.1.5-rc.1 <0.1.6-0",
-    "@deepseek-ai/dsh-client-ui-slots": ">=0.1.5-rc.1 <0.1.6-0",
-    "@deepseek-ai/dsh-client-ui-primitives": ">=0.1.5-rc.1 <0.1.6-0",
+    "@deepseek-ai/dsh-tools": ">=0.1.7-rc.1 <0.1.8-0",
+    "@deepseek-ai/dsh-settings": ">=0.1.7-rc.1 <0.1.8-0",
+    "@deepseek-ai/dsh-llm": ">=0.1.7-rc.1 <0.1.8-0",
+    "@deepseek-ai/dsh-shell": ">=0.1.7-rc.1 <0.1.8-0",
+    "@deepseek-ai/dsh-sandbox": ">=0.1.7-rc.1 <0.1.8-0",
+    "@deepseek-ai/dsh-timeout": ">=0.1.7-rc.1 <0.1.8-0",
+    "@deepseek-ai/dsh-client-store": ">=0.1.7-rc.1 <0.1.8-0",
+    "@deepseek-ai/dsh-client-locale": ">=0.1.7-rc.1 <0.1.8-0",
+    "@deepseek-ai/dsh-client-ui-settings": ">=0.1.7-rc.1 <0.1.8-0",
+    "@deepseek-ai/dsh-client-ui-slots": ">=0.1.7-rc.1 <0.1.8-0",
+    "@deepseek-ai/dsh-client-ui-primitives": ">=0.1.7-rc.1 <0.1.8-0",
     "react": "^18.2.0"
   },
   "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.1",
+    "@deepseek-ai/schemastery": "^3.18.4",
     "node-pty": "^1.1.0"
   },
   "devDependencies": {

package/src/client.tsx

@@ -16,7 +16,8 @@ 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";
+/** 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];
@@ -55,7 +56,7 @@ const en: Record<string, string> = {
   "shell.wsl": "WSL"
 };
 
-export const inject = ["slots", "locale", "settingsScope"];
+export const inject = ["slots", "locale", "configForms"];
 
 /** Row state snapshot served through the settings store. */
 interface RowState {
@@ -112,23 +113,23 @@ function ShellPreferenceRow({ t, useStore, setShell }: ShellPreferenceRowProps)
 }
 
 interface SettingsSnapshot {
-  status: string;
+  status: "loading" | "ready" | "unavailable";
   value?: { defaultShell?: string };
-  revision: number;
+  revision: number | undefined;
   writable: boolean;
 }
 
-interface SettingsScopeBinding {
+interface ConfigFormBinding {
   getSnapshot(): SettingsSnapshot;
   subscribe(fn: () => void): () => void;
-  set(field: string, value: string): void;
-  unset(): 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 };
-  settingsScope: { bind(options: { namespace: string }): SettingsScopeBinding };
+  configForms: { get(entryId: string): ConfigFormBinding };
   slots: {
     inject(slot: string, fn: () => unknown, name?: string): void;
     register(options: Record<string, unknown>, Component: unknown): Record<string, unknown>;
@@ -145,7 +146,7 @@ interface RowStore {
 
 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 });
+  const scope = ctx.configForms.get(ENTRY_ID);
   const store = defineStore<RowState, { sync: (draft: RowState, shell?: string, revision?: number, writable?: boolean) => void }>({
     init: (): RowState => ({ shell: "powershell", revision: -1, writable: false }),
     actions: {

package/src/dsh-types.ts

@@ -303,7 +303,6 @@ export interface BashTerminalContext {
   tools: ToolsSeam;
   on(event: "system-prompt/assemble", handler: AssembleHandler): void;
   shellEnv: ShellEnvSeam;
-  settings: SettingsSeam;
   sandboxPolicy: SandboxPolicySeam;
   sandbox: SandboxSeam;
   get(key: string): unknown;

package/src/dsh.ts

@@ -52,6 +52,8 @@ export const escalationHintMarker = sandboxNs.escalationHintMarker as unknown as
 /** Runtime config schema factory (schemastery fork). */
 export interface SchemasterySchema {
   default(value: unknown): SchemasterySchema;
+  /** 0.1.7+: expose the field on the auto-generated settings form. */
+  volatile(): SchemasterySchema;
 }
 
 export interface Schemastery {

package/src/index.ts

@@ -61,8 +61,6 @@ export const inject = ["tools", "systemPrompt", "shellEnv", "subprocess", "setti
 export const SHELLS = ["powershell", "gitbash", "msys2", "wsl"] as const;
 /** The backend used when the caller does not name one. */
 export const DEFAULT_SHELL: ShellId = "powershell";
-/** Settings namespace backing the user-chosen default terminal. */
-export const SETTINGS_NAMESPACE = "bash-terminal";
 /** Default per-command timeout (ms). */
 const DEFAULT_TIMEOUT_MS = 120000;
 /** Upper bound a caller's timeoutMs is capped to. */
@@ -84,6 +82,11 @@ const ENV_OVERRIDES: Record<string, string> = {
   GIT_PAGER: "cat"
 };
 
+/** Live reference the 0.1.7 loader hands `apply` for `.volatile()` config fields. */
+interface VolatileRef<T> {
+  get(): T;
+}
+
 /** Static shape of the runtime configuration schema. */
 export interface ConfigValues {
   defaultShell: string;
@@ -97,7 +100,7 @@ export interface ConfigValues {
 
 /** Runtime configuration schema. */
 export const Config = z.object({
-  defaultShell: z.string().default(DEFAULT_SHELL),
+  defaultShell: z.string().default(DEFAULT_SHELL).volatile(),
   timeoutMs: z.number().default(DEFAULT_TIMEOUT_MS),
   maxTimeoutMs: z.number().default(MAX_TIMEOUT_MS),
   pwshPath: z.string().default(""),
@@ -671,15 +674,18 @@ export function apply(ctx: BashTerminalContext, config: Partial<ConfigValues> =
   }
   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: invalid defaultShell ${JSON.stringify(defaultShell)}`);
+  // 0.1.7: `defaultShell` is a `.volatile()` config field — the loader hands
+  // `apply` a live ref and the latest value is resolved on every read; there
+  // is no settings registration call anymore (removed with the 0.1.7 host).
+  const currentShell = (): string => {
+    const v = config.defaultShell as string | VolatileRef<string> | undefined;
+    if (typeof v === "string") return v;
+    const got = typeof v?.get === "function" ? v.get() : undefined;
+    return typeof got === "string" ? got : DEFAULT_SHELL;
+  };
+  if (!(SHELLS as readonly string[]).includes(currentShell())) {
+    throw new Error(`dsh-bash-terminal: invalid defaultShell ${JSON.stringify(currentShell())}`);
   }
-  const settingsScope = ctx.settings.register(
-    SETTINGS_NAMESPACE,
-    z.object({ defaultShell: z.union(SHELLS.map((s) => z.const(s))).default(defaultShell) }),
-    { base: { defaultShell } }
-  );
   /** Official sandbox-escalation surface (mirrors tool-bash): advertise the
    * escalation modes whenever the deployment confines. */
   const escalationModes = ESCALATION_TARGETS;
@@ -711,7 +717,7 @@ export function apply(ctx: BashTerminalContext, config: Partial<ConfigValues> =
 
   const toolName = "shell";
   const terminalRegistry = createTerminalRegistry(ctx);
-  ctx.tools.register(terminalTool(ctx, terminalRegistry, paths, () => settingsScope.get().defaultShell));
+  ctx.tools.register(terminalTool(ctx, terminalRegistry, paths, () => currentShell()));
 
   // The model-facing description must track the user's chosen default
   // terminal: a static description listing every backend leaves the model
@@ -720,7 +726,7 @@ export function apply(ctx: BashTerminalContext, config: Partial<ConfigValues> =
   // without a restart.
   ctx.on("system-prompt/assemble", async (_assembly, _context, next) => {
     const assembled = await next();
-    const description = toolDescription(backgroundEnabled, settingsScope.get().defaultShell);
+    const description = toolDescription(backgroundEnabled, currentShell());
     const tools = Array.isArray(assembled.tools)
       ? assembled.tools.map((tool) => (tool.name === toolName ? { ...tool, description } : tool))
       : assembled.tools;
@@ -729,7 +735,7 @@ export function apply(ctx: BashTerminalContext, config: Partial<ConfigValues> =
 
   ctx.tools.register(defineTool<ShellToolResult>({
     name: toolName,
-    description: toolDescription(backgroundEnabled, settingsScope.get().defaultShell),
+    description: toolDescription(backgroundEnabled, currentShell()),
     parameters: {
       command: {
         type: "string",
@@ -826,7 +832,7 @@ export function apply(ctx: BashTerminalContext, config: Partial<ConfigValues> =
     },
     async execute(args, exec) {
       const v = validateArgs(args);
-      const shell = settingsScope.get().defaultShell;
+      const shell = currentShell();
       const argv0 = buildArgv(shell, v.command, paths, v.distro);
       if (argv0[0] === undefined) {
         throw new Error(`dsh-bash-terminal: ${shell} backend unavailable - executable not found. Install it or set the corresponding *Path config.`);