dsh-fish-soul 0.14.0 → 0.14.1

package/README.md

@@ -2,7 +2,7 @@
 
 让一个 QQ 小号背后有"同一个人"：固定人格、按人记记忆、有自己的生活节奏、会主动开口；同一个"她"同时出现在 QQ、B站、抖音。
 
-DSH 插件（单角色 `feiyu`）。版本 **0.14.0**。
+DSH 插件（单角色 `feiyu`）。版本 **0.14.1**。
 
 ## 能力
 

package/lib/db.js

@@ -400,6 +400,17 @@ export function randomCanonicalId() {
 	return `p_${Math.floor(Math.random() * 0xffffffff).toString(16).padStart(8, '0')}`;
 }
 
+/** 桌面端 / 主人兜底：拿到 canonical_id='master' 的 person 行，没有就建一个。 */
+export function ensureMasterPerson(db, nowMs) {
+	const row = db.prepare("SELECT * FROM person WHERE canonical_id = 'master'").get();
+	if (row) return row;
+	db.prepare(`
+		INSERT INTO person (canonical_id, display_name, relation_stage, interaction_count, first_seen_at, last_seen_at)
+		VALUES ('master', '主人', 'close', 0, ?, ?)
+	`).run(nowMs, nowMs);
+	return db.prepare("SELECT * FROM person WHERE canonical_id = 'master'").get();
+}
+
 /**
  * person 原子自动注册（审查 #05）：按 qq_uin Upsert。
  * 主人 QQ 固定映射 canonical_id='master'、relation_stage='close'。

package/lib/index.js

@@ -14,7 +14,7 @@ import { readFileSync, writeFileSync, existsSync, renameSync } from 'node:fs';
 import { loadHostDeps } from './hostdeps.mjs';
 import {
 	openDatabase, configPath, fishSoulDir, resolveOrCreatePerson, resolveOrCreateBiliPerson, resolveOrCreatePlatformPerson,
-	findPersonByQq, findPersonByBili, findPersonByDouyin, readVecMeta, getKv, setKv, getProfile
+	findPersonByQq, findPersonByBili, findPersonByDouyin, readVecMeta, getKv, setKv, getProfile, ensureMasterPerson
 } from './db.js';
 import { BackupService, applyPendingRestore } from './backup.js';
 import { HistoryImporter } from './history-import.js';
@@ -450,22 +450,28 @@ async function startup(ctx, config, { log, gate }) {
 			sp = list.find((x) => x.displayName === want || x.userId === want) ??
 				list.find((x) => x.displayName.includes(want) || want.includes(x.displayName)) ?? sp;
 		}
+		const ch = session?.channel ?? 'dsh';
+		let ownerId = sp?.ownerId ?? UNKNOWN_OWNER;
+		let person = sp?.person ?? null;
+		// #57：桌面端（dsh channel）认作主人——DSH 桌面端是主人自己的环境，没有"别人"。
+		if (ch === 'dsh' && ownerId === UNKNOWN_OWNER) {
+			person = ensureMasterPerson(db, clock.now());
+			ownerId = `user:${person.canonical_id}`;
+		}
 		return {
-			ownerId: sp?.ownerId ?? UNKNOWN_OWNER,
-			person: sp?.person ?? null,
+			ownerId,
+			person,
 			query: sp?.query ?? '',
-			displayName: sp?.displayName ?? '对方',
-			channel: session?.channel ?? 'dsh',
+			displayName: person?.display_name ?? sp?.displayName ?? '对方',
+			channel: ch,
 			channelId: session?.channelId ?? ''
 		};
 	}
 
-	const UNKNOWN_VIEW = { ownerId: UNKNOWN_OWNER, person: null, displayName: '对方', channel: 'dsh', channelId: '' };
-
 	/** 工具调用：按调用所在会话（toolCtx.agent.id）认人；认不出就是 unknown（不读写任何人的记忆）。 */
 	function sessionForTool(toolCtx, speakerName) {
 		const session = sessionFor(toolCtx?.agent?.id ?? toolCtx?.sessionId);
-		return session === undefined ? UNKNOWN_VIEW : speakerView(session, speakerName);
+		return session === undefined ? speakerView(undefined, speakerName) : speakerView(session, speakerName);
 	}
 
 	const retrievalCfg = () => ({
@@ -696,10 +702,11 @@ async function startup(ctx, config, { log, gate }) {
 		});
 		if (person !== null) life.noteInteraction(ownerOf(person));
 		const groupId = source.groupId ?? source.group_id ?? null;
+		// #56：桌面端（person=null）也把消息文本传进去——世界书扫描要用，身份仍是 unknown。
 		beginTurn(agentId, {
 			channel: person === null ? 'dsh' : (groupId != null ? 'qq-group' : 'qq-private'),
 			channelId: person === null ? '' : (groupId != null ? `group:${groupId}` : `private:${qqUin}`),
-			speakers: person !== null ? [{ person, userId: qqUin, displayName: person.display_name, text: messageText(message) }] : [],
+			speakers: [{ person, userId: qqUin, displayName: person?.display_name ?? '对方', text: messageText(message) }],
 			workspacePath: ''
 		});
 		// #41：别的插件把自己的 QQ 消息转进它建的会话 —— 那个会话不走我们的 create/resume，人格卡没挂上。

package/lib/llm.js

@@ -142,7 +142,9 @@ export class LlmRouter {
 		return [{ type: 'text', text: prompt }];
 	}
 
-	async call(prompt, { signal, maxTokens = 600, feature = 'other', thinkFallback = false, images = [], _target, _tried } = {}) {
+	// #58：默认 600 对推理模型太小——光思考就 1000+ token，第一次必然白卷还白烧思考费。
+	// 提到 1500 让大多数推理模型的第一轮能容下思考；maxTokens 是上限不是必花，普通模型不受影响。
+	async call(prompt, { signal, maxTokens = 1500, feature = 'other', thinkFallback = false, images = [], _target, _tried } = {}) {
 		const llm = this.llm();
 		if (llm === null) return null;
 		const f = FEATURE_IDS.has(feature) ? feature : 'other';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-fish-soul",
-  "version": "0.14.0",
-  "description": "鱼 · 人格、按人记忆（可纠正、有印象、能导入旧聊天记录）、日程自走与主动开口，直连 SnowLuma 收发 QQ（群里会自己插话），B站 / 抖音小号私信与自己刷视频；按功能选模型并统计用量花费，能听会说 QQ 语音、收藏表情包、学群里的梗，可选上网查；心情影响说话、去 AI 味、每个群的设定、按聊天选模型、每晚写日记（DSH 插件，单角色 feiyu ，v0.14.0）",
+  "version": "0.14.1",
+  "description": "鱼 · 人格、按人记忆（可纠正、有印象、能导入旧聊天记录）、日程自走与主动开口，直连 SnowLuma 收发 QQ（群里会自己插话），B站 / 抖音小号私信与自己刷视频；按功能选模型并统计用量花费，能听会说 QQ 语音、收藏表情包、学群里的梗，可选上网查；心情影响说话、去 AI 味、每个群的设定、按聊天选模型、每晚写日记（DSH 插件，单角色 feiyu ，v0.14.1）",
   "type": "module",
   "main": "./lib/index.js",
   "files": [
@@ -62,7 +62,7 @@
     }
   },
   "scripts": {
-    "test": "node test/smoke.mjs && node test/douyin-browser.mjs && node test/startup-gate.mjs && node test/outbox.mjs && node test/import-coverage.mjs && node test/update-check.mjs && node test/issue-fixes.mjs && node test/import-resume.mjs && node test/maibot-extras.mjs && node test/worldinfo.mjs && node test/memory-bulk.mjs && node test/backup-restore.mjs && node test/douyin-group.mjs && node test/review-fixes.mjs && node test/at-reads-video.mjs && node test/search-source.mjs && node test/followups.mjs && node test/detail-config.mjs && node test/qq-send-any-image.mjs && node test/qq-read-attachment.mjs && node test/qq-batch-window.mjs && node test/comment-video.mjs && node test/frames.mjs && node test/face-name.mjs && node test/comment-reply.mjs && node test/chat-comment.mjs && node test/at-target.mjs && node test/client-lint.mjs",
+    "test": "node test/smoke.mjs && node test/douyin-browser.mjs && node test/startup-gate.mjs && node test/outbox.mjs && node test/import-coverage.mjs && node test/update-check.mjs && node test/issue-fixes.mjs && node test/import-resume.mjs && node test/maibot-extras.mjs && node test/worldinfo.mjs && node test/memory-bulk.mjs && node test/backup-restore.mjs && node test/douyin-group.mjs && node test/review-fixes.mjs && node test/at-reads-video.mjs && node test/search-source.mjs && node test/followups.mjs && node test/detail-config.mjs && node test/qq-send-any-image.mjs && node test/qq-read-attachment.mjs && node test/qq-batch-window.mjs && node test/comment-video.mjs && node test/frames.mjs && node test/face-name.mjs && node test/comment-reply.mjs && node test/chat-comment.mjs && node test/at-target.mjs && node test/client-lint.mjs && node test/dsh-desktop.mjs",
     "eval": "node test/eval/persona-eval.mjs"
   }
 }