dsh-fish-soul 0.13.4 → 0.13.6

package/README.md

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

package/lib/client.behavior.js

@@ -125,7 +125,7 @@ window.__ModuleLoader__.load({
 
 		/** 每日日记 */
 		function Diary({ data, save, api, notify, load, relTime, ui }) {
-			const { h, Group, Row, Switch, Muted, Button, Empty, Tag } = ui;
+			const { h, Group, Row, Switch, Muted, Button, Empty, Tag, IconButton } = ui;
 			const d = data.diary;
 			const [busy, setBusy] = react.useState(false);
 			if (!d) return null;
@@ -145,7 +145,11 @@ window.__ModuleLoader__.load({
 				Row({ title: "发到 QQ 空间", desc: "默认关；SnowLuma 不支持的话会在动态里记一条失败" },
 					h(Switch, { label: "发到 QQ 空间", checked: c.qzone, onChange: (v) => save({ diary: { qzone: v } }) })),
 				topics.length === 0 ? null : h("div", { className: "fs-list" }, topics.map((x, i) => h("div", { className: "fs-item", key: `t${i}` },
-					Tag("想聊", "info"), h("span", { className: "fs-item-main" }, `${x.who ? `${x.who}：` : ""}${x.topic}`)))),
+					Tag("想聊", "info"), h("span", { className: "fs-item-main" }, `${x.who ? `${x.who}：` : ""}${x.topic}`),
+					h("span", { className: "fs-item-meta" }, IconButton("close", "删除", async () => {
+						const r = await api("POST", "/diary/topic-remove", { who: x.who ?? "", topic: x.topic });
+						if (r?.ok) { notify("删掉了"); load(); } else notify(r?.error ?? "删除失败");
+					}))))),
 				h("div", { className: "fs-list" }, (d.entries ?? []).length === 0 ? Empty("还没写过日记")
 					: d.entries.map((e) => h("div", { className: "fs-item", key: e.id, title: e.content },
 						h("span", { className: "fs-item-main" }, e.content.replace(/^\d{4}-\d{2}-\d{2} 的日记：/, "")),

package/lib/client.js

@@ -161,8 +161,9 @@ window.__ModuleLoader__.load({
 			h("select", { ...props, className: "fs-input" }, ...options), Icon("chevron", 12));
 
 		const Empty = (text) => h("div", { className: "fs-empty" }, text);
-		const Item = ({ key, lead, text, title, meta }) => h("div", { className: "fs-item", key },
-			lead ?? null, h("span", { className: "fs-item-main", title: title ?? text }, text), meta ? h("span", { className: "fs-item-meta" }, ...meta) : null);
+		const Item = ({ key, lead, text, title, meta, onRemove }) => h("div", { className: "fs-item", key },
+			lead ?? null, h("span", { className: "fs-item-main", title: title ?? text }, text), meta ? h("span", { className: "fs-item-meta" }, ...meta) : null,
+			onRemove ? IconButton("close", "删除", onRemove) : null);
 
 		/** 表单：服务端数据到了才初始化一次，之后本地编辑、失焦保存。 */
 		function useForm(data, init) {

package/lib/client.persona.js

@@ -207,16 +207,19 @@ window.__ModuleLoader__.load({
 			const [data, setData] = useLoad(api, "/persona/state");
 			const [open, setOpen] = react.useState(null);
 			const [editing, setEditing] = react.useState(null);
-			const [fresh, setFresh] = react.useState(true);
+			const [fresh, setFresh] = react.useState(null);
 			const [busy, setBusy] = react.useState(false);
 			const fileRef = react.useRef(null);
 			if (data === null) return Empty(Dot("ongoing"));
 			if (data.error) return h("div", { className: "fs-notice", role: "alert" }, h("b", null, "人格读不到"), h("span", null, data.error));
 			const cur = data.current ?? {};
+			// 开关跟着人走（服务端 kv 持久化），进页面带回来；没到手的写入前不发请求
+			const freshOn = fresh ?? data.freshDefault === true;
+			const toggleFresh = (on) => { setFresh(on); api("POST", "/persona/fresh", { enabled: on === true }); };
 
 			async function post(path, body, okText) {
 				setBusy(true);
-				const r = await api("POST", path, { ...body, fresh });
+				const r = await api("POST", path, { ...body, fresh: freshOn });
 				setBusy(false);
 				if (r?.ok) { setData(r); setEditing(null); notify(okText(r)); } else notify(r?.error ?? "保存失败");
 				return r?.ok === true;
@@ -273,8 +276,8 @@ window.__ModuleLoader__.load({
 						Button({ onClick: () => fileRef.current?.click(), disabled: busy }, "导入角色卡"),
 						cur.card ? Button({ variant: "ghost", onClick: exportCard }, "导出") : null,
 						h("input", { ref: fileRef, type: "file", accept: ".json,.png,application/json,image/png", hidden: true, onChange: pickFile })),
-					Row({ title: "正在聊的也马上换", desc: fresh ? "下一条消息起开新会话，旧聊天的口吻不带过来；记忆和关系都还在" : "沿用旧会话：新人格下一轮生效，但口吻可能要几轮才转过来" },
-						h(Switch, { label: "正在聊的也马上换", checked: fresh, onChange: setFresh }))),
+				Row({ title: "正在聊的也马上换", desc: freshOn ? "下一条消息起开新会话，旧聊天的口吻不带过来；记忆和关系都还在" : "沿用旧会话：新人格下一轮生效，但口吻可能要几轮才转过来" },
+					h(Switch, { label: "正在聊的也马上换", checked: freshOn, onChange: toggleFresh }))),
 				Group({ title: "人格模板", aside: Muted("都是 SillyTavern V2 卡，换上以后还能接着改") },
 					...(data.templates ?? []).map((t) => h(Template, {
 						key: t.id, t, h, ui, open: open === t.id, current: cur.template === t.id && cur.source === "persona.json",

package/lib/client.soul.js

@@ -350,6 +350,10 @@ window.__ModuleLoader__.load({
 			const [sel, setSel] = react.useState(() => new Set());
 			const qs = new URLSearchParams({ ...(owner !== "all" ? { ownerId: owner } : {}), ...(qApplied ? { q: qApplied } : {}), ...(source ? { source } : {}), ...(bulk ? { limit: "500" } : {}) }).toString();
 			const [data, load] = usePoll(api, `/inspector/overview${qs ? `?${qs}` : ""}`, 0);
+			async function dropPending(id) {
+				const r = await api("POST", "/inspector/forget", { targetType: "pending", id });
+				if (r?.ok) { notify("已删掉这条待办"); load(); } else notify(r?.error ?? "删除失败");
+			}
 			const [adding, setAdding] = react.useState("");
 			react.useEffect(() => { setSel(new Set()); }, [owner, qApplied, source, bulk]);
 			if (!data) return null;
@@ -409,7 +413,7 @@ window.__ModuleLoader__.load({
 					h("div", { className: "fs-list" }, memories.length === 0 ? Empty("还没有记忆")
 						: memories.map((m) => h(MemoryItem, { key: m.id, m, ui, api, notify, refresh: load, curGen: data.currentGenerationId ?? 1, selectable: bulk, selected: sel.has(m.id), onSelect })))),
 				pendings.length === 0 ? null : Group({ title: "待办", aside: Tag(String(pendings.length), "outline") },
-					h("div", { className: "fs-list" }, pendings.map((p) => Item({ key: p.id, lead: Muted(props.fmtDueAt(p.dueAt), { className: "fs-unit num" }), text: p.reason, meta: [p.channelId ?? ""] })))),
+					h("div", { className: "fs-list" }, pendings.map((p) => Item({ key: p.id, lead: Muted(props.fmtDueAt(p.dueAt), { className: "fs-unit num" }), text: p.reason, meta: [p.channelId ?? ""], onRemove: () => dropPending(p.id) })))),
 				h(ImportBackup, { ui, api, notify, relTime: props.relTime, onDone: load }));
 		}
 

package/lib/routes-persona.js

@@ -4,7 +4,7 @@
  * 还有「她慢慢长出来的变化」（growth.js）：看 / 确认 / 删 / 自己加 / 清空 / 开关。
  * 换完立刻热加载（下一轮就用新人格）；fresh = 正在聊的聊天下一条消息起开新会话（记忆在 soul.db，不受影响）。
  */
-import { fishSoulDir, setKv } from './db.js';
+import { fishSoulDir, getKv, setKv } from './db.js';
 import { editGrowth, growthConfig, growthState } from './growth.js';
 import { PERSONA_TEMPLATES, personaTemplate } from './persona-templates.js';
 import { canUndoPersona, normalizeCard, parsePngCard, readPersonaCard, savePersonaCard, undoPersona } from './persona.js';
@@ -32,6 +32,7 @@ export async function handlePersonaRoute({ method, path, req, send, readBody, sa
 			},
 			templates: PERSONA_TEMPLATES.map(({ id, title, tagline, tags, card }) => ({ id, title, tagline, tags, card })),
 			canUndo: canUndoPersona(dir),
+			freshDefault: getKv(db, 'persona.freshDefault', false) === true,
 			growth: { config: growthConfig(getConfig().growth), items: growthState(db) }
 		};
 	};
@@ -44,6 +45,19 @@ export async function handlePersonaRoute({ method, path, req, send, readBody, sa
 
 	if (path === '/persona/state' && method === 'GET') { send(200, state()); return true; }
 
+	// 「正在聊的也马上换」开关：跟着人走（存 kv），不是跟着这次打开的页面走
+	if (path === '/persona/fresh' && method === 'POST') {
+		if (!guard()) return true;
+		try {
+			const b = await body();
+			setKv(db, 'persona.freshDefault', b.enabled === true);
+			send(200, state());
+		} catch (error) {
+			send(400, { ok: false, error: String(error instanceof Error ? error.message : error) });
+		}
+		return true;
+	}
+
 	if (path === '/persona/apply' && method === 'POST') {
 		if (!guard()) return true;
 		let card;

package/lib/routes-v09.js

@@ -3,7 +3,7 @@
  * 习惯开关（心情影响行为 / 去 AI 味 / 合并转发 / 群里冷热 / 小互动 / 每轮判断心情 / 日记）、
  * 每个群的群设定和冷热、按聊天选模型、记忆调试器、现在写一篇日记。
  */
-import { listChatSessions } from './db.js';
+import { listChatSessions, getKv, setKv } from './db.js';
 import { behaviorConfig, chatModelsConfig, resolveChatModel, groupNotes, setGroupNote } from './behavior.js';
 
 const BODY_MAX = 64 * 1024;
@@ -102,6 +102,19 @@ export async function handleV09Route({ method, path, req, send, readBody, sameOr
 		send(200, { ok: true, ...(await debugRecall({ ownerId, text, inGroup: b.inGroup === true })) });
 		return true;
 	}
+	// ── 契约 42：删掉一条日记里「想聊的」──
+	if (path === '/diary/topic-remove' && post) {
+		if (!guard()) return true;
+		const b = await body();
+		const t = getKv(db, 'diary.topics', null);
+		if (!t || !Array.isArray(t.items)) { send(200, { ok: false, error: '没有想聊的' }); return true; }
+		const idx = t.items.findIndex((x) => (x.who ?? '') === String(b.who ?? '') && x.topic === String(b.topic ?? ''));
+		if (idx === -1) { send(200, { ok: false, error: '这条不在了' }); return true; }
+		t.items.splice(idx, 1);
+		setKv(db, 'diary.topics', t);
+		send(200, { ok: true });
+		return true;
+	}
 	// ── 契约 41：现在写一篇日记 ──
 	if (path === '/diary/write-now' && post) {
 		if (!guard()) return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-fish-soul",
-  "version": "0.13.4",
+  "version": "0.13.6",
   "description": "鱼 · 人格、按人记忆（可纠正、有印象、能导入旧聊天记录）、日程自走与主动开口，直连 SnowLuma 收发 QQ（群里会自己插话），B站 / 抖音小号私信与自己刷视频；按功能选模型并统计用量花费，能听会说 QQ 语音、收藏表情包、学群里的梗，可选上网查；心情影响说话、去 AI 味、每个群的设定、按聊天选模型、每晚写日记（DSH 插件，单角色 feiyu）",
   "type": "module",
   "main": "./lib/index.js",