koishi-plugin-p-draw 1.3.2 → 1.3.5

package/index.js

@@ -139,10 +139,10 @@ exports.Config = Schema.object({
 // ------------------------------------------------------------------
 const {
   normalizeBaseUrl, escapeRe, parseGenerationSize, parseBatchCount, parseSeed, parseDenoise,
-  stripRawPrefix, parseNameTags, parsePresetList, mergeTagText,
+  stripRawPrefix, splitPositiveNegativePrompt, parseNameTags, parsePresetList, mergeTagText,
 } = require('./lib/parse')
 const {
-  splitTags, canonicalTagText, joinPromptParts, cleanContentTags, appendInlineProtectedTags,
+  splitTags, canonicalTagText, joinPromptParts, mergeNegativePrompts, cleanContentTags, appendInlineProtectedTags,
   NO_ARTIST_RE, NO_STYLE_RE,
 } = require('./lib/tags')
 const {
@@ -488,17 +488,27 @@ exports.apply = async function apply(ctx, cfg) {
     }
   }
 
-  // 生成图片使用合并转发；不附原消息引用。发送失败时回退普通图片消息。
+  // 生成图片使用合并转发；每张图后紧跟实际使用的最终提示词，不附原消息引用。
   async function sendImagesAsForward(session, outputs) {
-    const imageElements = await Promise.all(outputs.map(async (src) => {
+    const nodes = []
+    const fallback = []
+    for (const output of outputs) {
+      const src = typeof output === 'string' ? output : output.src
+      const prompt = typeof output === 'string' ? '' : String(output.prompt || '')
       const materialized = await materializeImageSource(src)
-      return Buffer.isBuffer(materialized) ? h.image(materialized) : h.image(src)
-    }))
+      const image = Buffer.isBuffer(materialized) ? h.image(materialized) : h.image(src)
+      nodes.push(h('message', image))
+      fallback.push(image)
+      if (prompt) {
+        nodes.push(h('message', prompt))
+        fallback.push(prompt)
+      }
+    }
     try {
-      await session.send(h('figure', imageElements))
+      await session.send(h('figure', nodes))
     } catch (e) {
       logger.warn(`发送转发图片失败：${e.message}`)
-      await session.send(imageElements)
+      await session.send(fallback)
     }
   }
 
@@ -1189,7 +1199,7 @@ exports.apply = async function apply(ctx, cfg) {
     const verifyBaseUrl = String(cfg.verifyLlmBaseUrl || '').trim()
     const verifyModel = String(cfg.verifyLlmModel || '').trim()
     if (!verifyBaseUrl || !verifyModel) {
-      return { ok: true, degraded: true, message: '', verdict: null, outputs: images }
+      return { ok: true, degraded: true, message: '', verdict: null, outputs: images, prompt }
     }
     const passScore = Math.max(0, Math.min(10, parseInt(cfg.multiVerifyPassScore) || 6))
     const candidateCount = Math.max(1, Math.min(3, parseInt(cfg.multiCandidateCount) || 2))
@@ -1297,11 +1307,11 @@ exports.apply = async function apply(ctx, cfg) {
         data = extractVerifyJson(reply)
       } catch (e) {
         logger.warn(`多人视觉校验失败：${e.message}`)
-        return { ok: true, degraded: true, message: session.text('.multi-verify-error', [String(e && e.message || e)]), verdict: null, outputs: images }
+        return { ok: true, degraded: true, message: session.text('.multi-verify-error', [String(e && e.message || e)]), verdict: null, outputs: images, prompt: currentPrompt }
       }
       if (!data) {
         logger.warn(`多人视觉校验返回无法解析：${reply.slice(0, 200)}`)
-        return { ok: true, degraded: true, message: '', verdict: null, outputs: images }
+        return { ok: true, degraded: true, message: '', verdict: null, outputs: images, prompt: currentPrompt }
       }
       const verdict = verdictFromData(data)
       verdict.skipped = false
@@ -1335,7 +1345,7 @@ exports.apply = async function apply(ctx, cfg) {
     selectedOutputs = best.outputs
     selectedVerdict = best.verdict
     if (!multiAccepted && !cfg.multiSendDegradedCandidate) {
-      return { ok: false, discarded: true, message: session.text('.multi-verify-discarded'), verdict: selectedVerdict, outputs: [] }
+      return { ok: false, discarded: true, message: session.text('.multi-verify-discarded'), verdict: selectedVerdict, outputs: [], prompt: best.prompt }
     }
     const noteParts = []
     if (multiAccepted) {
@@ -1344,7 +1354,7 @@ exports.apply = async function apply(ctx, cfg) {
       noteParts.push(session.text('.multi-verify-degraded', selectedVerdict.issues.length ? '（' + selectedVerdict.issues.join('；').slice(0, 80) + '）' : ''))
     }
     if (retries) noteParts.push(session.text('.multi-verify-failed', [selectedVerdict.issues.length ? '：' + selectedVerdict.issues.join('；').slice(0, 80) : '', retries]))
-    return { ok: true, degraded: false, message: noteParts.join('\n'), verdict: selectedVerdict, outputs: selectedOutputs }
+    return { ok: true, degraded: false, message: noteParts.join('\n'), verdict: selectedVerdict, outputs: selectedOutputs, prompt: best.prompt }
   }
 
   function buildVerifySystemPrompt(multiPerson, planCount) {
@@ -1357,7 +1367,7 @@ exports.apply = async function apply(ctx, cfg) {
   }
 
   // 共享批量执行器：一次性扣除总价，逐张生成，单张失败只退该张单价。
-  // runOne(i) 需返回 { ok, outputs, seed, message? }；返回数组为多张输出（如视觉校验候选）。
+  // runOne(i) 需返回 { ok, outputs, seed, prompt, message? }；返回数组为多张输出（如视觉校验候选）。
   async function executeBatch(USERID, isAdmin, count, unitPrice, runOne) {
     const results = []
     let successCount = 0
@@ -1371,7 +1381,7 @@ exports.apply = async function apply(ctx, cfg) {
       const outputs = Array.isArray(item.outputs) ? item.outputs : (item.outputs ? [item.outputs] : [])
       if (item.ok && outputs.length) {
         successCount += 1
-        results.push({ i, ok: true, outputs, seed: item.seed, note: item.note || '' })
+        results.push({ i, ok: true, outputs, seed: item.seed, prompt: item.prompt || '', note: item.note || '' })
       } else {
         if (!isAdmin) await refundP(USERID, unitPrice)
         if (cfg.outputLogs) logger.warn(`批量第 ${i + 1} 张生成失败（${USERID}）：${item.message || '无输出'}`)
@@ -1465,25 +1475,27 @@ exports.apply = async function apply(ctx, cfg) {
       } else {
         try { result = await runComfyGenerate(finalPrompt, size, { negativePrompt: multiNegative, unet }) } catch (e) { result = { ok: false, message: `生成失败：${e.message}` } }
       }
-      if (!result.ok || !result.outputs || !result.outputs.length) return result
-      if (!cfg.multiVerifyEnabled) {
-        return { ok: true, outputs: result.outputs, seed: result.seed, note: session.text('.multi-degraded', ['（未启用校验或未配置视觉模型）']) }
-      }
-      const verified = await verifyGeneratedImages(session, result.outputs, text, finalPrompt, size, plan.characters.length, unet)
-      if (!verified.ok) return { ok: false, message: verified.message }
-      return { ok: true, outputs: verified.outputs, seed: result.seed, note: verified.message || '' }
+      if (!result.ok || !result.outputs || !result.outputs.length) return result
+      if (!cfg.multiVerifyEnabled) {
+        return { ok: true, outputs: result.outputs, seed: result.seed, prompt: finalPrompt, note: session.text('.multi-degraded', ['（未启用校验或未配置视觉模型）']) }
+      }
+      const verified = await verifyGeneratedImages(session, result.outputs, text, finalPrompt, size, plan.characters.length, unet)
+      if (!verified.ok) return { ok: false, message: verified.message }
+      return { ok: true, outputs: verified.outputs, seed: result.seed, prompt: verified.prompt || finalPrompt, note: verified.message || '' }
     }
 
     const { results, successCount } = await executeBatch(USERID, isAdmin, count, price, runOne)
 
-    // 汇总
-    const allOutputs = []
-    const notes = []
+    // 汇总
+    const allOutputs = []
+    const forwardOutputs = []
+    const notes = []
     const seeds = []
     const failures = []
     for (const item of results) {
-      if (item.ok) {
-        allOutputs.push(...item.outputs)
+      if (item.ok) {
+        allOutputs.push(...item.outputs)
+        forwardOutputs.push(...item.outputs.map(src => ({ src, prompt: item.prompt || finalPrompt })))
         if (item.seed != null) seeds.push(item.seed)
         if (item.note) notes.push(item.note)
       } else {
@@ -1499,7 +1511,7 @@ exports.apply = async function apply(ctx, cfg) {
     if (cfg.outputLogs) logger.success(`${USERID} 多人生成成功 ${successCount}/${count} 张`)
 
     // 发图：合并转发，不引用原指令
-    await sendImagesAsForward(session, allOutputs)
+    await sendImagesAsForward(session, forwardOutputs)
 
     const reply = []
     if (count > 1) {
@@ -1638,23 +1650,26 @@ exports.apply = async function apply(ctx, cfg) {
     // 单阶段生成（共用 seed）
     const runOne = async (i) => {
       let result
-      if (cfg.queueEnabled) {
-        try { result = await queuedTasks[i] } catch (e) { result = { ok: false, message: `生成失败：${e.message}` } }
-      } else {
-        try { result = await runComfyGenerate(stagePrompts[i], size, { seed, unet }) } catch (e) { result = { ok: false, message: `生成失败：${e.message}` } }
-      }
-      return result
+      if (cfg.queueEnabled) {
+        try { result = await queuedTasks[i] } catch (e) { result = { ok: false, message: `生成失败：${e.message}` } }
+      } else {
+        try { result = await runComfyGenerate(stagePrompts[i], size, { seed, unet }) } catch (e) { result = { ok: false, message: `生成失败：${e.message}` } }
+      }
+      result.prompt = stagePrompts[i]
+      return result
     }
 
     const { results, successCount } = await executeBatch(USERID, isAdmin, count, price, runOne)
 
-    // 汇总
-    const allOutputs = []
-    const seeds = []
+    // 汇总
+    const allOutputs = []
+    const forwardOutputs = []
+    const seeds = []
     const failures = []
     for (const item of results) {
-      if (item.ok) {
-        allOutputs.push(...item.outputs)
+      if (item.ok) {
+        allOutputs.push(...item.outputs)
+        forwardOutputs.push(...item.outputs.map(src => ({ src, prompt: item.prompt || stagePrompts[item.i] || '' })))
         if (item.seed != null) seeds.push(item.seed)
       } else {
         failures.push(`第 ${item.i + 1} 阶段：${item.message}`)
@@ -1669,7 +1684,7 @@ exports.apply = async function apply(ctx, cfg) {
     if (cfg.outputLogs) logger.success(`${USERID} 连续图生成成功 ${successCount}/${count} 阶段（seed=${seed}）`)
 
     // 发图：合并转发，不引用原指令
-    await sendImagesAsForward(session, allOutputs)
+    await sendImagesAsForward(session, forwardOutputs)
 
     const reply = []
     reply.push(session.text('.series-ok', [count * price, successCount, seed]))
@@ -2216,10 +2231,12 @@ exports.apply = async function apply(ctx, cfg) {
     const pcheck = await precheckPoints(session, USERID, isAdmin, count * cfg.price)
     if (!pcheck.ok) return pcheck.message
 
-    // 原样模式
-    const stripped = stripRawPrefix(text)
-    const raw = stripped.raw
-    const userPrompt = stripped.prompt
+    // 原样模式
+    const stripped = stripRawPrefix(text)
+    const raw = stripped.raw
+    const promptSections = splitPositiveNegativePrompt(stripped.prompt)
+    const userPrompt = promptSections.positive
+    const userNegativePrompt = promptSections.negative
     if (!userPrompt) return session.text('.no-prompt')
 
     // ComfyUI 就绪
@@ -2300,9 +2317,15 @@ exports.apply = async function apply(ctx, cfg) {
     }
 
     // i2i 运行参数：模式（style/ootd/plain）、--denoise 覆盖值、检测到的能力
-    const i2iRun = i2iImage
-      ? { i2iImage, i2i: { mode: (i2iOpts && i2iOpts.mode) || 'plain', denoise: denoise != null ? denoise : null, caps: (i2iOpts && i2iOpts.caps) || null } }
-      : {}
+    const i2iRun = i2iImage
+      ? { i2iImage, i2i: { mode: (i2iOpts && i2iOpts.mode) || 'plain', denoise: denoise != null ? denoise : null, caps: (i2iOpts && i2iOpts.caps) || null } }
+      : {}
+    // 用户手写了 negative: 区块时，默认负面词仍保留；用户 tag 只补充未出现的部分。
+    const generationOverrides = Object.assign(
+      { unet, seed },
+      i2iRun,
+      userNegativePrompt ? { negativePrompt: mergeNegativePrompts(cfg.negativePrompt, userNegativePrompt) } : {},
+    )
 
     // 性能：按张优化（perImageOptimize）时联网搜索只做一次，各图复用同一份结果
     const searchCache = perImageOptimize && wantsWebSearch(userPrompt) ? await webSearch(userPrompt) : null
@@ -2314,7 +2337,8 @@ exports.apply = async function apply(ctx, cfg) {
         const optimized = await optimizePrompt(session, userPrompt, true, i2iRule, searchCache)
         p = appendInlineProtectedTags(composePrompt(optimized.prompt || userPrompt, raw).prompt, userPrompt, raw)
       }
-      return runComfyGenerate(p, parsedSize.size, Object.assign({ unet, seed }, i2iRun))
+      const generated = await runComfyGenerate(p, parsedSize.size, generationOverrides)
+      return { ...generated, prompt: p }
     }, { USERID, isAdmin, totalPrice: count * cfg.price })
     if (!queued.ok) return queued.message
     const queuedTasks = queued.tasks
@@ -2352,22 +2376,25 @@ exports.apply = async function apply(ctx, cfg) {
       let result
       if (cfg.queueEnabled) {
         try { result = await queuedTasks[i] } catch (e) { result = { ok: false, message: `生成失败：${e.message}` } }
-      } else {
-        try { result = await runComfyGenerate(p, parsedSize.size, Object.assign({ unet, seed }, i2iRun)) } catch (e) { result = { ok: false, message: `生成失败：${e.message}` } }
-      }
-      return result
+      } else {
+        try { result = await runComfyGenerate(p, parsedSize.size, generationOverrides) } catch (e) { result = { ok: false, message: `生成失败：${e.message}` } }
+      }
+      if (!result.prompt) result.prompt = p
+      return result
     }
 
     const { results, successCount } = await executeBatch(USERID, isAdmin, count, cfg.price, runOne)
 
-    // 汇总
-    const allOutputs = []
-    const seeds = []
-    const failures = []
-    for (const item of results) {
-      if (item.ok) {
-        allOutputs.push(...item.outputs)
-        if (item.seed != null) seeds.push(item.seed)
+    // 汇总
+    const allOutputs = []
+    const forwardOutputs = []
+    const seeds = []
+    const failures = []
+    for (const item of results) {
+      if (item.ok) {
+        allOutputs.push(...item.outputs)
+        forwardOutputs.push(...item.outputs.map(src => ({ src, prompt: item.prompt || finalPrompt })))
+        if (item.seed != null) seeds.push(item.seed)
       } else {
         failures.push(`第 ${item.i + 1} 张：${item.message}`)
       }
@@ -2381,7 +2408,7 @@ exports.apply = async function apply(ctx, cfg) {
     if (cfg.outputLogs) logger.success(`${USERID} 生成成功 ${successCount}/${count} 张`)
 
     // 发图：合并转发，不引用原指令
-    await sendImagesAsForward(session, allOutputs)
+    await sendImagesAsForward(session, forwardOutputs)
 
     const reply = []
     if (count > 1) {
@@ -2534,5 +2561,5 @@ exports.apply = async function apply(ctx, cfg) {
   })
 
   // 暴露内部接口供自动化测试调用（Koishi 忽略 apply 返回值，不影响生产行为）
-  return { couponConfirmFlow, buyCouponsAndConsume, normalizeConfirm, resolveCouponPrice, handleGenerateI2I, extractImageFromSession, uploadImageToComfyui, taggerImage, animaI2IWorkflow, animaStyleI2IWorkflow, animaOotdI2IWorkflow, buildI2IWorkflow, detectI2ICapabilities, parseDenoise, sendNotices, sendImagesAsForward }
+  return { couponConfirmFlow, buyCouponsAndConsume, normalizeConfirm, resolveCouponPrice, handleGenerateI2I, extractImageFromSession, uploadImageToComfyui, taggerImage, animaI2IWorkflow, animaStyleI2IWorkflow, animaOotdI2IWorkflow, buildI2IWorkflow, detectI2ICapabilities, parseDenoise, sendNotices, sendImagesAsForward, executeBatch }
 }

package/lib/parse.js

@@ -186,6 +186,19 @@ function stripRawPrefix(prompt) {
   return { raw: false, prompt: text }
 }
 
+// 将用户手写的正负面区块拆开。只识别独立行标记，避免把普通 tag（如 negative space）误判为负面段。
+const NEGATIVE_SECTION_RE = /(?:^|\r?\n)\s*(?:negative(?:\s*prompt)?|negative_prompt|负面(?:提示词|词)?)\s*[:：]\s*/i
+
+function splitPositiveNegativePrompt(prompt) {
+  const text = String(prompt || '').trim()
+  const match = NEGATIVE_SECTION_RE.exec(text)
+  if (!match) return { positive: text, negative: '' }
+  return {
+    positive: text.slice(0, match.index).trim(),
+    negative: text.slice(match.index + match[0].length).trim(),
+  }
+}
+
 function mergeTagText(existing, addition) {
   const tags = []
   const seen = new Set()
@@ -259,6 +272,7 @@ module.exports = {
   parseDenoise,
   RAW_PREFIXES,
   stripRawPrefix,
+  splitPositiveNegativePrompt,
   mergeTagText,
   parseNameTags,
   parsePresetList,

package/lib/tags.js

@@ -236,6 +236,11 @@ function joinPromptParts(parts) {
   return tags.join(', ')
 }
 
+// 默认负面词始终保留，用户手写负面词只补充未出现的 tag。
+function mergeNegativePrompts(defaultPrompt, userPrompt) {
+  return joinPromptParts([defaultPrompt, userPrompt])
+}
+
 module.exports = {
   splitTags,
   normalizeTagKey,
@@ -258,4 +263,5 @@ module.exports = {
   isCharacterIdentityTag,
   cleanContentTags,
   joinPromptParts,
+  mergeNegativePrompts,
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-p-draw",
   "description": "p点-绘图，连接本地 ComfyUI 生图。支持自然语言优化、尺寸选择、画师组、固定角色、生成队列，需要配合 p-qiandao 使用",
-  "version": "1.3.2",
+  "version": "1.3.5",
   "main": "index.js",
   "files": [
     "index.js",