dsh-fish-soul 0.15.1 → 0.15.2

package/README.md

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

package/lib/client.js

@@ -360,7 +360,8 @@ window.__ModuleLoader__.load({
 			const [form, setForm, patch] = useForm(data, () => ({
 				enabled: qq.enabled === true, wsUrl: qq.wsUrl ?? "ws://127.0.0.1:3001", accessToken: "", masterQqUin: data.masterQqUin ?? "",
 				groupAllowList: (qq.groupAllowList ?? []).join(", "), allGroups: qq.allGroups === true, followUpCount: qq.followUpCount ?? 3, followUpSeconds: qq.followUpSeconds ?? 120, batchMs: qq.batchMs ?? 3000,
-				callNames: (qq.callNames ?? []).join(", "), ij: { ...(qq.interject ?? {}), chance: Math.round((qq.interject?.chance ?? 0.05) * 100), keywords: (qq.interject?.keywords ?? []).join(", ") }
+				callNames: (qq.callNames ?? []).join(", "), ij: { ...(qq.interject ?? {}), chance: Math.round((qq.interject?.chance ?? 0.05) * 100), keywords: (qq.interject?.keywords ?? []).join(", ") },
+				stickersPerDay: qq.stickers?.perDay ?? 10
 			}));
 			if (!data || !form) return null;
 
@@ -410,7 +411,10 @@ window.__ModuleLoader__.load({
 					form.enabled && ij.enabled ? Row({ title: "插话概率" }, ijNum("chance", "插话概率", 0, 100), Muted("%"), ijNum("maxPerHour", "每小时最多", 0, 30), Muted("次/小时")) : null,
 					form.enabled && ij.enabled ? Row({ title: "说完话后冷却" }, ijNum("cooldownMinutes", "冷却", 0, 1440), Muted("分钟")) : null,
 					form.enabled && ij.enabled ? Row({ title: "感兴趣的话题" }, Input({ value: ij.keywords ?? "", placeholder: "猫, 原神, 考研", onChange: (e) => patch({ ij: { ...ij, keywords: e.target.value } }), onBlur: () => save() })) : null,
-					form.enabled ? Row({ title: "收藏表情包", desc: qq.stickers?.collect !== false ? undefined : "看到喜欢的表情会存下来，之后自己用" }, h(Switch, { label: "收藏表情包", checked: qq.stickers?.collect !== false, onChange: (v) => run("/stickers/config", { collect: v }, v ? "会收藏喜欢的表情了" : "不再收藏表情", "保存失败") })) : null,
+					form.enabled ? Row({ title: "收藏表情包", desc: qq.stickers?.collect !== false ? undefined : "看到喜欢的表情会存下来，之后自己用" },
+						h(Switch, { label: "收藏表情包", checked: qq.stickers?.collect !== false, onChange: (v) => run("/stickers/config", { collect: v }, v ? "会收藏喜欢的表情了" : "不再收藏表情", "保存失败") }),
+						Num({ min: 0, max: 100, value: form.stickersPerDay, "aria-label": "每天收藏几张", onChange: (e) => patch({ stickersPerDay: e.target.value }), onBlur: () => { if (form.stickersPerDay !== "") run("/stickers/config", { perDay: form.stickersPerDay }, "每天的上限改了", "保存失败"); } }),
+						Muted("张/天")) : null,
 					form.enabled ? Row({ title: "学群里的说法", desc: qq.slang?.enabled !== false ? undefined : "学每个群的梗和说话风格" }, h(Switch, { label: "学群里的说法", checked: qq.slang?.enabled !== false, onChange: (v) => run("/slang/config", { enabled: v }, v ? "会学群里的说法了" : "不再学群里的说法", "保存失败") })) : null,
 					form.enabled && qq.slang?.enabled !== false ? Row({ title: "学说话方式", desc: "从别人的话里学「什么场合怎么说」，只学别人的、不带人名" }, h(Switch, { label: "学说话方式", checked: qq.slang?.expressions !== false, onChange: (v) => run("/slang/config", { expressions: v }, v ? "会学说话方式了" : "不再学说话方式", "保存失败") })) : null,
 					form.enabled && qq.slang?.enabled !== false ? Row({ title: "私聊也学", desc: "好友私聊里学到的只在那个私聊里用" }, h(Switch, { label: "私聊也学", checked: qq.slang?.privateChats !== false, onChange: (v) => run("/slang/config", { privateChats: v }, v ? "私聊里也会学了" : "只学群里的", "保存失败") })) : null),

package/lib/client.soul.js

@@ -424,23 +424,84 @@ window.__ModuleLoader__.load({
 			recalled: ["撤回", "outline"], command: ["命令", "info"], proactive: ["主动", "info"], digest: ["记下", "success"],
 			filtered: ["改写", "outline"], diary: ["日记", "success"], browse: ["刷视频", "outline"], share: ["分享", "success"], post: ["发动态", "success"], comment: ["评论区", "info"], mood: ["心情", "info"], poke: ["戳回", "info"], react: ["回应", "info"]
 		};
-		/** 她收藏的表情包（动态页底部） */
+		/** 读本地图片 → base64（去掉 data: 前缀）；读不出来给 null。 */
+		function readBase64(file) {
+			return new Promise((resolve) => {
+				const reader = new FileReader();
+				reader.onload = () => { const s = String(reader.result ?? ""); resolve(s.includes(",") ? s.slice(s.indexOf(",") + 1) : null); };
+				reader.onerror = () => resolve(null);
+				reader.readAsDataURL(file);
+			});
+		}
+
+		/** 一张表情：名字能直接改（失焦 / 回车保存，Esc 撤销），也能删 */
+		function StickerCard({ x, api, apiBase, notify, refresh, relTime, ui, onRemove }) {
+			const { h, Input, IconButton } = ui;
+			const base = x.file.replace(/\.[a-z]+$/i, "");
+			const [name, setName] = react.useState(base);
+			const [busy, setBusy] = react.useState(false);
+			const saving = react.useRef(false);
+			const done = react.useRef(false);
+			async function save() {
+				if (saving.current || done.current) return;
+				const next = name.trim();
+				if (next === "" || next === base) { setName(base); return; }
+				saving.current = true; setBusy(true);
+				const r = await api("POST", "/stickers/rename", { file: x.file, workspacePath: x.workspacePath, name: next });
+				saving.current = false; setBusy(false);
+				if (r?.ok) { done.current = true; notify("改好了"); refresh(); }
+				else { notify(r?.error ?? "改名失败"); setName(base); }
+			}
+			const tip = [x.file, x.tracked ? (x.from === "主人" ? "主人导入的" : x.from ? `从 ${x.from} 那里` : "") : "主人自己放进目录的", x.summary, relTime(x.at, Date.now())].filter(Boolean).join("\n");
+			return h("figure", { className: "fs-sticker", title: tip },
+				h("img", { alt: base, loading: "lazy", src: `${apiBase}/stickers/file?file=${encodeURIComponent(x.file)}&ws=${encodeURIComponent(x.workspacePath)}` }),
+				h("figcaption", null,
+					Input({ value: name, "aria-label": `给 ${x.file} 改名`, disabled: busy, onChange: (e) => setName(e.target.value), onBlur: save, onKeyDown: (e) => { if (e.key === "Enter") save(); else if (e.key === "Escape") setName(base); } })),
+				IconButton("close", "删除", () => onRemove(x)));
+		}
+
+		/** 表情包：她收藏的 + 主人自己放进 _stickers 的（动态页底部） */
 		function StickerShelf({ api, apiBase, notify, relTime, ui }) {
-			const { h, Group, Tag, Empty, IconButton, Muted } = ui;
+			const { h, Group, Tag, Empty, Row, Button, Muted } = ui;
 			const [data, load] = usePoll(api, "/stickers/state", 15000);
+			const [busy, setBusy] = react.useState(false);
+			const picker = react.useRef(null);
 			if (!data || data.ok === false) return null;
-			const items = (data.items ?? []).filter((x) => x.exists);
-			if (items.length === 0 && data.config?.collect === false) return null;
+			// 最近的排前面：主人刚放进目录的图不会被收藏记录挤出前 60 张
+			const items = (data.items ?? []).filter((x) => x.exists).slice().sort((a, b) => (b.at ?? 0) - (a.at ?? 0));
 			async function remove(x) {
 				const r = await api("POST", "/stickers/delete", { file: x.file, workspacePath: x.workspacePath });
 				if (r?.ok) { notify("删掉了"); load(); } else notify(r?.error ?? "删除失败");
 			}
-			const now = Date.now();
-			return Group({ title: "她收藏的表情", aside: items.length ? Tag(String(items.length), "outline") : null },
-				items.length === 0 ? Empty("还没收藏过。聊天里看到喜欢的表情，她会自己存下来") : h("div", { className: "fs-stickers" }, items.slice(0, 60).map((x) => h("figure", { className: "fs-sticker", key: `${x.workspacePath}/${x.file}`, title: [x.file, x.from && `从 ${x.from} 那里`, x.summary, relTime(x.at, now)].filter(Boolean).join("\n") },
-					h("img", { alt: x.file, loading: "lazy", src: `${apiBase}/stickers/file?file=${encodeURIComponent(x.file)}&ws=${encodeURIComponent(x.workspacePath)}` }),
-					h("figcaption", null, Muted(x.file.replace(/\.[a-z]+$/i, ""))),
-					IconButton("close", "删除", () => remove(x))))));
+			async function importFiles(files) {
+				const list = Array.from(files ?? []);
+				if (list.length === 0) return;
+				setBusy(true);
+				let doneCount = 0; let skipped = 0; let failed = 0; let full = false;
+				for (const f of list) {
+					if (f.size > 4 * 1024 * 1024) { skipped++; continue; }
+					const b64 = await readBase64(f);
+					if (b64 === null) { failed++; continue; }
+					const r = await api("POST", "/stickers/import", { name: f.name.replace(/\.[a-z]+$/i, ""), mediaType: f.type, base64: b64 });
+					if (r?.ok) doneCount++;
+					else if (r?.full === true) { failed++; full = true; break; }
+					else failed++;
+				}
+				setBusy(false);
+				const parts = [];
+				if (doneCount > 0) parts.push(`导入了 ${doneCount} 张`);
+				if (skipped > 0) parts.push(`${skipped} 张超过 4MB 跳过`);
+				if (failed > 0) parts.push(`${failed} 张没导进去`);
+				if (full) parts.push("_stickers 满了");
+				notify(parts.length > 0 ? parts.join("，") : "没有导入");
+				load();
+			}
+			return Group({ title: "表情包", aside: items.length ? Tag(String(items.length), "outline") : null },
+				Row({ title: "导入本地图片" },
+					h("input", { type: "file", accept: "png,jpg,jpeg,gif,webp", multiple: true, ref: picker, style: { display: "none" }, "aria-label": "选要导入的表情图", onChange: (e) => { const files = e.target.files; e.target.value = ""; importFiles(files); } }),
+					Button({ variant: "ghost", disabled: busy, "aria-label": "导入本地图片", onClick: () => picker.current?.click() }, busy ? "导入中…" : "选图导入"),
+					Muted("不占每天收藏的额度")),
+				items.length === 0 ? Empty("还没有表情包。聊天里看到喜欢的，她会自己存下来；你也可以直接把图片放进工作区的 _stickers 目录") : h("div", { className: "fs-stickers" }, items.slice(0, 60).map((x) => h(StickerCard, { key: `${x.workspacePath}/${x.file}`, x, api, apiBase, notify, refresh: load, relTime, ui, onRemove: remove }))));
 		}
 
 		/** 一个群 / 私聊学到的说法 */

package/lib/panel.css

@@ -227,6 +227,7 @@ a.fs-btn{text-decoration:none}
 .fs-sticker{position:relative;display:flex;flex-direction:column;align-items:center;gap:4px;padding:8px 4px 4px;border:1px solid var(--fs-line);border-radius:6px;background:var(--bg-sidebar)}
 .fs-sticker img{width:64px;height:64px;object-fit:contain}
 .fs-sticker figcaption{max-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:12px}
+.fs-sticker figcaption .fs-input{flex:none;width:100%;height:24px;padding:0 4px;font-size:12px;text-align:center}
 .fs-sticker .fs-icon-btn{position:absolute;top:2px;right:2px;opacity:0}
 .fs-sticker:hover .fs-icon-btn,.fs-sticker:focus-within .fs-icon-btn{opacity:1}
 /* 人格页：模板卡片、说话示例气泡、世界书编辑 */

package/lib/routes-v07.js

@@ -7,22 +7,28 @@
  *  - 首次引导：检查清单 + 不再显示。
  */
 import { existsSync, readFileSync } from 'node:fs';
-import { join, basename } from 'node:path';
+import { join, basename, resolve } from 'node:path';
 import { FEATURES } from './llm.js';
 import { voiceConfig } from './voice.js';
 import { stickerConfig } from './stickers.js';
 import { chatKind, slangConfig, GLOBAL_ID } from './slang.js';
 import { WEB_PROVIDERS, webSearchConfig, ownSearchReady } from './websearch.js';
 import { listChatSessions } from './db.js';
-import { previewMaiBotExtras, importMaiBotExtras } from './maibot-extras.js';
+import { previewMaiBotExtras, importMaiBotExtras, sniffImage } from './maibot-extras.js';
 import { maskKey } from './routes.js';
 
 const BODY_MAX = 256 * 1024;
+const IMPORT_BODY_MAX = 6 * 1024 * 1024;   // 一张图的 base64 + JSON 兜底上限
+const IMPORT_BYTES_MAX = 4 * 1024 * 1024;  // 解码后的图片上限
 const MIME = { png: 'image/png', jpg: 'image/jpeg', jpeg: 'image/jpeg', gif: 'image/gif', webp: 'image/webp' };
+const MEDIA_TYPES = new Set(Object.values(MIME));
 
 const isMasked = (s) => typeof s === 'string' && s.includes('••');
 const str = (x, max = 200) => (typeof x === 'string' ? x.trim().slice(0, max) : '');
 
+/** base64 严一点：只认标准字母表 + 合法长度，别的编码直接拒。 */
+const isBase64 = (s) => s.length > 0 && s.length % 4 === 0 && /^[A-Za-z0-9+/]+={0,2}$/.test(s);
+
 /** 按功能选的模型：只留合法的 { provider, model }，空 = 跟 DSH 默认。 */
 function cleanModels(raw) {
 	const out = {};
@@ -78,6 +84,19 @@ export async function handleV07Route({ method, path, url, req, res, send, readBo
 		return JSON.parse(raw || '{}');
 	};
 	const guard = () => { if (!sameOrigin(req)) { send(403, { ok: false, error: 'forbidden' }); return false; } return true; };
+	/** 同一个工作区？路径写法可能不一样（相对 / 绝对），比绝对路径。 */
+	const sameWorkspace = (a, b) => {
+		const x = String(a ?? ''); const y = String(b ?? '');
+		if (x === '' || y === '') return false;
+		try { return resolve(x) === resolve(y); } catch { return x === y; }
+	};
+	/** ws 得是认得的工作区（当前工作区 / 收藏记录里出现过的），不能随便指个目录来读、改、删文件。 */
+	const knownWorkspace = (p) => {
+		const ws = String(p ?? '');
+		if (ws === '') return false;
+		if (sameWorkspace(ws, gateway?.workspacePath?.() ?? '')) return true;
+		return (stickers?.collected() ?? []).some((x) => sameWorkspace(x.workspacePath, ws));
+	};
 	const webState = () => {
 		const w = webConfig?.() ?? webSearchConfig({});
 		return {
@@ -204,20 +223,18 @@ export async function handleV07Route({ method, path, url, req, res, send, readBo
 	// ── 契约 26~28：表情包 ──
 	if (path === '/stickers/state' && method === 'GET') {
 		if (!stickers) { send(200, { ok: false, error: '表情包没起来' }); return true; }
-		const items = stickers.collected().map((x) => ({
-			file: x.file, workspacePath: x.workspacePath, from: x.from ?? '', summary: x.summary ?? '', at: x.at,
-			exists: existsSync(join(x.workspacePath, '_stickers', x.file))
-		}));
 		const ws = gateway?.workspacePath?.() ?? '';
+		const items = stickers.list(ws);
 		send(200, { ok: true, config: stickerConfig(getConfig().stickers), items, workspacePath: ws, inWorkspace: ws ? (gateway?.listStickers?.(ws) ?? []).length : 0 });
 		return true;
 	}
 	if (path === '/stickers/file' && method === 'GET') {
 		const file = basename(String(url.searchParams.get('file') ?? ''));
 		const ws = String(url.searchParams.get('ws') ?? '');
-		const hit = stickers?.collected().find((x) => x.file === file && x.workspacePath === ws);
+		// 只有清单里真实存在的才给读（收藏的 + 主人自己放进 _stickers 的）
+		const hit = knownWorkspace(ws) ? stickers?.list(ws).find((x) => x.file === file && sameWorkspace(x.workspacePath, ws) && x.exists === true) : null;
 		const ext = file.split('.').pop()?.toLowerCase() ?? '';
-		const full = hit ? join(ws, '_stickers', file) : '';
+		const full = hit ? join(hit.workspacePath, '_stickers', file) : '';
 		if (!hit || !MIME[ext] || !existsSync(full)) { send(404, { ok: false, error: 'not found' }); return true; }
 		res.writeHead(200, { 'content-type': MIME[ext], 'cache-control': 'private, max-age=300' });
 		res.end(readFileSync(full));
@@ -233,11 +250,45 @@ export async function handleV07Route({ method, path, url, req, res, send, readBo
 		send(200, { ok: true, config: stickerConfig({ ...(getConfig().stickers ?? {}), ...s }) });
 		return true;
 	}
+	if (path === '/stickers/rename' && post) {
+		if (!guard()) return true;
+		const b = await body();
+		if (!stickers) { send(200, { ok: false, error: '表情包没起来' }); return true; }
+		const ws = String(b.workspacePath ?? '');
+		if (!knownWorkspace(ws)) { send(200, { ok: false, error: '没有这张' }); return true; }
+		const r = stickers.rename(basename(String(b.file ?? '')), String(b.name ?? ''), ws);
+		send(200, r.ok ? { ok: true, file: r.file } : { ok: false, error: r.reason ?? '改名失败' });
+		return true;
+	}
 	if (path === '/stickers/delete' && post) {
 		if (!guard()) return true;
 		const b = await body();
-		const ok = stickers?.remove(basename(String(b.file ?? '')), String(b.workspacePath ?? '')) === true;
-		send(200, ok ? { ok: true } : { ok: false, error: '没有这张（只能删她自己收藏的）' });
+		const ws = String(b.workspacePath ?? '');
+		const ok = knownWorkspace(ws) && stickers?.remove(basename(String(b.file ?? '')), ws) === true;
+		send(200, ok ? { ok: true } : { ok: false, error: '没有这张' });
+		return true;
+	}
+	// 主人从面板导入本地图片：只进当前工作区，不占每天收藏的额度
+	if (path === '/stickers/import' && post) {
+		if (!guard()) return true;
+		if (!stickers) { send(200, { ok: false, error: '表情包没起来' }); return true; }
+		const ws = gateway?.workspacePath?.() ?? '';
+		if (ws === '') { send(200, { ok: false, error: 'QQ 工作区还没准备好（先连一次 QQ）' }); return true; }
+		let raw = '';
+		try { raw = await readBody(req); } catch { send(200, { ok: false, error: '请求没读完' }); return true; }
+		if (raw.length > IMPORT_BODY_MAX) { send(200, { ok: false, error: '图片太大了（超过 4MB）' }); return true; }
+		let b;
+		try { b = JSON.parse(raw || '{}'); } catch { send(200, { ok: false, error: '请求格式不对' }); return true; }
+		const b64 = String(b.base64 ?? '');
+		if (!isBase64(b64)) { send(200, { ok: false, error: '图片编码不对' }); return true; }
+		const bytes = Buffer.from(b64, 'base64');
+		if (bytes.length === 0) { send(200, { ok: false, error: '没有图片内容' }); return true; }
+		if (bytes.length > IMPORT_BYTES_MAX) { send(200, { ok: false, error: '图片太大了（超过 4MB）' }); return true; }
+		if (b.mediaType !== undefined && b.mediaType !== '' && !MEDIA_TYPES.has(String(b.mediaType))) { send(200, { ok: false, error: '图片类型不对' }); return true; }
+		const mediaType = sniffImage(bytes);
+		if (mediaType === null) { send(200, { ok: false, error: '不是支持的图片格式' }); return true; }
+		const r = stickers.importImage({ bytes, mediaType, name: String(b.name ?? ''), workspacePath: ws, from: '主人' });
+		send(200, r.ok ? { ok: true, file: r.file } : { ok: false, error: r.reason ?? '导入失败', full: r.full === true, dup: r.dup === true });
 		return true;
 	}
 

package/lib/stickers.js

@@ -4,16 +4,25 @@
  * 网关把每轮转进会话的图片（字节 + 是不是表情）记在这里；模型在回复里写一行 [收藏表情:名字]，
  * 就把这轮（或最近 10 分钟内）对方发的那张表情存到工作区 _stickers/名字.扩展名，以后能用 ![名字](_stickers/…) 发。
  * 同一张图（sha1）只存一次；每天最多存 perDay 张；_stickers 里最多 300 张。
+ * _stickers 目录里的文件本身就是本体：主人自己放进去的图也在面板清单里（不写 kv），能改名、能删。
  */
 import { createHash } from 'node:crypto';
-import { existsSync, mkdirSync, readdirSync, unlinkSync, writeFileSync } from 'node:fs';
-import { join } from 'node:path';
+import { existsSync, mkdirSync, readdirSync, renameSync, statSync, unlinkSync, writeFileSync } from 'node:fs';
+import { basename, extname, join, resolve } from 'node:path';
 import { getKv, setKv } from './db.js';
 
 export const COLLECT_RE = /\[(?:收藏表情|存表情)\s*[:：]\s*([^\]\n]{1,30})\]/g;
 const RECENT_MS = 10 * 60_000;
 const DIR_CAP = 300;
 const EXT = { 'image/png': 'png', 'image/gif': 'gif', 'image/jpeg': 'jpg', 'image/webp': 'webp' };
+const IMAGE_EXT = new Set(['png', 'jpg', 'jpeg', 'gif', 'webp']);
+
+/** 同一个工作区？路径写法可能不一样（相对 / 绝对），比绝对路径。 */
+const sameWs = (a, b) => {
+	const x = String(a ?? ''); const y = String(b ?? '');
+	if (x === '' || y === '') return false;
+	try { return resolve(x) === resolve(y); } catch { return x === y; }
+};
 
 /** 回复里的 [收藏表情:名字] 抠出来（发出去的文字里去掉）。 */
 export function parseCollect(text) {
@@ -60,6 +69,59 @@ export class StickerBox {
 		return getKv(this.db, 'stickers.collected', []) ?? [];
 	}
 
+	/**
+	 * 面板清单：收藏记录（含文件已经没了的）+ 当前工作区里主人自己放进 _stickers 的图。
+	 * 目录里的图不写 kv、不定时扫，面板打开时现算。
+	 * @returns {{file: string, workspacePath: string, from: string, summary: string, at: number, exists: boolean, tracked: boolean}[]}
+	 */
+	list(workspacePath) {
+		const ws = String(workspacePath ?? '').trim();
+		const rows = this.collected();
+		const items = rows.map((x) => ({
+			file: x.file, workspacePath: x.workspacePath, from: x.from ?? '', summary: x.summary ?? '', at: x.at ?? 0,
+			exists: existsSync(join(x.workspacePath, '_stickers', x.file)), tracked: true
+		}));
+		if (ws === '') return items;
+		const known = new Set(rows.filter((x) => sameWs(x.workspacePath, ws)).map((x) => x.file));
+		let names = [];
+		try { names = readdirSync(join(ws, '_stickers')); } catch { return items; }
+		for (const name of names) {
+			if (known.has(name) || !IMAGE_EXT.has(extname(name).slice(1).toLowerCase())) continue;
+			let at = 0;
+			try { at = statSync(join(ws, '_stickers', name)).mtimeMs; } catch { /* 读不到就当没有 */ }
+			items.push({ file: name, workspacePath: ws, from: '主人放的', summary: '', at, exists: true, tracked: false });
+		}
+		return items;
+	}
+
+	/**
+	 * 改名字：文件真的在 _stickers 里才改；撞名直接拒绝（不自动加序号）；收藏记录里的文件名跟着改，主人自己放的不写 kv。
+	 * @returns {{ok: boolean, file?: string, reason?: string}}
+	 */
+	rename(file, newName, workspacePath) {
+		const ws = String(workspacePath ?? '');
+		const old = basename(String(file ?? ''));
+		if (old === '') return { ok: false, reason: '没有这张' };
+		const all = this.collected();
+		const hit = all.find((x) => x.file === old && sameWs(x.workspacePath, ws));
+		const dir = join(hit?.workspacePath ?? ws, '_stickers');
+		const from = join(dir, old);
+		if (!existsSync(from)) return { ok: false, reason: '没有这张' };
+		const ext = extname(old).slice(1).toLowerCase();
+		if (!IMAGE_EXT.has(ext)) return { ok: false, reason: '只支持图片文件' };
+		const base = stickerName(basename(String(newName ?? '')));
+		if (base === '') return { ok: false, reason: '名字不能用' };
+		const target = `${base}.${ext}`;
+		if (target === old) return { ok: true, file: old };
+		if (existsSync(join(dir, target))) return { ok: false, reason: '已经有同名了' };
+		try { renameSync(from, join(dir, target)); } catch { return { ok: false, reason: '改名失败' }; }
+		if (hit) {
+			hit.file = target;
+			setKv(this.db, 'stickers.collected', all.slice(0, DIR_CAP));
+		}
+		return { ok: true, file: target };
+	}
+
 	/**
 	 * 存最近一张（优先表情）为 名字.扩展名。
 	 * @returns {{ok: boolean, file?: string, reason?: string}}
@@ -114,13 +176,17 @@ export class StickerBox {
 		return { ok: true, file };
 	}
 
-	/** 设置页删一张她收藏的（只删她自己收藏的，不碰主人放的）。 */
+	/** 设置页删一张：收藏的和主人自己放的都能删；文件已经没了就把收藏记录也删掉。 */
 	remove(file, workspacePath) {
+		const ws = String(workspacePath ?? '');
+		const name = basename(String(file ?? ''));
+		if (name === '') return false;
 		const all = this.collected();
-		const hit = all.find((x) => x.file === file && x.workspacePath === workspacePath);
-		if (!hit) return false;
-		try { unlinkSync(join(workspacePath, '_stickers', hit.file)); } catch { /* 已经没了 */ }
-		setKv(this.db, 'stickers.collected', all.filter((x) => x !== hit));
+		const hit = all.find((x) => x.file === name && sameWs(x.workspacePath, ws));
+		const path = join(hit?.workspacePath ?? ws, '_stickers', name);
+		if (!hit && !existsSync(path)) return false;
+		try { unlinkSync(path); } catch { /* 已经没了 */ }
+		if (hit) setKv(this.db, 'stickers.collected', all.filter((x) => x !== hit));
 		return true;
 	}
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-fish-soul",
-  "version": "0.15.1",
-  "description": "鱼 · 人格、按人记忆（可纠正、有印象、能导入旧聊天记录）、日程自走与主动开口，直连 SnowLuma 收发 QQ（群里会自己插话），B站 / 抖音小号私信与自己刷视频；按功能选模型并统计用量花费，能听会说 QQ 语音、收藏表情包、学群里的梗，可选上网查；心情影响说话、去 AI 味、每个群的设定、按聊天选模型、每晚写日记（DSH 插件，单角色 feiyu ，v0.15.1） ",
+  "version": "0.15.2",
+  "description": "鱼 · 人格、按人记忆（可纠正、有印象、能导入旧聊天记录）、日程自走与主动开口，直连 SnowLuma 收发 QQ（群里会自己插话），B站 / 抖音小号私信与自己刷视频；按功能选模型并统计用量花费，能听会说 QQ 语音、收藏表情包、学群里的梗，可选上网查；心情影响说话、去 AI 味、每个群的设定、按聊天选模型、每晚写日记（DSH 插件，单角色 feiyu ，v0.15.2） ",
   "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 && node test/client-panels.mjs && node test/dsh-desktop.mjs && node test/issue-59-interject.mjs && node test/issue-59-diagnose.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/client-panels.mjs && node test/dsh-desktop.mjs && node test/issue-59-interject.mjs && node test/issue-59-diagnose.mjs && node test/sticker-manage.mjs",
     "eval": "node test/eval/persona-eval.mjs"
   }
 }