dsh-plugin-model-tuning 2.0.2 → 2.1.0

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2026 dsh-plugin contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2026 dsh-plugin contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -177,6 +177,21 @@ thinking.type=adaptive and output_config.effort","type":"invalid_request_error"}
 > `dist/api/anthropic-messages.js` 是唯一读它的地方。`tests/adaptive-thinking.test.mjs`
 > 在有 `DSH_TEST_DEPLOY_ROOT` 时直接问该部署的 pi-ai 要请求体，上游改名会在这里失败而不是在会话里变成 400。
 
+## dsh 0.2.1（alpha）适配（v2.1）
+
+- **标题 helper 换了 API。** 0.2.1-alpha 系列删掉了 `generateSessionTitleWithLlm`，改成
+  `executeSessionTitleLlm(ctx, config, request, providerId, prepared)`：提示词、输入包装、推理档位选择
+  与输出解析都交还给提供方。本插件按宿主实际导出择一：有新 API 就走新 API（提示词与解析规则复刻官方
+  `session-title-first-prompt-llm`，推理档位取路由最低档），否则回落旧 helper，0.1.7–0.2.0 不受影响。
+  2.0.x 在 0.2.1 上会因为找不到旧导出而整行激活失败（绘图与设置页一起没了）。
+- **标题注册失败不再拖垮整个插件。** `apply` 里标题路由单独兜底：失败只打一条 warn、不注册标题提供方，
+  绘图工具与设置页照常。
+- **与官方「会话标题刷新」（可选目录里的 `session-titles-bundle`）互斥。** 两者都要独占
+  `ctx.sessionTitle.register()`，后注册的一方失败——本插件这边表现为上面那条 warn。二选一。
+- **推理档位与官方 Models 页写的是同一个字段。** 0.2.1-alpha.4 起官方 Models 页可以给手工声明的 pi-ai
+  模型编辑 `reasoningEfforts`，并允许每一档发送自定义 API 值（如 `high → deep`）。本页勾选档位时保留
+  已存的值，只有新加的档位才默认用档位名；`off` 的已存值也原样保留。
+
 ## 与 DSH 版本的耦合点（0.1.7-alpha.2）
 
 - **provider 目录必须取 `llm.listConfigurableProviders()`**（返回 `LlmConfigurableProvider`

package/client.js

@@ -405,6 +405,44 @@ window.__ModuleLoader__.load({
       return { ns, ops: [{ op: "set", path: [...basePath, "models"], value: [{ id: modelId, [field]: value }] }] };
     }
 
+    /**
+     * The stored `reasoningEfforts` of one model: its `models[]` row first,
+     * then (pi-ai) its `modelOverrides` entry; undefined when neither declares it.
+     */
+    function storedReasoningEfforts(entry, nsView, modelId) {
+      const profile = at(nsView ? nsView.value : undefined, entry.settingsPath || []);
+      const models = (profile && Array.isArray(profile.models)) ? profile.models : [];
+      const row = models.find((m) => m && typeof m === "object" && m.id === modelId);
+      if (row && row.reasoningEfforts !== undefined) return row.reasoningEfforts;
+      const overrides = profile && profile.modelOverrides && typeof profile.modelOverrides === "object"
+        ? profile.modelOverrides[modelId] : undefined;
+      return overrides && typeof overrides === "object" ? overrides.reasoningEfforts : undefined;
+    }
+
+    /**
+     * The `reasoningEfforts` value for a set of checked levels.
+     *
+     * Since dsh 0.2.1-alpha.4 the official Models page also edits this field and
+     * lets each level send its own API value (a gateway spelling `high` as
+     * `deep`). Toggling a level here keeps every value already stored for the
+     * levels that stay, including a non-null `off`; only a newly added level
+     * defaults to its own name.
+     * @param levels - checked levels, in any order.
+     * @param existing - the stored value, or undefined.
+     * @returns `false` for no reasoning, else the level → wire-value dict.
+     */
+    function reasoningEffortsPayload(levels, existing) {
+      const ordered = REASONING_LEVELS.filter((level) => levels.indexOf(level) >= 0);
+      if (ordered.length === 0) return false;
+      const stored = existing && typeof existing === "object" && !Array.isArray(existing) ? existing : {};
+      const dict = { off: stored.off !== undefined ? stored.off : null };
+      for (const level of ordered) {
+        const wire = stored[level];
+        dict[level] = typeof wire === "string" && wire !== "" ? wire : level;
+      }
+      return dict;
+    }
+
     function computeCompatWriteOps(entry, nsView, modelId, compatKey, value) {
       const ns = entry.settingsNs;
       const settingsPath = entry.settingsPath || [];
@@ -1059,14 +1097,7 @@ window.__ModuleLoader__.load({
           if (kind === "reasoningLevels") {
             field = "reasoningEfforts";
             const raw = value && Array.isArray(value.levels) ? value.levels : [];
-            const levels = REASONING_LEVELS.filter((level) => raw.indexOf(level) >= 0);
-            if (levels.length === 0) {
-              payload = false;
-            } else {
-              const dict = { off: null };
-              for (const level of levels) dict[level] = level;
-              payload = dict;
-            }
+            payload = reasoningEffortsPayload(raw, storedReasoningEfforts(entry, nsView, model));
           } else if (kind === "contextWindow" || kind === "maxTokens") {
             field = kind;
             if (value != null && (typeof value !== "number" || !Number.isInteger(value) || value <= 0)) {

package/index.js

@@ -10,7 +10,8 @@
  *    patch in `cordis.patch.yml`. It is still exactly one provider:
  *    `ctx.sessionTitle.register()` throws on a second registration, so a
  *    competing generator cannot coexist. Everything except the route is
- *    delegated to the public shared policy `generateSessionTitleWithLlm` from
+ *    delegated to the public shared policy (`executeSessionTitleLlm`, or
+ *    `generateSessionTitleWithLlm` before dsh 0.2.1) from
  *    `@deepseek-ai/dsh-session-title-llm`, resolved from the RUNNING
  *    deployment (see hostRequire) — never from this package's directory, which
  *    for a linked workspace package would risk a second copy of the host's
@@ -140,7 +141,79 @@ function hostRequire() {
   return undefined
 }
 
+/** Title-service package that owns `normalizeSessionTitle`; resolved next to the helper. */
+const TITLE_SERVICE_PACKAGE = '@deepseek-ai/dsh-session-title'
+
+/**
+ * Language-aware system instruction, mirroring the shipped first-prompt
+ * provider (dsh ≥ 0.2.1 hands prompt ownership to each provider).
+ * @param budget - the live title budget.
+ * @returns the system prompt.
+ */
+export function titleSystemPrompt(budget) {
+  return [
+    'Create a concise title for an AI coding-assistant session from the supplied human messages.',
+    'Return only the title on one line, **in plain text of natural language**, with no quotes, prefix, explanation, Markdown, XML, or terminal control codes. No code is allowed.',
+    'Use the language of the messages.',
+    `Aim for about ${budget.targetWords} words in non-CJK languages or ${budget.targetCjkCharacters} CJK characters.`,
+    'If the messages give little to name, still return a short best-effort title, such as Greeting, instead of explaining.',
+  ].join('\n')
+}
+
+/** Asterisk emphasis wrapping a whole line, such as `**Title**`. */
+const EMPHASIS_WRAPPER = /^(?<marker>\*{1,3})(?<inner>\S(?:.*\S)?)\k<marker>$/u
+
+/**
+ * Take the title from model output: the first non-empty line, without
+ * asterisk emphasis wrapping that whole line (same rule as the shipped provider).
+ * @param text - the joined text blocks.
+ * @returns the raw title line.
+ */
+export function titleFromOutput(text) {
+  const line = text.split(/\r?\n/u).map(item => item.trim()).find(item => item.length > 0) ?? ''
+  const groups = EMPHASIS_WRAPPER.exec(line)?.groups
+  const marker = groups?.marker
+  const inner = groups?.inner
+  return marker === undefined || inner === undefined || inner.includes(marker) ? line : inner
+}
+
+/**
+ * Adapt the prepared-request API (`executeSessionTitleLlm`, dsh ≥ 0.2.1) to the
+ * one-call shape this plugin drives.
+ * @param execute - the host's `executeSessionTitleLlm`.
+ * @param normalize - the host's `normalizeSessionTitle`.
+ * @returns `(ctx, budget, request, selected, providerId) => { title, messageSeqs, model }`.
+ */
+export function preparedTitleGenerator(execute, normalize) {
+  return async (ctx, budget, request, selected, providerId) => {
+    const config = { maxInputBytes: budget.maxInputBytes, maxOutputTokens: budget.maxOutputTokens, timeoutMs: budget.timeoutMs }
+    const messageSeqs = selected.map(message => message.seq)
+    const response = await execute(ctx, config, request, providerId, {
+      system: titleSystemPrompt(budget),
+      input: `Generate the session title from this JSON array of human messages:\n${JSON.stringify(selected)}`,
+      messageSeqs,
+      // A title needs no deliberation: take the route's least effort.
+      selectReasoningEffort: model => model.reasoning?.efforts?.[0]?.id,
+    })
+    if (response.finish.kind === 'tool-calls' || response.blocks.some(block => block.type === 'tool-call')) {
+      throw new Error('session-title-llm: title output must contain text only')
+    }
+    if (response.finish.kind === 'max-tokens') {
+      throw new Error('session-title-llm: title output reached maxOutputTokens')
+    }
+    const text = response.blocks.filter(block => block.type === 'text').map(block => block.text).join(' ')
+    const title = normalize(titleFromOutput(text), Number.MAX_SAFE_INTEGER)
+    if (title.length === 0) throw new Error('session-title-llm: title model produced no text')
+    return { title, messageSeqs, model: response.model }
+  }
+}
+
 let helperPromise
+/**
+ * Load a title generator from the running deployment: the prepared-request
+ * API when the host has it (≥ 0.2.1), else the one-call
+ * `generateSessionTitleWithLlm` (0.1.7 – 0.2.0).
+ */
 function loadTitleHelper() {
   helperPromise ??= (async () => {
     const require = hostRequire()
@@ -149,12 +222,17 @@ function loadTitleHelper() {
         `model-tuning: 无法从宿主解析 ${HELPER_PACKAGE}；本插件必须与提供该包的部署一起运行。`,
       )
     }
-    const loaded = await import(pathToFileURL(require.resolve(HELPER_PACKAGE)).href)
-    const generate = loaded.generateSessionTitleWithLlm
-    if (typeof generate !== 'function') {
-      throw new Error(`model-tuning: ${HELPER_PACKAGE} 未导出 generateSessionTitleWithLlm`)
+    const helperPath = require.resolve(HELPER_PACKAGE)
+    const loaded = await import(pathToFileURL(helperPath).href)
+    if (typeof loaded.executeSessionTitleLlm === 'function') {
+      const service = await import(pathToFileURL(createRequire(helperPath).resolve(TITLE_SERVICE_PACKAGE)).href)
+      if (typeof service.normalizeSessionTitle !== 'function') {
+        throw new Error(`model-tuning: ${TITLE_SERVICE_PACKAGE} 未导出 normalizeSessionTitle`)
+      }
+      return preparedTitleGenerator(loaded.executeSessionTitleLlm, service.normalizeSessionTitle)
     }
-    return generate
+    if (typeof loaded.generateSessionTitleWithLlm === 'function') return loaded.generateSessionTitleWithLlm
+    throw new Error(`model-tuning: ${HELPER_PACKAGE} 既没有 executeSessionTitleLlm 也没有 generateSessionTitleWithLlm`)
   })()
   return helperPromise
 }
@@ -189,7 +267,7 @@ export function titleBudgetOf(config) {
  * @param config - the live Config (route and budget are re-read per generation).
  */
 export async function registerTitleProvider(ctx, config) {
-  const generateSessionTitleWithLlm = await loadTitleHelper()
+  const generateTitle = await loadTitleHelper()
   validateTitleModel({ titleMode: config.titleMode.get(), titleProvider: config.titleProvider.get(), titleModel: config.titleModel.get() })
   titleBudgetOf(config)
   ctx.sessionTitle.register({
@@ -200,7 +278,7 @@ export async function registerTitleProvider(ctx, config) {
         titleMode: config.titleMode.get(), titleProvider: config.titleProvider.get(), titleModel: config.titleModel.get(),
       }, request)
       const selected = request.messages.slice(0, 1)
-      return await generateSessionTitleWithLlm(ctx, titleBudgetOf(config), { ...request, route }, selected, TITLE_PROVIDER_ID)
+      return await generateTitle(ctx, titleBudgetOf(config), { ...request, route }, selected, TITLE_PROVIDER_ID)
     },
   })
 }
@@ -361,6 +439,13 @@ export function registerImageTools(ctx, config) {
  * @param config - the unified Config described above.
  */
 export async function apply(ctx, config) {
-  await registerTitleProvider(ctx, config)
+  // The title route leans on a host helper whose API has changed between
+  // releases. If it breaks again, lose only title routing — never the image
+  // tools and settings page that ride on the same row.
+  try {
+    await registerTitleProvider(ctx, config)
+  } catch (error) {
+    ctx.logger?.warn?.(`model-tuning: 标题路由未启用（${error instanceof Error ? error.message : String(error)}）；绘图与设置页照常工作`)
+  }
   registerImageTools(ctx, config)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-model-tuning",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "license": "MIT",
   "keywords": ["dsh-plugin", "deepseek-harness", "dsh", "model", "settings", "reasoning", "context", "session-title", "image-generation"],
   "publishConfig": { "registry": "https://registry.npmjs.org" },