dsh-voice-say 0.6.0 → 0.6.1

package/client.js

@@ -465,6 +465,7 @@ window.__ModuleLoader__.load({
                     directRes.elapsedMs ? `· ${(directRes.elapsedMs / 1000).toFixed(1)} 秒` : '',
                     directRes.cached ? '· 命中缓存' : '',
                     directRes.transport === 'dsh' ? '· 在 DeepSeek 窗口里想的' : '',
+                    directRes.transport === 'api-fallback' ? '· 会话没走通，已退回直连' : '',
                   ].filter(Boolean).join(' ')),
                 directRes.sessionId ? h('div', { 'data-vs-sub': '', 'data-vs-mono': '' }, `会话：${directRes.sessionId}`) : null,
                 directRes.notes ? h('div', { 'data-vs-sub': '' }, `导演说明：${directRes.notes}`) : null,

package/index.js

@@ -32,7 +32,7 @@ import { direct as directText, gatherContext, probeDirector, clearCache as clear
 export const name = 'dsh-voice-say'
 export const inject = ['webServer', 'tools']
 
-const PLUGIN_VERSION = '0.6.0'
+const PLUGIN_VERSION = '0.6.1'
 const DEFAULT_INSTRUCTIONS = '说话自然一点，带点傲娇和不耐烦，别太热情。'
 const DEFAULT_PREVIEW_TEXT = '哼，才不是特意来跟你说话的呢，笨蛋。'
 const MAX_BODY = 32 * 1024 * 1024

package/lib/director.mjs

@@ -453,10 +453,20 @@ async function askModel(o, key, messages, extraNote, ctx = {}) {
   const full = extraNote ? [...messages, { role: 'user', content: extraNote }] : messages
   if (o.transport === 'dsh') {
     const dsh = o.dsh
-    if (!dsh.ready) throw new Error(dsh.baseUrl ? 'DSH 会话通道不可用（读不到会话密钥）' : '找不到 DSH 地址（桥接没记下 baseUrl，可在设置里填 dshBaseUrl）')
-    const r = await askSession(dsh, { text: messagesToText(full), hooks: ctx.hooks })
-    if (!r.ok) throw new Error(r.error || 'DSH 会话没回话')
-    return { content: r.text, elapsedMs: r.elapsedMs, transport: 'dsh', sessionId: r.sessionId }
+    const why = !dsh.baseUrl
+      ? '找不到 DSH 地址（桥接没记下 baseUrl，可在设置里填 dshBaseUrl）'
+      : (!dsh.hasSecret ? '读不到 DSH 会话密钥（~/.dsh/.credentials.yaml）' : '')
+    if (!why) {
+      const r = await askSession(dsh, { text: messagesToText(full), hooks: ctx.hooks })
+      if (r.ok) return { content: r.text, elapsedMs: r.elapsedMs, transport: 'dsh', sessionId: r.sessionId }
+      if (!key) throw new Error(r.error || 'DSH 会话没回话')
+      // 会话这条走不通、但手里有 key —— 悄悄退到直连，别让人听不到声音
+      const out = await callModel(o, key, full)
+      return { ...out, transport: 'api-fallback', sessionId: '', fallbackReason: r.error || '' }
+    }
+    if (!key) throw new Error(why)
+    const out = await callModel(o, key, full)
+    return { ...out, transport: 'api-fallback', sessionId: '', fallbackReason: why }
   }
   const out = await callModel(o, key, full)
   return { ...out, transport: 'api', sessionId: '' }
@@ -527,6 +537,7 @@ export async function direct(cfg = {}, input = {}) {
     let parsed = parseReply(out.content)
     result.elapsedMs = out.elapsedMs
     if (out.transport) result.transport = out.transport
+    if (out.fallbackReason) result.fallbackReason = out.fallbackReason
     if (out.sessionId) {
       result.sessionId = out.sessionId
       o.dsh.sessionId = out.sessionId // 重试沿用同一个窗口，别又开一个

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-voice-say",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "type": "module",
   "description": "dsh-voice-say：把一句话合成语音。两条通道（本地 Breeze TTS 2 / 云端 apiKey+voiceId）共用 instructions + guidanceScale；18 个风格可叠加；合成前由「读音导演」重排标点——默认在 DeepSeek 窗口里的专用会话里想，按人设、当下情绪与对话情节断句；支持上传本地音色、自定义参考音频与试听片段。QQ 桥接会先问插件，群里发出去的语音与设置页试听同源同风格。",
   "license": "MIT",