dsh-line-bot 0.9.0 → 0.9.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.9.1
+- 貼吧學習同步的目標下拉現在也包含「插件自訂人設」（`local:`）；選自訂人設時會寫入 `<DSH_HOME>/line-bot/persona-overlays/<id>.md` 覆蓋層，每輪注入。
+- 讀不到大肥魚 HTTP bridge 時，改成直接讀取 `<DSH_HOME>/storages/dsh-persona-dafeiyu/personas.json` 並列出內建人設，不再讓同步目標變空。
+- 修正本機自訂人設同步完成後回報的模式（應為 overlay）。
+- 貼吧梗只從梗類貼吧匯入（一般回覆碎片不再被當成梗）；內建種子擴充到 24 則。
+- 明確要求角色在主人說「不要圖」時不要加表情包標記。
+
 ## 0.9.0
 - 玩梗：新增文字梗庫（內建種子、貼吧高讚金句、wanjiqi-meme 彈幕梗），面板可個別開關來源、調整每輪注入數量、新增／刪除梗；每輪只餵幾條給角色，並限制一次回覆最多用一個。
 - 貼吧學習可寫入內建人設：大肥魚、阿茶、听澜等內建人設不能改原文，改成寫入 `<DSH_HOME>/line-bot/persona-overlays/<id>.md` 覆蓋層，每輪注入、不用重載；自訂人設仍直接改本文。

package/client.js

@@ -759,7 +759,7 @@ window.__ModuleLoader__.load({
       const selectedPersona = personaCatalog.find((item) => item.id === personaCfg.id) || null
       const selectedName = selectedPersona?.name || personaCfg.id || '大肥魚'
       const selectedIsLocal = String(personaCfg.id || '').startsWith('local:')
-      const syncPersonaOptions = personaOptions.slice()
+      const syncPersonaOptions = personaCatalog.slice()
       const syncTarget = syncCfg.targetPersonaId || (syncPersonaOptions[0] && syncPersonaOptions[0].id) || ''
       const bot = status.line?.bot || null
       const webhook = status.line?.webhook || null
@@ -1077,7 +1077,7 @@ window.__ModuleLoader__.load({
                 onChange: (event) => update({ agent: { model: event.target.value } }),
               }),
               h('datalist', { id: 'line-bot-model-options' },
-                ((modelProviders.find((item) => item.id === (draft.agent.provider || agentStatus.defaultProvider)) || {}).models || []).map((item) => h('option', { key: item.id, value: item.id }, item.name))),
+                ((modelProviders.find((item) => item.id === (draft.agent.provider || agentStatus.defaultProvider)) || {}).models || []).map((item) => h('option', { key: item.id, value: item.id }, item.name + (String(item.id).startsWith('local:') ? '（插件自訂）' : (item.builtin ? '（內建）' : ''))))),
             ),
             h(Field, { label: '推理強度（選填）', hint: '留空＝跟隨 provider 預設' },
               h(Text, { value: draft.agent.reasoningEffort || '', onChange: (value) => update({ agent: { reasoningEffort: value } }), placeholder: 'max / high / medium' })),
@@ -1160,7 +1160,7 @@ window.__ModuleLoader__.load({
           { id: sectionDomId('sync'), order: 6, title: '貼吧學習同步', desc: '把「刷貼吧」每天演化學到的語氣樣本，寫進上方人設。自訂人設會直接改人設本文；內建人設（大肥魚、阿茶、听澜）不能改原文，會寫進插件自己的覆蓋層，每輪注入、不用重載。' },
           h(Toggle, { checked: syncCfg.enabled !== false, onChange: (value) => update({ sync: { enabled: value } }), label: '開啟自動同步', hint: '每小時檢查一次；貼吧人設版本有變才寫入（寫入前會備份 personas.json）' }),
           h('div', { style: S.grid },
-            h(Field, { label: '同步到哪個人設', hint: '內建人設使用覆蓋層；自訂人設直接改本文' },
+            h(Field, { label: '同步到哪個人設', hint: '內建人設與插件自訂人設使用覆蓋層；大肥魚的自訂人設直接改本文' },
               h('select', { value: syncTarget, onChange: (event) => update({ sync: { targetPersonaId: event.target.value } }), style: S.input },
                 syncPersonaOptions.length
                   ? syncPersonaOptions.map((item) => h('option', { key: item.id, value: item.id }, item.name))

package/lib/host.mjs

@@ -28,7 +28,7 @@ const stickersMod = await import(withVersion('./stickers.mjs'))
 const memeSourceMod = await import(withVersion('./meme-source.mjs'))
 const stickerImageMod = await import(withVersion('./sticker-image.mjs'))
 const utilMod = await import(withVersion('./util.mjs'))
-const { createConfigStore, publicConfig, dataDir } = configMod
+const { createConfigStore, publicConfig, dataDir, dshHome } = configMod
 const { createPersonaClient } = personaMod
 const { createAgentRunner } = runnerMod
 const { createWebhookServer } = webhookMod
@@ -43,9 +43,9 @@ const { createJokeStore } = jokesMod
 const { createStickerStore } = stickersMod
 const { createMemeSource } = memeSourceMod
 const { createStickerImages } = stickerImageMod
-const { chunkText, clip, inQuietWindow, jsonFail, jsonOk, maskSecret, readJsonBody, safeArray, sleep } = utilMod
+const { chunkText, clip, inQuietWindow, jsonFail, jsonOk, maskSecret, readJsonBody, safeArray, sleep, readJsonSafe } = utilMod
 
-export const VERSION = '0.9.0'
+export const VERSION = '0.9.1'
 
 // 環境變數提供的 Cloudflare API Token（方便用 shell 注入、不用把 token 寫進設定檔）。
 // 設定檔裡的 token 優先；兩者都沒有時才用環境變數。
@@ -161,17 +161,17 @@ export async function create({ ctx, config: pluginConfig, logger: upstream }) {
       } catch (error) {
         logger.warn(`請大肥魚讓開失敗（自訂人設仍會注入）：${errorText(error)}`)
       }
-      return { persona: null, personaText: resolved.text, source: 'local', name: resolved.name }
+      return { persona: null, personaText: resolved.text, source: 'local', name: resolved.name, selection: resolved.id }
     }
     if (resolved.kind === 'dafeiyu') {
-      return { persona: resolved.id, personaText: null, source: 'dafeiyu', name: '' }
+      return { persona: resolved.id, personaText: null, source: 'dafeiyu', name: '', selection: resolved.id }
     }
-    return { persona: null, personaText: null, source: '', name: '' }
+    return { persona: null, personaText: null, source: '', name: '', selection: '' }
   }
 
   // 內建人設（大肥魚等）不能改原文，貼吧同步會寫在覆蓋層；每輪注入在 persona 之後。
   function personaOverlayText(applied) {
-    const id = applied?.persona
+    const id = applied?.selection || applied?.persona
     if (!id) return ''
     try {
       return readPersonaOverlay(id)
@@ -1675,6 +1675,33 @@ export async function create({ ctx, config: pluginConfig, logger: upstream }) {
 
   // ── 人設摘要（給面板） ───────────────────────────────────────────────────
   let personaCache = { at: 0, value: null }
+  function readDafeiyuStoreFallback() {
+    const builtins = [
+      { id: 'dafeiyu', name: '大肥魚', chars: 635 },
+      { id: 'acha', name: '阿茶', chars: 979 },
+      { id: 'tinglan', name: '听澜', chars: 1738 },
+    ].map((item) => ({ ...item, builtin: true, enabled: true, description: '', source: 'dafeiyu' }))
+    const list = builtins
+    try {
+      const file = path.join(dshHome(), 'storages', 'dsh-persona-dafeiyu', 'personas.json')
+      const raw = readJsonSafe(file, null)
+      for (const item of raw?.personas || []) {
+        const id = String(item?.id || '').trim()
+        if (!id) continue
+        list.push({
+          id,
+          name: String(item.name || id),
+          builtin: false,
+          enabled: true,
+          chars: String(item.text || '').length,
+          description: '直接從 personas.json 讀取',
+          source: 'dafeiyu',
+        })
+      }
+    } catch { /* 讀不到就只列內建 */ }
+    return list
+  }
+
   async function getPersonaSummary({ force = false } = {}) {
     const cfg = store.get()
     if (!force && personaCache.value && Date.now() - personaCache.at < 5000) return personaCache.value
@@ -1722,7 +1749,11 @@ export async function create({ ctx, config: pluginConfig, logger: upstream }) {
       ]
     } catch (error) {
       summary.error = errorText(error)
-      summary.catalog = [...local]
+      const fallback = readDafeiyuStoreFallback()
+      summary.list = fallback
+      summary.mode = 'unknown'
+      summary.catalog = [...fallback, ...local]
+      summary.warning = '讀不到大肥魚外掛的 HTTP bridge，已直接讀取 personas.json；清單可能較舊，寫入後請重啟大肥魚外掛。'
     }
     const selected = summary.catalog.find((item) => item.id === cfg.persona.id)
     summary.selectedName = selected?.name || ''
@@ -1730,7 +1761,7 @@ export async function create({ ctx, config: pluginConfig, logger: upstream }) {
       summary.warning = selectedSource === 'local'
         ? `找不到自訂人設「${cfg.persona.id}」，LINE 會改用預設人設。`
         : `找不到人設「${cfg.persona.id}」，LINE 會退回大肥魚的全域人設。`
-    } else if (selectedSource === 'dafeiyu' && cfg.persona.enforce && summary.mode !== 'session') {
+    } else if (!summary.error && selectedSource === 'dafeiyu' && cfg.persona.enforce && summary.mode !== 'session') {
       summary.warning = `大肥魚目前是「${summary.mode || '未知'}」模式；LINE 的逐 session 人設指定要切到 session 模式才會生效。`
     }
     personaCache = { at: Date.now(), value: summary }

package/lib/tieba-sync.mjs

@@ -223,8 +223,9 @@ export function createTiebaSync({ ctx, store, logger, getCatalog }) {
     const list = await catalog()
     const info = list.find((item) => item.id === targetId)
     const builtin = Boolean(info?.builtin) || ['dafeiyu', 'acha', 'tinglan'].includes(targetId)
+    const overlayMode = builtin || String(targetId).startsWith('local:') || info?.source === 'local'
     const section = buildSection(tieba)
-    if (builtin) {
+    if (overlayMode) {
       const oldText = readPersonaOverlay(targetId)
       return {
         ok: true,
@@ -269,6 +270,7 @@ export function createTiebaSync({ ctx, store, logger, getCatalog }) {
       const list = await catalog()
       const info = list.find((item) => item.id === targetId)
       const builtin = Boolean(info?.builtin) || ['dafeiyu', 'acha', 'tinglan'].includes(targetId)
+      const overlayMode = builtin || String(targetId).startsWith('local:') || info?.source === 'local'
       const section = buildSection(tieba)
       const at = Date.now()
       const stateSync = store.getState().sync || {}
@@ -277,7 +279,7 @@ export function createTiebaSync({ ctx, store, logger, getCatalog }) {
       let reload = null
       let sectionText = section
 
-      if (builtin) {
+      if (overlayMode) {
         const oldText = readPersonaOverlay(targetId)
         const nextText = applySection(oldText, section).trimEnd() + '\n'
         changed = sansStamp(oldText) !== sansStamp(section)
@@ -291,7 +293,7 @@ export function createTiebaSync({ ctx, store, logger, getCatalog }) {
             fs.writeFileSync(backupPath, oldText)
           }
           overlayWrite(targetId, nextText)
-          logger.info(`已把刷貼吧學到的口氣寫進內建人設「${info?.name || targetId}」的覆蓋層`)
+          logger.info(`已把刷貼吧學到的口氣寫進「${info?.name || targetId}」的覆蓋層`)
         }
         sectionText = nextText
       } else {
@@ -326,7 +328,7 @@ export function createTiebaSync({ ctx, store, logger, getCatalog }) {
           at,
           version: tieba.version,
           targetId,
-          mode: builtin ? 'overlay' : 'persona',
+          mode: overlayMode ? 'overlay' : 'persona',
           samples: tieba.samples.length,
           changed,
           backupPath,
@@ -335,7 +337,7 @@ export function createTiebaSync({ ctx, store, logger, getCatalog }) {
         },
       }))
 
-      if (!builtin && changed && cfg.reloadPersona !== false) {
+      if (!overlayMode && changed && cfg.reloadPersona !== false) {
         try {
           reload = await reloadPersonaPlugin(ctx)
           if (!reload.ok) logger.warn(`重載大肥魚外掛失敗：${reload.error}`)
@@ -350,7 +352,7 @@ export function createTiebaSync({ ctx, store, logger, getCatalog }) {
         version: tieba.version,
         targetId,
         targetName: info?.name || targetId,
-        mode: builtin ? 'overlay' : 'persona',
+        mode: overlayMode ? 'overlay' : 'persona',
         changed,
         samples: tieba.samples.length,
         backupPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-line-bot",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "把 LINE 官方帳號（Messaging API）接進 DeepSeek Harness 的插件：內建 Cloudflare Tunnel、人設選擇（大肥魚或插件自訂）、主動傳訊與完整設定面板。",
   "type": "module",
   "main": "index.js",