@objectivex666/dsh-settings-search 1.13.0 → 1.13.1

package/README.en.md

@@ -17,7 +17,7 @@
 - 🔍 **Live search** — a search box in the settings panel filters every registered settings page (`settings.section`) and general item (`settings.general.item`) as you type.
 - 🧩 **Three search styles** — choose the classic sidebar, window top bar, or popup search page. The choice is saved in the current browser.
 - ⌨️ **Search shortcut (v1.10.0)** — focus the search box with `Ctrl+F` or `⌘F` inside the settings panel. You can enable or disable it from the "Settings Search" page; disabling keeps the browser's default find behavior.
-- 🤝 **Import DSH model config (v1.9.0)** — import the Base URL and model name from DSH's current default model in the AI config section. For credential safety, the API key is never imported.
+- 🤝 **Import DSH model config (v1.9.0)** — import the Base URL and model name from DSH's current default model in the AI config section. When that default is a built-in DeepSeek route (whose settings carry no Base URL), the import uses DeepSeek's own endpoint, `https://api.deepseek.com/anthropic`. For credential safety, the API key is never imported.
 - 🎯 **First-run onboarding (v1.9.0)** — a welcome modal appears only the first time the settings panel opens after installation. It introduces the four search styles, pinyin/intent/AI hints, click-to-jump, and auto-indexing; there are no "Don't show again" or manual reopen buttons.
 - 📂 **In-page option search (v1.2.0)** — search beyond pages and reach the specific options inside them: Plugins-page tabs (`settings.plugins.tab`), the pre-0.2 plugin-card seats (`settings.plugin.item` / `web-ui.plugin.item`, both gone in 0.2), general rows, and more, each shown with a "page › option" breadcrumb.
 - 🔤 **Pinyin association search (v1.5.0)** — type initials (`sz`) or full pinyin (`shezhi`) to surface Chinese settings items; navigate with `↑`/`↓`, confirm with `Enter`, dismiss with `Esc`, and matched text is highlighted.
@@ -128,7 +128,8 @@ npm test   # structural checks and mocked Ollama / OpenAI / Anthropic regression
 Issues are welcome — please report bugs, suggest features, or ask questions in
 [GitHub Issues](https://github.com/objectivex666/dsh-settings-search/issues).
 Pull requests are equally welcome via
-[GitHub Pull Requests](https://github.com/objectivex666/dsh-settings-search/pulls).
+[GitHub Pull Requests](https://github.com/objectivex666/dsh-settings-search/pulls) —
+please read [CONTRIBUTING.en.md](./CONTRIBUTING.en.md) first (layout, conventions, tests, and the release flow).
 
 When submitting an issue, please include as much of the following as possible so we can locate and reproduce it:
 

package/README.md

@@ -17,7 +17,7 @@
 - 🔍 **实时搜索**：在设置面板中嵌入搜索框，输入关键词立即过滤所有已注册的设置页（`settings.section`）与通用设置项（`settings.general.item`）。
 - 🧩 **三种搜索样式**：可选择经典侧栏、窗口顶栏或弹出搜索页；选择会保存在当前浏览器。
 - ⌨️ **搜索快捷键（v1.10.0）**：在设置面板内按 `Ctrl+F` 或 `⌘F` 聚焦搜索框；可在「设置搜索」页启用或关闭，关闭后保留浏览器默认查找。
-- 🤝 **导入 DSH 模型配置（v1.9.0）**：在 AI 配置区一键读取 DSH 当前默认模型的 Base URL 与模型名；为避免凭据扩散，导入始终不包含 API Key。
+- 🤝 **导入 DSH 模型配置（v1.9.0）**：在 AI 配置区一键读取 DSH 当前默认模型的 Base URL 与模型名；默认模型是 DSH 内置的 DeepSeek 路由时（设置里不含 Base URL），导入 DeepSeek 的接口地址 `https://api.deepseek.com/anthropic`。为避免凭据扩散，导入始终不包含 API Key。
 - 🎯 **新用户引导（v1.9.0）**：仅在安装后首次打开设置面板时弹出引导弹窗，介绍四种搜索样式、拼音/意图/AI 联想、点击即达与自动导入索引等核心功能；不再提供“不再显示”和手动重开按钮。
 - 📂 **页内选项搜索（v1.2.0）**：不只搜页面，还能直达每个设置页内部的具体选项——插件页的标签页（`settings.plugins.tab`）、旧版的插件卡片座位（`settings.plugin.item` / `web-ui.plugin.item`，0.2 已移除）、通用设置行等，结果以「页面 › 选项」面包屑展示。
 - 🔤 **拼音联想搜索（v1.5.0）**：输入拼音首字母（如 `sz`）或全拼（如 `shezhi`）即可联想中文设置项；支持 `↑`/`↓` 选择、`Enter` 跳转、`Esc` 关闭，命中的文字自动高亮。
@@ -127,7 +127,8 @@ npm test   # 结构检查及 Ollama / OpenAI / Anthropic 模拟接口回归测
 
 欢迎提交 **Issue** 反馈 Bug、功能建议或使用疑问：
 [GitHub Issues](https://github.com/objectivex666/dsh-settings-search/issues)，
-也欢迎直接发起 [Pull Request](https://github.com/objectivex666/dsh-settings-search/pulls)。
+也欢迎直接发起 [Pull Request](https://github.com/objectivex666/dsh-settings-search/pulls)——
+动手前请先读一遍 [贡献指南](./CONTRIBUTING.md)（结构、代码约定、测试与发布流程）。
 
 提交 Issue 时，请尽量完整地提供以下信息，便于定位与复现：
 

package/lib/client.js

@@ -30,7 +30,7 @@ window.__ModuleLoader__.load({
 
     const NS = 'settings-search-v5'
     /** Single source of truth is package.json — scripts/check.mjs asserts this matches. */
-    const PKG_VERSION = '1.13.0'
+    const PKG_VERSION = '1.13.1'
     const NPM_NAME = '@objectivex666/dsh-settings-search'
     const REPO_URL = 'https://github.com/objectivex666/dsh-settings-search'
     const ISSUES_URL = 'https://github.com/objectivex666/dsh-settings-search/issues/new/choose'
@@ -107,6 +107,7 @@ window.__ModuleLoader__.load({
       aiDshImportOk: '已导入 Base URL 与模型名；API Key 未改动 ✓',
       aiDshImportFail: '导入失败：{reason}',
       aiDshImportEmpty: '未找到 DSH 当前默认模型配置',
+      aiDshImportBuiltin: '已导入 DeepSeek 内置地址与模型名；API Key 未改动，插件内使用需填写自己的 DeepSeek API Key',
       aiDshImportApi: '当前 DSH 版本未提供模型配置接口（remote.settings）',
       aiDshImportNoBaseUrl: '默认模型「{model}」在 DSH 设置中没有可导入的 Base URL',
       aiConfigSave: '保存配置',
@@ -253,6 +254,7 @@ window.__ModuleLoader__.load({
       aiDshImportOk: 'Imported Base URL and model; API key unchanged ✓',
       aiDshImportFail: 'Import failed: {reason}',
       aiDshImportEmpty: 'No current DSH default model config found',
+      aiDshImportBuiltin: 'Imported the built-in DeepSeek address and model; the API key is unchanged, so fill in your own DeepSeek key to use it here',
       aiDshImportApi: 'This DSH build exposes no model config API (remote.settings)',
       aiDshImportNoBaseUrl: 'The default model "{model}" has no Base URL in DSH settings to import',
       aiConfigSave: 'Save config',
@@ -1922,15 +1924,36 @@ window.__ModuleLoader__.load({
       return null
     }
 
+    /** DSH's built-in DeepSeek routes and the namespaces that own them. */
+    const DEEPSEEK_PROVIDERS = new Set(['deepseek-official', 'deepseek-account'])
+    const DEEPSEEK_SETTINGS = new Set(['llm-deepseek', 'llm-deepseek-api-key', 'llm-deepseek-account'])
+    /** The endpoint the shipped DeepSeek adapter falls back to (`PUBLIC_BASE_URL`). */
+    const DEEPSEEK_PUBLIC_BASE_URL = 'https://api.deepseek.com/anthropic'
+    /**
+     * Whether one provider route is a built-in DeepSeek one.
+     * @param providerId - the route's provider id.
+     * @param settingsNs - the settings namespace the route reads, when known.
+     * @returns true for the shipped DeepSeek routes.
+     */
+    const isBuiltInDeepseekRoute = (providerId, settingsNs) =>
+      DEEPSEEK_PROVIDERS.has(String(providerId ?? '')) || DEEPSEEK_SETTINGS.has(String(settingsNs ?? ''))
+
     /**
      * Read the model fields of DSH's current default model; credentials are
      * never requested. `agent-default-model` names the provider and the model,
      * the provider's own settings namespace carries the Base URL, and the model
      * profile inside that namespace may override the wire protocol.
      *
+     * A built-in DeepSeek route keeps its endpoint in the adapter rather than in
+     * settings, so nothing is importable from the namespace there. Those routes
+     * fall back to the endpoint DSH itself calls — the adapter resolves
+     * `config.baseURL ?? $DEEPSEEK_BASE_URL ?? https://api.deepseek.com/anthropic`,
+     * and only the last of those is visible to a browser — so importing the
+     * default DeepSeek model still yields a usable address.
+     *
      * @param ctx - the client plugin context.
      * @param t - translate function for the failure messages.
-     * @returns `{ provider, baseUrl, model }`, or null when DSH has no default model.
+     * @returns `{ provider, baseUrl, model, builtin? }`, or null when DSH has no default model.
      * @throws when this build exposes no settings API, or the default model has no Base URL.
      */
     const readDshModelConfig = async (ctx, t) => {
@@ -1951,8 +1974,19 @@ window.__ModuleLoader__.load({
         : modelNamespace?.value?.providers?.[providerId] ?? {}
       const configuredModels = Array.isArray(providerProfile.models) ? providerProfile.models : []
       const modelProfile = configuredModels.find((entry) => entry?.id === modelId) ?? {}
-      const protocol = String(modelProfile.api ?? providerProfile.api ?? '').trim()
-      const baseUrl = String(providerProfile.baseURL ?? '').trim()
+      // The built-in DeepSeek routes fix their protocol in the adapter: whatever
+      // address they use, they speak Messages.
+      const deepseekRoute = isBuiltInDeepseekRoute(providerId, providerRow?.settingsNs)
+      let protocol = String(modelProfile.api ?? providerProfile.api ?? '').trim()
+      let baseUrl = String(providerProfile.baseURL ?? '').trim()
+      if (deepseekRoute && protocol === '') protocol = 'anthropic-messages'
+      let builtin = false
+      if (baseUrl === '' && deepseekRoute) {
+        // Nothing is importable from settings, so mirror the endpoint the
+        // adapter itself falls back to (`PUBLIC_BASE_URL`).
+        baseUrl = DEEPSEEK_PUBLIC_BASE_URL
+        builtin = true
+      }
       if (!baseUrl) throw new Error(t('aiDshImportNoBaseUrl').replace('{model}', modelId))
       return {
         provider: providerId.toLowerCase() === 'ollama' || protocol === 'ollama'
@@ -1960,6 +1994,7 @@ window.__ModuleLoader__.load({
           : protocol === 'anthropic-messages' ? 'anthropic' : 'openai',
         baseUrl,
         model: modelId,
+        ...builtin ? { builtin: true } : {},
       }
     }
 
@@ -2900,15 +2935,18 @@ window.__ModuleLoader__.load({
           try {
             const imported = await readDshModelConfig(ctx, t)
             if (!imported) throw new Error(t('aiDshImportEmpty'))
+            const { builtin, ...config } = imported
             providerDrafts.current[provider] = { baseUrl, model }
-            setAiConfig({ ...imported, apiKey })
-            setProvider(imported.provider)
-            setBaseUrl(imported.baseUrl)
-            setModel(imported.model)
+            setAiConfig({ ...config, apiKey })
+            setProvider(config.provider)
+            setBaseUrl(config.baseUrl)
+            setModel(config.model)
             resetModelList()
             setDshImportState('ok')
-            setDshImportMsg(t('aiDshImportOk'))
-            log('info', '导入 DSH 模型配置', { provider: imported.provider, model: imported.model })
+            // A built-in DeepSeek route has no stored address and no API key of
+            // its own, so the note says where the address came from.
+            setDshImportMsg(builtin === true ? t('aiDshImportBuiltin') : t('aiDshImportOk'))
+            log('info', '导入 DSH 模型配置', { provider: config.provider, model: config.model, builtin: builtin === true })
           } catch (error) {
             const reason = String(error?.message ?? error).slice(0, 160)
             setDshImportState('fail')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@objectivex666/dsh-settings-search",
-  "version": "1.13.0",
+  "version": "1.13.1",
   "description": "DSH settings panel search plugin – instantly filter setting sections and general items with navigation guidance. Installable via `dsh plugin add`.",
   "keywords": [
     "dsh",

package/scripts/ai.test.mjs

@@ -497,26 +497,64 @@ test('a DSH build with no settings API fails with a readable reason instead of a
   await assert.rejects(api.readDshModelConfig({ get: () => undefined }, (key) => key), { message: 'aiDshImportApi' })
 })
 
-test('a default model without an importable Base URL names the model, and no default model imports nothing', async () => {
-  const { api } = load()
-  const account = {
-    get: (name) => name === 'remote.settings'
+// --- DSH default-model import: the built-in DeepSeek route ---
+
+/** A ctx whose default model is one route, with whatever namespaces it reads. */
+const dshDefaultModel = (provider, model, { settingsNs, namespaces = [] } = {}) => ({
+  get: (name) => name === 'remote.settings'
+    ? {
+        describe: async () => describeReply([
+          { ns: 'agent-default-model', value: { provider, model } },
+          ...namespaces,
+        ]),
+      }
+    : name === 'remote.llm'
       ? {
-          describe: async () => describeReply([
-            { ns: 'agent-default-model', value: { provider: 'deepseek-account', model: 'deepseek-flash' } },
-          ]),
+          listConfigurableProviders: async () => ({
+            ok: true,
+            value: [{ provider, settingsNs, settingsPath: [] }],
+          }),
         }
-      : name === 'remote.llm'
-        ? {
-            listConfigurableProviders: async () => ({
-              ok: true,
-              value: [{ provider: 'deepseek-account', settingsNs: 'llm-deepseek-account', settingsPath: [] }],
-            }),
-          }
-        : undefined,
+      : undefined,
+})
+
+test('a built-in DeepSeek default model imports the adapter\u2019s own endpoint', async () => {
+  const { api } = load()
+  for (const [provider, settingsNs] of [['deepseek-account', 'llm-deepseek-account'], ['deepseek-official', 'llm-deepseek']]) {
+    const ctx = dshDefaultModel(provider, 'deepseek-flash', { settingsNs })
+    assert.deepEqual(plain(await api.readDshModelConfig(ctx, (key) => key)), {
+      provider: 'anthropic',
+      baseUrl: 'https://api.deepseek.com/anthropic',
+      model: 'deepseek-flash',
+      builtin: true,
+    }, `${provider} must fall back to the DeepSeek endpoint`)
   }
-  await assert.rejects(api.readDshModelConfig(account, (key) => key), { message: 'aiDshImportNoBaseUrl' })
+})
 
+test('a configured DeepSeek base URL wins over the built-in fallback', async () => {
+  const { api } = load()
+  const ctx = dshDefaultModel('deepseek-official', 'deepseek-chat', {
+    settingsNs: 'llm-deepseek',
+    namespaces: [{ ns: 'llm-deepseek', value: { baseURL: 'https://proxy.test/anthropic' } }],
+  })
+  assert.deepEqual(plain(await api.readDshModelConfig(ctx, (key) => key)), {
+    provider: 'anthropic',
+    baseUrl: 'https://proxy.test/anthropic',
+    model: 'deepseek-chat',
+  })
+})
+
+test('a third-party route without an importable Base URL still names the model', async () => {
+  const { api } = load()
+  const ctx = dshDefaultModel('acme-gateway', 'acme-large', {
+    settingsNs: 'llm-pi-ai',
+    namespaces: [{ ns: 'llm-pi-ai', value: { providers: { 'acme-gateway': { models: [{ id: 'acme-large' }] } } } }],
+  })
+  await assert.rejects(api.readDshModelConfig(ctx, (key) => key), { message: 'aiDshImportNoBaseUrl' })
+})
+
+test('no default model imports nothing', async () => {
+  const { api } = load()
   const idle = {
     get: (name) => name === 'remote.settings'
       ? { describe: async () => describeReply([{ ns: 'agent-default-model', value: {} }]) }
@@ -584,7 +622,7 @@ const logRouteCalls = (calls) => calls.filter((call) => String(call.url).include
 
 test('log entries are batched to the host log route as one formatted line each', () => {
   const { api, calls } = load()
-  api.log('info', '应用装载', { version: '1.13.0' })
+  api.log('info', '应用装载', { version: '1.13.1' })
   api.log('error', '导入失败')
   api.flushLogs()
   const [call] = logRouteCalls(calls)
@@ -593,7 +631,7 @@ test('log entries are batched to the host log route as one formatted line each',
   assert.deepEqual(plain(call.headers), { 'content-type': 'application/json' })
   assert.equal(call.body.action, 'append')
   assert.equal(call.body.lines.length, 2)
-  assert.match(call.body.lines[0], /^\d{4}-\d{2}-\d{2}T[\d:.]+Z \[info\] \[[0-9a-f]{8}:1\] 应用装载 \{"version":"1\.13\.0"\}$/)
+  assert.match(call.body.lines[0], /^\d{4}-\d{2}-\d{2}T[\d:.]+Z \[info\] \[[0-9a-f]{8}:1\] 应用装载 \{"version":"1\.13\.1"\}$/)
   assert.match(call.body.lines[1], /\[error\] \[[0-9a-f]{8}:2\] 导入失败$/)
 })