dsh-feini 0.1.4 → 0.1.6

package/bin/cli.mjs

@@ -98,6 +98,57 @@ function tail(file, n = 6) {
   }
 }
 
+const versionSeenPath = path.join(home, 'version-seen.json');
+
+function pkgVersion() {
+  return String(readJson(path.join(pkgRoot, 'package.json'), {})?.version || '0.0.0');
+}
+
+/** 智谱 key 配了没（识图 + 联网都要它） */
+function visionConfigured() {
+  try {
+    const p = path.join(home, 'vision-key.txt');
+    return fs.existsSync(p) && !!fs.readFileSync(p, 'utf8').trim();
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * 版本变了（或者第一次跑）就体检一遍：缺哪个功能、怎么补，说清楚。
+ * 同一个版本只提醒一次，免得每次 start 都唠叨。
+ */
+function checkFeatures() {
+  const ver = pkgVersion();
+  let seen = {};
+  try {
+    seen = JSON.parse(fs.readFileSync(versionSeenPath, 'utf8'));
+  } catch {
+    seen = {};
+  }
+  if (String(seen.version || '') === ver) return;
+  const tips = [];
+  if (!visionConfigured()) {
+    tips.push('识图和联网还没开：dsh-feini key vision <智谱key>（没有这个 key，看不懂图、也查不了现在的事）');
+  }
+  try {
+    const persona = path.join(home, 'persona.md');
+    if (fs.existsSync(persona) && /自己改这一份就行/.test(fs.readFileSync(persona, 'utf8'))) {
+      tips.push('人设还是空模板：打开 persona.md，把名字和性格写上');
+    }
+  } catch {
+    /* 没有就不提 */
+  }
+  if (tips.length) {
+    console.log(`\n体检（${seen.version ? `${seen.version} → ${ver}` : `首次 ${ver}`}），还差这些：`);
+    for (const t of tips) console.log('  · ' + t);
+    console.log('  补完就不用管了，下个版本再体检\n');
+  } else if (seen.version) {
+    console.log(`升级完成：${seen.version} → ${ver}，功能都在\n`);
+  }
+  writeJson(versionSeenPath, { version: ver, at: Date.now() });
+}
+
 const help = `dsh-feini —— 在 QQ 里养一个自己的伙伴
 
 用法：
@@ -245,6 +296,7 @@ async function cmdInit(argv) {
   2. dsh-feini start
   3. QQ 上给那个号发一句，看看回不回
 `);
+  checkFeatures();
 }
 
 /* ---------- start / stop / status ---------- */
@@ -255,6 +307,7 @@ function cmdStart() {
     console.log(`已经在跑了（pid ${running}），不用再起一个`);
     return;
   }
+  checkFeatures();
   if (!fs.existsSync(configPath)) {
     console.error('还没有配置，先跑 dsh-feini init');
     process.exit(1);
@@ -290,6 +343,7 @@ function cmdStop() {
 function cmdStatus() {
   const pid = currentPid();
   console.log(pid ? `在跑，pid ${pid}` : '没在跑');
+  console.log(`识图/联网：${visionConfigured() ? '已配（智谱 key 在）' : '没配（dsh-feini key vision <key>）'}`);
   console.log('--- 最近日志 ---');
   console.log(tail(logPath, 8));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-feini",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "菲妮做的 QQ 陪伴插件：一张空白人设、一本笔记本、一套会攒记忆的规矩，让你自己养自己的伙伴。",
   "author": "Feini",
   "icon": "assets/logo.svg",

package/src/bridge.mjs

@@ -22,7 +22,7 @@ import { readSystemPrompt } from './prompt.mjs';
 import { chat, imagePart } from './llm.mjs';
 import { toDisplay, splitParts } from './clean.mjs';
 import { looksLikeCorrection, prevLineInText, correctionHint } from './correct.mjs';
-import { needsSearch, webSearch, searchLine, searchFailLine } from './websearch.mjs';
+import { needsSearch, webSearch, searchLine, searchFailLine, searchNotConfiguredLine } from './websearch.mjs';
 import { recentFacts } from './recent.mjs';
 import { getHistory, getLastTs, lastMessage, appendRound } from './memory.mjs';
 import { startProactive } from './proactive.mjs';
@@ -37,13 +37,13 @@ import { lastAssistant } from './last-assistant.mjs';
 import { takeInterest, addInterest, removeInterest, interestsLine, INTEREST_RULE } from './interests.mjs';
 import { startInterestReview } from './review.mjs';
 import { seaLine } from './sea.mjs';
+import { planHint } from './guess-plan.mjs';
 import { takeGuess, addGuess, resolveGuess, guessesLine, GUESS_RULE } from './guess.mjs';
 import { ANGER_RULE, angerLine, offend, coaxed, looksLikeCoax } from './anger.mjs';
 import { getBalance, BALANCE_RULE } from './balance.mjs';
 import { addUsage, usageSummary, USAGE_RULE } from './usage.mjs';
 import { createDiary } from './diary.mjs';
 import { onUsage } from './llm.mjs';
-import { buildSea } from './build-sea.mjs';
 
 const here = path.dirname(fileURLToPath(import.meta.url));
 const root = process.env.DSH_FEINI_HOME ? path.resolve(process.env.DSH_FEINI_HOME) : path.resolve(here, '..');
@@ -63,8 +63,6 @@ function loadConfig() {
     modelVision: raw.modelVision || {},
     proactive: raw.proactive || { enabled: false },
     stickers: raw.stickers || {},
-    // 休眠哨兵/外部通知口子；被占用时只记一行日志，不影响聊天
-    notifyPort: Number(raw.notifyPort || 7301),
   };
   if (process.env.BRIDGE_SYSTEM) cfg.systemPromptPath = null; // 测试用：直接给 prompt 文件
   return cfg;
@@ -156,18 +154,14 @@ const guessFile = path.resolve(root, config.guessPath || 'guesses.json');
 const angerFile = path.join(root, 'anger.json');
 const petMemoryDir = config.petMemoryDir || '';
 const interestFile = petMemoryDir ? path.join(petMemoryDir, 'interests.md') : path.join(root, 'interests.md');
-// 记忆海的数据：默认放在数据目录的 me.json（由 build-sea.mjs 定时重建）
-const seaFile = config.seaFile
-  ? path.resolve(root, config.seaFile)
-  : petMemoryDir
-    ? path.join(petMemoryDir, '..', 'memory-sea', 'data', 'me.json')
-    : path.join(root, 'me.json');
+// 记忆海的数据：pet-memory 的上一级（工作区）里的 memory-sea/data/me.json
+const seaFile = petMemoryDir
+  ? path.join(petMemoryDir, '..', 'memory-sea', 'data', 'me.json')
+  : path.join(root, 'me.json');
 // 笔记本：每轮现读，改完立刻生效（人设里不再抄它）
-const notebookFile = config.notebookPath
-  ? path.resolve(root, config.notebookPath)
-  : petMemoryDir
-    ? path.join(petMemoryDir, '..', 'memory', 'notebook.md')
-    : path.join(root, 'notebook.md');
+const notebookFile = petMemoryDir
+  ? path.join(petMemoryDir, '..', 'memory', 'notebook.md')
+  : path.join(root, 'notebook.md');
 
 let notebookCache = { mtime: 0, text: '' };
 function notebookText() {
@@ -184,27 +178,6 @@ function notebookText() {
 // 人设里「别硬报时」是给桌面碎碎念写的；QQ 里他问时间必须直接答，所以把这句话改软
 const personaForQQ = baseSystemPrompt.replace(/别硬报时/g, '碎碎念时别反复提时间');
 
-/** 记忆海：每两分钟把「对话 + 笔记本 + 日记」重建成索引，启动两秒后先建一次 */
-function rebuildSea() {
-  try {
-    const r = buildSea({
-      memoryPath: config.memoryPath,
-      entry: config.bucket.entry,
-      pet: config.bucket.pet,
-      notebookPath: notebookFile,
-      diaryDir: config.diaryDir ? path.resolve(root, config.diaryDir) : path.join(root, 'diary'),
-      outFile: seaFile,
-    });
-    log(`记忆海重建：长期 ${r.longTerm} 条、对话 ${r.messages} 条、日记 ${r.diaries} 篇`);
-  } catch (e) {
-    log('记忆海重建失败：' + e.message);
-  }
-}
-const seaBoot = setTimeout(rebuildSea, 2000);
-seaBoot.unref?.();
-const seaTimer = setInterval(rebuildSea, 2 * 60 * 1000);
-seaTimer.unref?.();
-
 // 每次说话都现读人设：sync 改完下一句就生效，不用重启桥
 function freshPersona() {
   if (!config.systemPromptPath) return personaForQQ;
@@ -514,6 +487,38 @@ async function knownSticker(img) {
   }
 }
 
+const visionHintFile = path.join(root, 'vision-hint.json');
+
+/** 识图的 key 配了没（配了才看得懂图，也才查得了网） */
+function visionKeyReady() {
+  try {
+    const p = config.modelVision?.keyFile;
+    if (!p) return false;
+    return fs.existsSync(p) && !!fs.readFileSync(p, 'utf8').trim();
+  } catch {
+    return false;
+  }
+}
+
+/** 记一次「看不懂图」，返回这是第几次；前三次数要提醒，之后不再提 */
+function visionMiss(hit = true) {
+  let s = { count: 0 };
+  try {
+    s = JSON.parse(fs.readFileSync(visionHintFile, 'utf8'));
+  } catch {
+    /* 没有就是第一次 */
+  }
+  const count = Number(s.count) || 0;
+  if (!hit) return { count };
+  const next = count + 1;
+  try {
+    fs.writeFileSync(visionHintFile, JSON.stringify({ count: next, lastAt: Date.now() }), 'utf8');
+  } catch {
+    /* 写不进去就每次都当第一次 */
+  }
+  return { count: next };
+}
+
 /** 把一条 QQ 消息变成模型能吃的 user content */
 async function buildUserContent(text, images, quoted = '') {
   const parts = [];
@@ -558,7 +563,25 @@ async function buildUserContent(text, images, quoted = '') {
         log('图片处理失败：', e.message);
       }
     }
-    parts.push({ type: 'text', text: '（发来一张图片/表情包）' });
+    // 没配识图（或者识图挂了）：看不清就说看不清，但最多提醒三次
+    const miss = visionMiss();
+    if (miss.count <= 3) {
+      const tail =
+        miss.count === 3
+          ? '这是第三次了，顺口说一句「这是最后一次提醒你了」，以后别提。'
+          : '';
+      parts.push({
+        type: 'text',
+        text:
+          `（他发来一张图片/表情包，但我这边没配识图，看不出是什么。` +
+          `顺口跟他说一句「我还没配识图，这张看不懂」，别像系统提示，也别猜内容。${tail}）`,
+      });
+    } else {
+      parts.push({
+        type: 'text',
+        text: '（他发来一张图片/表情包，我看不出内容；已经提醒过三次，这次别再提配置的事）',
+      });
+    }
     label.push('[图片]');
   }
   if (parts.length === 0) parts.push({ type: 'text', text: '（空消息）' });
@@ -872,14 +895,19 @@ async function finishSearch(bot, userId) {
     const lastUser = [...hist].reverse().find((m) => m.role === 'user');
     const q = String(lastUser?.content || '').replace(/[\[\［]?引用[:：][^\]]*[\]\］]?/g, '').trim();
     let note = '';
-    try {
-      const keyPath = config.modelVision?.keyFile || path.join(root, 'vision-key.txt');
-      const hits = await webSearch(q, { keyPath, baseUrl: config.modelVision?.baseUrl });
-      note = hits.length ? searchLine(q, hits) : searchFailLine();
-      log(`补查「${q.slice(0, 24)}」：${hits.length} 条`);
-    } catch (e) {
-      note = searchFailLine();
-      log('补查失败：', e.message);
+    if (!visionKeyReady()) {
+      note = searchNotConfiguredLine();
+      log('补查：没配搜索功能');
+    } else {
+      try {
+        const keyPath = config.modelVision?.keyFile || path.join(root, 'vision-key.txt');
+        const hits = await webSearch(q, { keyPath, baseUrl: config.modelVision?.baseUrl });
+        note = hits.length ? searchLine(q, hits) : searchFailLine();
+        log(`补查「${q.slice(0, 24)}」：${hits.length} 条`);
+      } catch (e) {
+        note = searchFailLine();
+        log('补查失败：', e.message);
+      }
     }
     const reply = await chat({
       baseUrl: config.model.baseUrl,
@@ -1072,19 +1100,25 @@ async function respond(bot, userId, text, images, quoted, replyToId = 0) {
   // 问到现在的事（天气、价格、赛果、新闻、版本更新）：先现查一把，查到的塞进 system
   let searchNote = '';
   if (needsSearch(text)) {
-    const keyPath = config.modelVision?.keyFile || path.join(root, 'vision-key.txt');
-    try {
-      const hits = await webSearch(text, { keyPath, baseUrl: config.modelVision?.baseUrl });
-      if (hits.length) {
-        searchNote = searchLine(text, hits);
-        log(`联网查了 ${hits.length} 条：${text.slice(0, 24)}`);
-      } else {
+    if (!visionKeyReady()) {
+      // 没配搜索：就直说没配，别装成「查了没搜到」
+      searchNote = searchNotConfiguredLine();
+      log('要联网，但没配搜索功能');
+    } else {
+      const keyPath = config.modelVision?.keyFile || path.join(root, 'vision-key.txt');
+      try {
+        const hits = await webSearch(text, { keyPath, baseUrl: config.modelVision?.baseUrl });
+        if (hits.length) {
+          searchNote = searchLine(text, hits);
+          log(`联网查了 ${hits.length} 条：${text.slice(0, 24)}`);
+        } else {
+          searchNote = searchFailLine();
+          log('联网查了，没结果');
+        }
+      } catch (e) {
         searchNote = searchFailLine();
-        log('联网查了，没结果');
+        log('联网搜索失败：', e.message);
       }
-    } catch (e) {
-      searchNote = searchFailLine();
-      log('联网搜索失败：', e.message);
     }
   }
 
@@ -1094,7 +1128,7 @@ async function respond(bot, userId, text, images, quoted, replyToId = 0) {
     ? []
     : getHistory(config.memoryPath, config.bucket.entry, config.bucket.pet, config.historyRounds);
   const messages = [
-    { role: 'system', content: buildSystem(text) + awayNote + correctionLine(text) + searchNote + recentFacts(config.memoryPath, config.bucket.entry, config.bucket.pet) },
+    { role: 'system', content: buildSystem(text) + awayNote + correctionLine(text) + planHint(seaFile, text) + searchNote + recentFacts(config.memoryPath, config.bucket.entry, config.bucket.pet) },
     ...history,
     { role: 'user', content },
   ];
@@ -1418,7 +1452,6 @@ const notifyPort = Number(config.notifyPort || 7301);
 const notifyOff = process.env.BRIDGE_NO_NOTIFY === '1'; // 测试时别抢端口
 let lastNotify = { text: '', at: 0 }; // 同一个哨兵可能起了两份，去重
 try {
-  if (notifyOff) throw new Error('skip'); // 测试环境：连端口都不抢
   http
     .createServer((req, res) => {
       const u = new URL(req.url || '/', 'http://127.0.0.1');
@@ -1446,12 +1479,10 @@ try {
         })
         .catch((e) => res.writeHead(500).end(String(e?.message || e)));
     })
-    .on('error', (e) => {
-      if (!notifyOff) log('通知口子错误：', e.message);
-    })
+    .on('error', (e) => log('通知口子错误：', e.message))
     .listen(notifyPort, '127.0.0.1', () => log('通知口子 127.0.0.1:' + notifyPort));
 } catch (e) {
-  if (!notifyOff) log('通知口子起不来：', e.message);
+  log('通知口子起不来：', e.message);
 }
 
 /* ---------- 拉起休眠哨兵 ---------- */
@@ -1467,7 +1498,7 @@ try {
     log('休眠哨兵已启动');
   }
 } catch (e) {
-  if (!notifyOff) log('哨兵启动失败：', e.message);
+  log('哨兵启动失败：', e.message);
 }
 bot.connect();
 

package/src/guess-plan.mjs

@@ -0,0 +1,79 @@
+/**
+ * 「你猜我在干啥」：先翻他昨天说过的行程，翻不到再按习惯猜。
+ *
+ * 为什么单独一个模块：这段逻辑要能单独测（拿真的 me.json 喂它），
+ * 塞在 bridge.mjs 里一导入就把桥跑起来了，没法测。
+ *
+ * 检索顺序按他定的来：
+ *   1. 最近几天他说过的安排（明天/今天/约/说好 + 去/吃/见…），优先他自己说的；
+ *   2. 没翻到就让她按习惯猜（作息、最近在玩什么、爱吃什么）。
+ */
+import fs from 'node:fs';
+
+const PLAN_RE = /(明天|今天|后天|约好|说好|打算)/;
+const VERB_RE = /(去|吃|见|回|上班|上课|开会|出门)/;
+const NOT_PLAN_RE = /(猜猜|你猜|猜一下|猜我|哼|再说一遍|还记得|记得我|有没有给你说|给你说过)/;
+
+/** 像不像「哪天要去干嘛」：短句 + 时间词 + 动作词，别把一整段聊天当成行程 */
+function looksLikePlan(t) {
+  if (!t || t.length < 4 || t.length > 70) return false;
+  if (!PLAN_RE.test(t) || !VERB_RE.test(t)) return false;
+  if (NOT_PLAN_RE.test(t)) return false;
+  // 「今天」「明天」后面紧跟着动作，才像安排
+  return /(明天|今天|后天|约好|说好|打算)[^。！？;；]{0,18}(去|吃|见|回|上班|上课|开会|出门)/.test(t);
+}
+
+/** 最近几天里「像安排」的话，他自己说的排前面，然后按新到旧 */
+export function recentPlans(seaFile, { days = 5, limit = 4 } = {}) {
+  let data = {};
+  try {
+    data = JSON.parse(fs.readFileSync(seaFile, 'utf8'));
+  } catch {
+    return [];
+  }
+  const since = Date.now() - days * 86400000;
+  const list = [];
+  for (const m of data.messages || []) {
+    const at = Number(m.at) || 0;
+    const t = String(m.text || '');
+    if (at < since || !looksLikePlan(t)) continue;
+    list.push({ text: t, at, isOwner: !!m.isOwner });
+  }
+  for (const lt of data.longTerm || []) {
+    const t = String(lt.text || '');
+    const at = Number(lt.lastMentionAt || lt.createdAt) || 0;
+    if (at < since || !looksLikePlan(t)) continue;
+    list.push({ text: t, at, isOwner: true });
+  }
+  const seen = new Set();
+  return list
+    .sort((a, b) => (b.isOwner ? 1 : 0) - (a.isOwner ? 1 : 0) || b.at - a.at)
+    .filter((x) => {
+      const k = x.text.slice(0, 24);
+      if (seen.has(k)) return false;
+      seen.add(k);
+      return true;
+    })
+    .slice(0, limit);
+}
+
+/** 拼给 system 的一段；他不是在让猜就返回空 */
+export function planHint(seaFile, text) {
+  const t = String(text || '');
+  if (!/(猜猜|你猜|猜一下|猜我|猜猜看)/.test(t)) return '';
+  const plans = recentPlans(seaFile);
+  if (plans.length) {
+    const rows = plans
+      .map((p) => `${p.at ? new Date(p.at).toLocaleDateString('zh-CN') + ' ' : ''}${p.text.slice(0, 80)}`)
+      .join('；');
+    return (
+      `\n\n【他在让你猜·先看行程】最近他说过的安排：${rows}。` +
+      '先按这些安排加上现在的时间点来猜（昨天说今天要去哪、几点做什么），' +
+      '对不上再用他的习惯猜（作息、最近在玩什么、爱吃什么）。用一两句说出来，别列清单。'
+    );
+  }
+  return (
+    '\n\n【他在让你猜·没查到行程】海里没捞到他最近几天的明确安排，那就按他的习惯猜：' +
+    '这个点平时在干嘛、最近在玩什么、爱吃什么。猜一两个就好；他不认就让他给个提示，别硬猜。'
+  );
+}

package/src/websearch.mjs

@@ -109,3 +109,12 @@ export function searchFailLine() {
     '直接说「我这边网好像没搜到」，可以让他再问一次；别的就照你会的答。'
   );
 }
+
+/** 压根没配搜索：直说没配，别装成「查了没搜到」 */
+export function searchNotConfiguredLine() {
+  return (
+    '\n\n【没配搜索】他问的是要联网才知道的事，但我这边没配搜索功能，一次都没去查。' +
+    '就照实说「我没配搜索功能」——别说「没查到」「没搜到」，那听着像查过了。' +
+    '可以顺口提一句：配个智谱 key 就能查。别编答案。'
+  );
+}