dsh-audiogen 0.4.5 → 0.4.6

package/lib/index.js

@@ -892,22 +892,33 @@ async function enhancePromptText(deps, prompt, mode) {
 	if (provider === "" || model === "") throw new AudioGenError("未找到 Agent 默认模型（agent-default-model）：请先在「设置 → 模型」中配置默认模型", "no-default-model");
 	const runtime = deps.llm?.();
 	if (runtime === void 0 || runtime.stream === void 0) throw new AudioGenError("宿主 LLM 服务不可用（ctx.llm 未注册）", "llm-unavailable");
+	const controller = new AbortController();
+	const timer = setTimeout(() => controller.abort(new DOMException("The operation timed out.", "TimeoutError")), 3e4);
+	timer.unref?.();
 	let output = "";
-	for await (const chunk of runtime.stream({
-		provider,
-		model,
-		messages: [{
-			role: "user",
-			content: text
-		}],
-		system: instructionsFor(mode),
-		temperature: .7,
-		maxTokens: 1200
-	})) {
-		const record = chunk;
-		if (record.type === "text-delta" && typeof record.text === "string") output += record.text;
+	try {
+		for await (const chunk of runtime.stream({
+			provider,
+			model,
+			messages: [{
+				role: "user",
+				content: text
+			}],
+			system: instructionsFor(mode),
+			temperature: .7,
+			maxTokens: 1200,
+			signal: controller.signal
+		})) {
+			const record = chunk;
+			if (record.type === "text-delta" && typeof record.text === "string") output += record.text;
+			else if (record.type === "block-end" && record.block !== void 0 && record.block.type === "text" && typeof record.block.text === "string") output += record.block.text;
+		}
+	} finally {
+		clearTimeout(timer);
 	}
-	return stripFences(output.trim());
+	const result = stripFences(output.trim());
+	if (result === "") throw new AudioGenError("模型未返回增强内容：请检查「设置 → 模型」的默认模型是否可用（或稍后重试）", "enhance-empty-result");
+	return result;
 }
 /** 去掉模型可能包裹的 ``` 代码围栏。 */
 function stripFences(value) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-audiogen",
   "description": "AI audio generation plugin for the dsh web GUI: multi-vendor TTS/music/sound-effect channels (OpenAI-compatible, ElevenLabs, MiniMax, Stability AI and custom), per-channel model/voice catalogs, Agent tool and a sidebar AI 音频 panel.",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "type": "module",
   "main": "lib/index.js",
   "exports": {

package/src/client/audio-panel.module.css

@@ -97,9 +97,9 @@
   flex-direction: column;
   gap: 11px;
   flex: none;
-  width: 300px;
-  min-width: 260px;
-  max-width: 340px;
+  width: 380px;
+  min-width: 320px;
+  max-width: 440px;
   min-height: 0;
   overflow-y: auto;
   padding: 2px;
@@ -260,6 +260,7 @@
 .resultCol {
   flex: 1;
   min-width: 0;
+  max-width: 760px;
   display: flex;
   flex-direction: column;
   gap: 10px;
@@ -1314,3 +1315,9 @@
   display: flex;
   gap: 6px;
 }
+
+.enhanceActionsRow {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: -4px;
+}

package/src/client/studio-view.tsx

@@ -527,6 +527,8 @@ export function StudioView(props: {
     }
     const bool = (key: string): boolean | undefined => typeof params[key] === 'boolean' ? params[key] as boolean : undefined
     setMode(modeValue)
+    const promptValue = str('prompt')
+    if (promptValue !== undefined) setPrompt(promptValue)
     const modelValue = str('model') ?? singleModel
     if (modelValue !== '') setModel(modelValue)
     if (compareModelsRestore !== undefined && compareModelsRestore.length > 0) {
@@ -591,11 +593,11 @@ export function StudioView(props: {
     setError(null)
     try {
       const result = await api.enhancePrompt(prompt.trim(), mode)
-      if (result.ok !== true || result.enhanced === undefined) {
+      if (result.ok !== true || result.enhanced === undefined || result.enhanced.trim() === '') {
         setError(result.message ?? '增强失败，请稍后重试')
         return
       }
-      setEnhancePreview(result.enhanced)
+      setEnhancePreview(result.enhanced.trim())
     } catch (err) {
       setError(err instanceof Error ? err.message : String(err))
     } finally {
@@ -895,16 +897,16 @@ export function StudioView(props: {
           ))}
         </div>
 
-        <div className={css.formSectionRow}>
-          <p className={css.formSection}>输入</p>
-          <button type="button" className={css.ghostButton} disabled={enhancing} onClick={() => void runEnhance()}>
-            {enhancing ? '增强中…' : '✨ 增强提示词'}
-          </button>
-        </div>
+        <p className={css.formSection}>输入</p>
         <label className={css.label}>
           <span>{mode === 'voice_design' ? '音色描述' : mode === 'tts' ? '文本' : '提示词'}</span>
           <textarea className={css.textarea} value={prompt} onChange={event => setPrompt(event.target.value)} placeholder={tt('prompt.placeholder')} />
         </label>
+        <div className={css.enhanceActionsRow}>
+          <button type="button" className={css.ghostButton} disabled={enhancing} onClick={() => void runEnhance()}>
+            {enhancing ? '增强中…' : '✨ 增强提示词'}
+          </button>
+        </div>
         {enhancePreview !== null ? (
           <div className={css.enhanceCard}>
             <div className={css.enhanceCardHead}>

package/src/prompt-enhance.ts

@@ -49,19 +49,36 @@ export async function enhancePromptText(deps: PromptEnhanceDeps, prompt: string,
   if (runtime === undefined || runtime.stream === undefined) {
     throw new AudioGenError('宿主 LLM 服务不可用（ctx.llm 未注册）', 'llm-unavailable')
   }
+  const controller = new AbortController()
+  const timer = setTimeout(() => controller.abort(new DOMException('The operation timed out.', 'TimeoutError')), 30_000)
+  timer.unref?.()
   let output = ''
-  for await (const chunk of runtime.stream({
-    provider,
-    model,
-    messages: [{ role: 'user', content: text }],
-    system: instructionsFor(mode),
-    temperature: 0.7,
-    maxTokens: 1200,
-  })) {
-    const record = chunk as { type?: string; text?: string }
-    if (record.type === 'text-delta' && typeof record.text === 'string') output += record.text
+  try {
+    for await (const chunk of runtime.stream({
+      provider,
+      model,
+      messages: [{ role: 'user', content: text }],
+      system: instructionsFor(mode),
+      temperature: 0.7,
+      maxTokens: 1200,
+      signal: controller.signal,
+    })) {
+      const record = chunk as { type?: string; text?: string; block?: { type?: string; text?: string } }
+      if (record.type === 'text-delta' && typeof record.text === 'string') {
+        output += record.text
+      } else if (record.type === 'block-end' && record.block !== undefined
+        && record.block.type === 'text' && typeof record.block.text === 'string') {
+        output += record.block.text
+      }
+    }
+  } finally {
+    clearTimeout(timer)
   }
-  return stripFences(output.trim())
+  const result = stripFences(output.trim())
+  if (result === '') {
+    throw new AudioGenError('模型未返回增强内容：请检查「设置 → 模型」的默认模型是否可用（或稍后重试）', 'enhance-empty-result')
+  }
+  return result
 }
 
 /** 去掉模型可能包裹的 ``` 代码围栏。 */

package/src/protocol.ts

@@ -8,7 +8,7 @@
 export const AUDIOGEN_SETTINGS_NAMESPACE = 'dsh-audiogen'
 
 /** Published package version shared by the host updater and the client UI. */
-export const PLUGIN_VERSION = '0.4.5'
+export const PLUGIN_VERSION = '0.4.6'
 
 /** Same-origin route family (loopback-only, mirroring dsh-imagegen). */
 export const SETTINGS_API = {