koishi-plugin-p-draw 1.3.3 → 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 {
@@ -2231,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 就绪
@@ -2315,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
@@ -2329,7 +2337,7 @@ 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)
       }
-      const generated = await 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
@@ -2369,7 +2377,7 @@ exports.apply = async function apply(ctx, cfg) {
       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}` } }
+        try { result = await runComfyGenerate(p, parsedSize.size, generationOverrides) } catch (e) { result = { ok: false, message: `生成失败：${e.message}` } }
       }
       if (!result.prompt) result.prompt = p
       return result

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.3",
+  "version": "1.3.5",
   "main": "index.js",
   "files": [
     "index.js",