koishi-plugin-p-draw 1.3.1 → 1.3.3

package/index.js

@@ -461,43 +461,56 @@ exports.apply = async function apply(ctx, cfg) {
     return { ok: true, tasks, firstPosition }
   }
 
-  // 即时反馈的公共部分（队列/生成中 + 张数 + 扣费），返回待发送的行
-  function feedbackBase(session, { firstPosition, count, totalPrice, isAdmin }) {
-    const rows = []
-    if (cfg.queueEnabled) {
-      rows.push(session.text('.queued', [firstPosition, cfg.queueMaxRequests || '∞']))
-      if (count > 1) rows.push(session.text('.batch-count', [count]))
-      if (!isAdmin) rows.push(session.text('.charged', [totalPrice]))
-    } else {
-      rows.push(session.text('.generating'))
-      if (count > 1) rows.push(session.text('.batch-count', [count]))
-      if (!isAdmin) rows.push(session.text('.charged', [totalPrice]))
-    }
-    return rows
-  }
-
-  async function sendNotices(session, notices) {
-    if (!notices.length) return
-    try {
-      await session.send(notices.filter(Boolean).join('\n'))
-    } catch (e) {
-      logger.warn(`发送反馈消息失败：${e.message}`)
-    }
-  }
-
-  // 发图：引用用户触发指令的原消息，失败回退普通发送
-  async function sendImagesWithQuote(session, outputs) {
-    const imageElements = await Promise.all(outputs.map(async (src) => {
+  // 即时反馈的公共部分。扣费提醒单独返回，随后以引用消息发送。
+  function feedbackBase(session, { firstPosition, count, totalPrice, isAdmin }) {
+    const notices = []
+    if (cfg.queueEnabled) {
+      notices.push(session.text('.queued', [firstPosition, cfg.queueMaxRequests || '∞']))
+      if (count > 1) notices.push(session.text('.batch-count', [count]))
+    } else {
+      notices.push(session.text('.generating'))
+      if (count > 1) notices.push(session.text('.batch-count', [count]))
+    }
+    return {
+      notices,
+      chargeNotice: isAdmin ? '' : session.text('.charged', [totalPrice]),
+    }
+  }
+
+  async function sendNotices(session, notices, opts = {}) {
+    const content = notices.filter(Boolean).join('\n')
+    if (!content) return
+    try {
+      const message = opts.quote && session.messageId ? h.quote(session.messageId) + content : content
+      await session.send(message)
+    } catch (e) {
+      logger.warn(`发送反馈消息失败：${e.message}`)
+    }
+  }
+
+  // 生成图片使用合并转发；每张图后紧跟实际使用的最终提示词，不附原消息引用。
+  async function sendImagesAsForward(session, outputs) {
+    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)
-    }))
-    try {
-      await session.send(h.quote(session.messageId) + imageElements.join(''))
-    } catch (e) {
-      logger.warn(`发送图片失败（引用）：${e.message}`)
-      await session.send(imageElements)
-    }
-  }
+      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', nodes))
+    } catch (e) {
+      logger.warn(`发送转发图片失败：${e.message}`)
+      await session.send(fallback)
+    }
+  }
 
   // P 点读改写按用户串行化，避免并发指令互相覆盖余额
   const userLocks = new Map()
@@ -1186,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))
@@ -1294,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
@@ -1332,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) {
@@ -1341,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) {
@@ -1354,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
@@ -1368,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 || '无输出'}`)
@@ -1449,8 +1462,10 @@ exports.apply = async function apply(ctx, cfg) {
     // 即时反馈
     const notice = []
     if (parsedBatch.clamped) notice.push(session.text('.batch-limit', [count]))
-    notice.push(...feedbackBase(session, { firstPosition, count, totalPrice: count * price, isAdmin }))
-    await sendNotices(session, notice)
+    const feedback = feedbackBase(session, { firstPosition, count, totalPrice: count * price, isAdmin })
+    notice.push(...feedback.notices)
+    await sendNotices(session, notice)
+    await sendNotices(session, [feedback.chargeNotice], { quote: true })
 
     // 单张生成 +（可选）视觉校验
     const runOne = async (i) => {
@@ -1460,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 {
@@ -1493,8 +1510,8 @@ exports.apply = async function apply(ctx, cfg) {
 
     if (cfg.outputLogs) logger.success(`${USERID} 多人生成成功 ${successCount}/${count} 张`)
 
-    // 发图：引用用户触发指令的原消息
-    await sendImagesWithQuote(session, allOutputs)
+    // 发图：合并转发，不引用原指令
+    await sendImagesAsForward(session, forwardOutputs)
 
     const reply = []
     if (count > 1) {
@@ -1625,29 +1642,34 @@ exports.apply = async function apply(ctx, cfg) {
     if (identity && fixedChars[identity]) notice.push(`已固定角色「${identity}」的身份 tags，各阶段外观将保持一致。`)
     if (!useLLM) notice.push(session.text('.series-no-llm'))
     if (degradedStages) notice.push(session.text('.prompt-degraded', ['（连续图阶段优化失败，已使用原始描述）']))
-    notice.push(...feedbackBase(session, { firstPosition, count, totalPrice: count * price, isAdmin }))
-    await sendNotices(session, notice)
+    const feedback = feedbackBase(session, { firstPosition, count, totalPrice: count * price, isAdmin })
+    notice.push(...feedback.notices)
+    await sendNotices(session, notice)
+    await sendNotices(session, [feedback.chargeNotice], { quote: true })
 
     // 单阶段生成（共用 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}`)
@@ -1661,8 +1683,8 @@ exports.apply = async function apply(ctx, cfg) {
 
     if (cfg.outputLogs) logger.success(`${USERID} 连续图生成成功 ${successCount}/${count} 阶段（seed=${seed}）`)
 
-    // 发图：引用用户触发指令的原消息
-    await sendImagesWithQuote(session, allOutputs)
+    // 发图：合并转发，不引用原指令
+    await sendImagesAsForward(session, forwardOutputs)
 
     const reply = []
     reply.push(session.text('.series-ok', [count * price, successCount, seed]))
@@ -2307,7 +2329,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, Object.assign({ unet, seed }, i2iRun))
+      return { ...generated, prompt: p }
     }, { USERID, isAdmin, totalPrice: count * cfg.price })
     if (!queued.ok) return queued.message
     const queuedTasks = queued.tasks
@@ -2330,8 +2353,10 @@ exports.apply = async function apply(ctx, cfg) {
       notice.push(session.text('.no-optimize', [reasons[noOptimizeReason] || noOptimizeReason]))
     }
     if (parsedBatch.clamped) notice.push(session.text('.batch-limit', [count]))
-    notice.push(...feedbackBase(session, { firstPosition, count, totalPrice: count * cfg.price, isAdmin }))
-    await sendNotices(session, notice)
+    const feedback = feedbackBase(session, { firstPosition, count, totalPrice: count * cfg.price, isAdmin })
+    notice.push(...feedback.notices)
+    await sendNotices(session, notice)
+    await sendNotices(session, [feedback.chargeNotice], { quote: true })
 
     // 单张生成
     const runOne = async (i) => {
@@ -2343,22 +2368,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, Object.assign({ unet, seed }, i2iRun)) } 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}`)
       }
@@ -2371,8 +2399,8 @@ exports.apply = async function apply(ctx, cfg) {
 
     if (cfg.outputLogs) logger.success(`${USERID} 生成成功 ${successCount}/${count} 张`)
 
-    // 发图：引用用户触发指令的原消息
-    await sendImagesWithQuote(session, allOutputs)
+    // 发图：合并转发，不引用原指令
+    await sendImagesAsForward(session, forwardOutputs)
 
     const reply = []
     if (count > 1) {
@@ -2525,5 +2553,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 }
-}
+  return { couponConfirmFlow, buyCouponsAndConsume, normalizeConfirm, resolveCouponPrice, handleGenerateI2I, extractImageFromSession, uploadImageToComfyui, taggerImage, animaI2IWorkflow, animaStyleI2IWorkflow, animaOotdI2IWorkflow, buildI2IWorkflow, detectI2ICapabilities, parseDenoise, sendNotices, sendImagesAsForward, executeBatch }
+}

package/package.json

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