dsh-bots 0.2.30 → 0.2.31

package/lib/client.js

@@ -343,6 +343,7 @@
 .dbs-fileChip:hover{color:var(--dsw-alias-label-primary)}
 .dbs-fileChipName{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .dbs-setLabel{font-size:12px;line-height:16px;color:var(--dsw-alias-label-tertiary);margin:8px 0 4px}
+.dbs-select{height:28px;min-width:200px;padding:0 8px;border-radius:8px;border:1px solid var(--dsw-alias-border-l2,rgba(0,0,0,.12));background:var(--dsw-specific-input-major,var(--dsw-alias-bg-layer-1,#fff));color:var(--dsw-alias-label-primary);font-size:13px;line-height:28px;outline:none}
 .dbs-chatbar{flex:none;display:flex;align-items:center;gap:8px;height:44px;padding:0 12px;border-bottom:1px solid var(--dsw-alias-border-l1,rgba(0,0,0,.08))}
 .dbs-chatbarName{font-size:14px;line-height:20px;font-weight:600;color:var(--dsw-alias-label-primary);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;min-width:0}
 .dbs-scrollBody{scrollbar-gutter:stable;flex-direction:column;flex:1;min-height:0;display:flex;overflow:hidden auto}
@@ -550,6 +551,15 @@
                 'settings.events.off': '未连接',
                 'settings.entry': '入口：',
                 'settings.entry.value': '左侧边栏「工作区 ｜ Bots」折叠导航',
+                'settings.model.title': '模型配置',
+                'settings.model.current': '当前模型',
+                'settings.model.auto': 'auto（freeroute 默认）',
+                'settings.model.engineDefault': '引擎默认（未设置）',
+                'settings.model.freeroute': 'freeroute 自动路由（默认）',
+                'settings.model.pick': '选择模型',
+                'settings.model.hint': '不选择时默认使用 freeroute 自动路由；freeroute 不可用时使用当前默认模型。选择具体模型会写入账号默认模型，重启引擎后仍生效。',
+                'settings.model.offline': 'freeroute 不可达——已回退当前默认模型',
+                'settings.model.saving': '保存中…',
                 'settings.workspaceRoot': '工作区根目录：',
                 'settings.jail.title': 'Bot 工作区隔离',
                 'settings.jail.summary': '开启后，该 Bot 的每条 Shell 命令被 macOS Seatbelt 包裹：只允许写入自己的工作目录（工作区根/<名字>）与系统临时目录，越界写入被内核拒绝；读取不受限（共享黑板仍可读）。下次对话生效，无需重启。注意：同一名字的多个 Bot 会共享同一目录。',
@@ -668,6 +678,15 @@
                 'settings.events.off': 'not connected',
                 'settings.entry': 'Entry point: ',
                 'settings.entry.value': 'Sidebar “Workspaces | Bots” collapsible nav',
+                'settings.model.title': 'Model',
+                'settings.model.current': 'Current model',
+                'settings.model.auto': 'auto (freeroute default)',
+                'settings.model.engineDefault': 'Engine default (unset)',
+                'settings.model.freeroute': 'freeroute auto routing (default)',
+                'settings.model.pick': 'Pick a model',
+                'settings.model.hint': 'Unselected defaults to freeroute auto routing; when freeroute is unavailable the current default model is used. Picking a model writes the account default model and survives engine restarts.',
+                'settings.model.offline': 'freeroute unreachable — using the current default model',
+                'settings.model.saving': 'Saving…',
                 'settings.workspaceRoot': 'Workspace root: ',
                 'settings.jail.title': 'Bot workspace jail',
                 'settings.jail.summary': 'When enabled, every shell command of that bot is wrapped in a macOS Seatbelt profile: writes are confined to its own workspace directory (workspace root /<name>) and the OS temp dir — out-of-bounds writes are denied by the kernel. Reads stay unrestricted (shared blackboards remain readable). Takes effect on the bot’s next turn, no restart. Note: bots sharing a name share one directory.',
@@ -2118,6 +2137,48 @@
                         ? (confirmId === row.agentId ? t('settings.jail.offConfirm') : t('settings.jail.off'))
                         : t('settings.jail.on')))), err !== null ? e('div', { className: 'dbs-setrow' }, t('settings.mcp.failed'), err) : null);
             }
+            /** Model configuration card: freeroute availability + the engine's
+             * account-level default model (getHostSettings/setHostSettings). No
+             * selection = freeroute auto; freeroute down = the account default. */
+            function ModelCard() {
+                const [cfg, setCfg] = React.useState(undefined);
+                const [working, setWorking] = React.useState(false);
+                const [err, setErr] = React.useState(null);
+                async function refresh() {
+                    setCfg(undefined);
+                    setErr(null);
+                    try {
+                        setCfg(await botsCall('modelConfig', {}));
+                    }
+                    catch (e2) {
+                        setErr(String(e2?.message ?? e2));
+                    }
+                }
+                React.useEffect(() => { void refresh(); }, []);
+                const current = cfg?.agentDefaultModel ?? null;
+                const effLabel = current !== null
+                    ? current
+                    : (cfg?.freerouteReachable === true ? t('settings.model.auto') : t('settings.model.engineDefault'));
+                async function choose(ev) {
+                    const v = String(ev.target.value ?? '');
+                    setWorking(true);
+                    setErr(null);
+                    try {
+                        await botsCall('setModelConfig', { modelId: v === '' ? null : v });
+                        await refresh();
+                    }
+                    catch (e2) {
+                        setErr(String(e2?.message ?? e2));
+                    }
+                    setWorking(false);
+                }
+                return e('div', { className: 'dbs-setcard' }, e('div', { className: 'dbs-sethead' }, e('span', null, t('settings.model.title')), e('span', { style: { flex: 1 } }), working ? e('span', { className: 'dbs-meta' }, t('settings.model.saving')) : null), e('div', { className: 'dbs-setrow' }, t('settings.model.current'), e('b', null, cfg === undefined ? t('settings.reading') : effLabel)), e('div', { className: 'dbs-setrow' }, t('settings.model.pick'), e('select', {
+                    className: 'dbs-select', value: current ?? '', disabled: working || cfg === undefined,
+                    onChange: (ev) => void choose(ev),
+                }, e('option', { value: '' }, t('settings.model.freeroute')), (cfg?.models ?? []).map((m) => e('option', { key: m, value: m }, m)))), cfg?.freerouteReachable === false
+                    ? e('div', { className: 'dbs-meta', style: { padding: '0 2px' } }, t('settings.model.offline'))
+                    : null, e('div', { className: 'dbs-meta', style: { padding: '0 2px' } }, t('settings.model.hint')), err !== null ? e('div', { className: 'dbs-setrow' }, err) : null);
+            }
             function BotsSettings() {
                 const [info, setInfo] = React.useState(undefined);
                 const [sse, setSse] = React.useState(null);
@@ -2137,7 +2198,7 @@
                 const ok = info?.ok === true;
                 return e('div', { className: 'dbs-settings' }, e('div', { className: 'dbs-setrow' }, t('settings.summary')), e('div', { className: 'dbs-setcard' }, e('div', { className: 'dbs-sethead' }, StateDot !== null ? e(StateDot, { state: ok ? 'done' : 'failed', size: 10 }) : null, info === undefined ? t('settings.probing') : ok ? t('gateway.online', { port: info.port }) : t('gateway.offline'), e('span', { style: { flex: 1 } }), e(Button, { variant: 'outline', size: 'sm', onClick: () => void refresh() }, t('action.refresh'))), ok ? e('div', null, e('div', { className: 'dbs-setrow' }, t('settings.address'), e('b', null, info.baseUrl)), e('div', { className: 'dbs-setrow' }, t('settings.pid'), e('b', null, String(info.pid)), ' · ' + (info.health?.isBusy === true ? t('settings.busy') : t('settings.idle'))), e('div', { className: 'dbs-setrow' }, t('settings.auth'), e('b', null, info.hasToken === true ? t('settings.auth.token') : t('settings.auth.none')))) : null, info !== undefined && !ok ? e('div', { className: 'dbs-setrow' }, t('settings.reason'), e('b', null, info.reason ?? t('settings.reason.unknown'))) : null, err !== null ? e('div', { className: 'dbs-setrow' }, err) : null), e('div', { className: 'dbs-setcard' }, e('div', { className: 'dbs-setrow' }, t('settings.dataDir'), e('b', null, info?.dataDir ?? t('settings.reading'))), info?.workspaceRoot
                     ? e('div', { className: 'dbs-setrow' }, t('settings.workspaceRoot'), e('b', null, info.workspaceRoot))
-                    : null, e('div', { className: 'dbs-setrow' }, t('settings.events'), e('b', null, sse?.running === true ? t('settings.events.on', { n: sse.buffered ?? 0 }) : t('settings.events.off')), sse?.lastError ? ' · ' + String(sse.lastError) : ''), e('div', { className: 'dbs-setrow' }, t('settings.entry'), e('b', null, t('settings.entry.value')))), info?.ok === true ? e(WorkspaceCard) : null, info?.ok === true ? e(McpCard) : null);
+                    : null, e('div', { className: 'dbs-setrow' }, t('settings.events'), e('b', null, sse?.running === true ? t('settings.events.on', { n: sse.buffered ?? 0 }) : t('settings.events.off')), sse?.lastError ? ' · ' + String(sse.lastError) : ''), e('div', { className: 'dbs-setrow' }, t('settings.entry'), e('b', null, t('settings.entry.value')))), info?.ok === true ? e(ModelCard) : null, info?.ok === true ? e(WorkspaceCard) : null, info?.ok === true ? e(McpCard) : null);
             }
             // =========================================================
             // Overlay root: hosts the chat surface only.

package/lib/index.js

@@ -38,6 +38,11 @@ const DEFAULT_DATA_DIR = '~/.dsh-bots';
 /** Where the gateway lived before the 0.2.16 default rename — discovery and
  * every data-dir consumer fall back to it until the engine migrates. */
 const LEGACY_DATA_DIR = '~/.sdk-bots';
+/** Local OpenAI-compatible router the sdk-bots engine defaults to (same
+ * default as the engine bootstrap). Reachability here decides whether the
+ * model picker can offer the router's catalog or must fall back to the
+ * account's configured default model. */
+const FREEROUTE_BASE_URL = (process.env.SAND_OPENROUTER_BASE_URL ?? '').trim() || 'http://127.0.0.1:3080/freeroute/v1';
 /** Append-only diagnostics file, read when a shadow takeover misbehaves. */
 const DIAG_FILE = 'dsh-bots-diag.jsonl';
 /** Persisted read markers ("读到哪了") backing the sidebar unread badge. */
@@ -515,6 +520,47 @@ export class BotsRemote extends TypertRemoteService {
             allowPaths: request?.allowPaths,
         });
     }
+    /** Model configuration surface: the engine's account-level default model
+     * (setHostSettings.agentDefaultModel) plus freeroute availability. The
+     * engine keeps no per-bot model — this is the one runtime-effective knob. */
+    async modelConfig(request) {
+        const settings = await callGateway(this.cfg.dataDir, 'getHostSettings', {});
+        const selection = settings?.agentDefaultModel ?? null;
+        const probe = await this.probeFreerouteModels();
+        return {
+            provider: typeof settings?.inferenceProvider === 'string' ? settings.inferenceProvider : null,
+            agentDefaultModel: typeof selection?.modelId === 'string' ? selection.modelId : null,
+            freerouteReachable: probe.ok,
+            models: probe.models,
+        };
+    }
+    async probeFreerouteModels() {
+        try {
+            const res = await fetch(`${FREEROUTE_BASE_URL}/models`, { signal: AbortSignal.timeout(2500) });
+            if (res.ok === false)
+                return { ok: false, models: [] };
+            const body = await res.json();
+            const models = Array.isArray(body?.data)
+                ? body.data.map((m) => (typeof m?.id === 'string' ? m.id : '')).filter((id) => id !== '')
+                : [];
+            return { ok: true, models };
+        }
+        catch {
+            return { ok: false, models: [] };
+        }
+    }
+    /** Unset (null) = freeroute auto routing; a modelId pins the account's
+     * default model (the engine's own settings store validates the shape). */
+    async setModelConfig(request) {
+        const modelId = typeof request?.modelId === 'string' && request.modelId.trim() !== '' ? request.modelId.trim() : null;
+        const updated = await callGateway(this.cfg.dataDir, 'setHostSettings', {
+            agentDefaultModel: modelId === null
+                ? null
+                : { modelId, maxMode: true, parameters: [] },
+        });
+        const selection = updated?.agentDefaultModel ?? null;
+        return { agentDefaultModel: typeof selection?.modelId === 'string' ? selection.modelId : null };
+    }
     /**
      * Append one diagnostic record to `<dataDir>/dsh-bots-diag.jsonl`.
      *
@@ -560,7 +606,7 @@ for (const m of [
     'gatewayInfo', 'list', 'workspaces', 'sessions',
     'create', 'createGroup', 'setGroupMembers', 'update', 'remove', 'send', 'interrupt', 'readImage', 'openFile', 'transcriptTail', 'markRead', 'diag',
     'mcpServers', 'mcpTools', 'mcpAdd', 'mcpRemove', 'mcpRefresh', 'mcpExecute',
-    'workspaceList', 'workspaceGet', 'workspaceSet',
+    'workspaceList', 'workspaceGet', 'workspaceSet', 'modelConfig', 'setModelConfig',
     'eventsSince', 'sseState',
 ]) {
     markRemoteMethod(BotsRemote.prototype, m);

package/lib/types/index.d.ts

@@ -204,6 +204,23 @@ export declare class BotsRemote extends TypertRemoteService {
         workspaceRoot?: string | null;
         allowPaths?: string[];
     } | null): Promise<import("./workspace.js").AgentWorkspaceConfig>;
+    /** Model configuration surface: the engine's account-level default model
+     * (setHostSettings.agentDefaultModel) plus freeroute availability. The
+     * engine keeps no per-bot model — this is the one runtime-effective knob. */
+    modelConfig(request: unknown): Promise<{
+        provider: string | null;
+        agentDefaultModel: string | null;
+        freerouteReachable: boolean;
+        models: string[];
+    }>;
+    private probeFreerouteModels;
+    /** Unset (null) = freeroute auto routing; a modelId pins the account's
+     * default model (the engine's own settings store validates the shape). */
+    setModelConfig(request: {
+        modelId?: string | null;
+    } | null): Promise<{
+        agentDefaultModel: string | null;
+    }>;
     /**
      * Append one diagnostic record to `<dataDir>/dsh-bots-diag.jsonl`.
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-bots",
-  "version": "0.2.30",
+  "version": "0.2.31",
   "description": "Multi-bot workbench for DeepSeek Harness: bridges the sdk-bots orchestration gateway (group chats, single bots) into the dsh web shell with official-styled UI.",
   "type": "module",
   "main": "lib/index.js",