Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ test/eval/reports/
DESIGN-fish-soul.md
dsh_fish_soul_deepseek_harness.html
dsh_fish_soul_ui_design.md
douyin-adapter-plan.md

# 抖音抓包原始数据(解出来是真实 uid / sec_uid,别进仓库)
probe-*/
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# dsh-fish-soul 变更记录

- 未发布:她刷到想分享的视频会主动挑一条发给你了(#133);在 DSH 里聊的话,动态里能看到你说了什么(#78)。
- **「刷到就分享」加了兜底**:以前分享只靠模型自己在每条视频末尾标 `[分享]`,而提示词里明说「大多数视频不用」⇒ 她几乎不标 ⇒ 分享待办长期为 0。真机库核对:2026-11-17 她刷了 8 条以上 B站视频,一条分享都没排;B站最近一次分享还是 11-07(10 天前)。现在:最近几天没分享过的话,她会主动从这轮刷到的里挑一条(有感受、没划走的)发给你。可以在设置页调「几天没分享就主动挑一条」(默认 2 天,设 0 = 回到「只发她自己想发的」)。
- **「上次分享过」按送达算、按平台分**:只排上没发出去的(失败 / 过期)不算「分享过」—— 否则一条卡住的分享会连着两天什么都不做。抖音分享一次也不影响 B站的兜底(之前是全局一个键,抖音天天分享 B站就永远轮不上)。
- **分享待办的时效从 4 小时放宽到 12 小时**:下午刷到的视频晚上想发,原来 4 小时一到就作废了(真机上 11-12 排的那条就是这么没发出去的)。但**不会跨天** —— 待办正文写的是「你刚刷到」,隔天早上发出去这话就不成立。
- **平台开关优先**:你在 B站 / 抖音面板上关掉「刷到就分享」,兜底也不会发(之前兜底把你的显式关闭反转了,比不修更糟)。
- **在 DSH 里聊,动态里能看到你说了什么**:以前那一轮只显示她的发言,你会以为自己的话丢了。记忆整理本身不受影响(你的话一直进聊天日志)。
- **验证范围**:新增 `test/share-fallback.mjs`(14 组断言,含**真实浏览器实例**——上一版全是手搓对象,构造函数的参数漏接了导致整个兜底是死代码都没测出来)+ `test/smoke.mjs` 补路由断言(请求不带分享字段时不能把你手改的值冲掉)。逐条撤掉验证 11 处全部真红。**未验证**:真机上她真的主动分享出去一条(要跑一整轮自走层 + 真发消息给主人)。

- 未发布:设置页的「更新」修好了 —— 一键更新按钮以前**从来没渲染过**。
- **根因**:`/update/` 那组路由要靠宿主的 plugin-manager 服务才知道能不能一键更新,但宿主上下文压根没被传进路由(`deps.ctx` 恒是空)⇒ 面板永远判定「不能一键更新」⇒ 按钮不渲染。顺带还有:`pluginManagerOf` 只按属性取服务(cordis 也能用 `ctx.get()` 拿)、两个路由的响应漏了 `canApply`(点一下「检查更新」按钮就凭空消失)、面板上的版本号是七八小时前的旧缓存(显示「已是最新」是假的)。
- **现在**:按钮按宿主说了算(宿主拒绝时会把原因原样带回来),查到的版本号不会再过期到误导人。
Expand Down
29 changes: 27 additions & 2 deletions lib/browse.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,29 @@ export function afterRound(self, label, watched, pick) {
});
} catch { /* 动态可缺 */ }
const s = watched.find((w) => w.share);
if (!s || typeof self.share !== 'function') return;
// 模型这轮没标 [分享]:让自走层判断要不要主动挑一条(最近几天没分享过才挑,见 #133)。
// 原来这里是直接 return ⇒ 她不标就一条都不排,主人看到的就是「刷了但从不分享」。
if (!s) {
if (typeof self.shareFallback !== 'function') return;
// ⚠️ 用户在平台面板上明确关了「刷到就分享」⇒ 兜底也不许发。
// 不看这个开关的话,兜底会把用户的显式关闭**反转**(比不修更糟)。
if (typeof self.cfg === 'function' && self.cfg()?.share === false) return;
try {
const candidates = watched.map((w) => ({ ...pick(w), impression: w.impression, skipped: w.skipped, url: w.url }));
const r = self.shareFallback({ platform: label, candidates });
if (r?.ok) {
// 用它返回的那条(挑的规则在自走层那边,自己重算可能挑到不一样的)
const one = r.chosen ?? candidates.find((c) => c.impression) ?? candidates[0];
self.note?.('share', { title: label, reason: `最近没分享,主动挑一条《${String(one?.title ?? '').slice(0, 20)}》分享给你`, text: one?.url ?? '' });
} else if (r?.error && !/最近 .* 天分享过了|没有值得分享|兜底关着|分享视频关着/.test(r.error)) {
self.note?.('browse', { title: label, reason: `想主动分享但没排上:${r.error}` });
}
} catch (error) {
self.log('warn', `[fish-soul] 兜底分享失败:${String(error instanceof Error ? error.message : error)}`);
}
return;
}
if (typeof self.share !== 'function') return;
try {
const r = self.share({ platform: label, ...pick(s), url: s.url, impression: s.impression });
self.note?.(r?.ok ? 'share' : 'browse', { title: label, reason: r?.ok ? `想把《${String(pick(s).title ?? '').slice(0, 20)}》分享给你` : `想分享但没排上:${r?.error ?? '不知道为什么'}`, text: s.url });
Expand All @@ -57,8 +79,11 @@ export class BiliBrowser {
* @param {(level: string, msg: string) => void} [deps.log]
* @param {[number, number]} [deps.watchDelayMs] 两条视频之间"看"多久(真实毫秒)
*/
constructor({ db, clock, client, getConfig, callLlm, persona, worker, log, watchDelayMs = [8000, 20000], share, note, frames }) {
constructor({ db, clock, client, getConfig, callLlm, persona, worker, log, watchDelayMs = [8000, 20000], share, shareFallback, note, frames }) {
this.share = share ?? null; // 刷到特别想分享的:交给自走层排一条主动消息(带链接)
// #133:模型没标 [分享] 时的兜底(最近几天没分享过就主动挑一条)。
// ⚠️ 漏了这个参数整个兜底就是死代码(afterRound 里 self.shareFallback 恒 undefined)。
this.shareFallback = shareFallback ?? null;
this.note = note ?? null; // 记一条动态
this.db = db;
this.clock = clock;
Expand Down
10 changes: 10 additions & 0 deletions lib/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,7 @@ window.__ModuleLoader__.load({
enabled: pc.enabled !== false, dailyMaxCount: pc.dailyMaxCount ?? 10,
activeStart: pc.activeHours?.[0] ?? 8, activeEnd: pc.activeHours?.[1] ?? 24, idleTriggerHours: pc.idleTriggerHours ?? 6,
idleRealGapMinutes: pc.idleRealGapMinutes ?? 30, scheduleEnabled: pc.scheduleEnabled !== false,
shareMaxPerDay: pc.shareMaxPerDay ?? 2, shareFallbackDays: pc.shareFallbackDays ?? 2,
masterPrivateChannelId: targets.masterPrivateChannelId ?? "", selfGroupChannelIds: [...(targets.selfGroupChannelIds ?? [])]
}));
if (!data || !form) return null;
Expand All @@ -456,6 +457,9 @@ window.__ModuleLoader__.load({
idleTriggerHours: next.idleTriggerHours,
idleRealGapMinutes: next.idleRealGapMinutes,
scheduleEnabled: next.scheduleEnabled,
// #133:这两个字段不进 body ⇒ 面板改了存不进去(读回又是默认值,像保存失败但没报错)
shareMaxPerDay: next.shareMaxPerDay,
shareFallbackDays: next.shareFallbackDays,
targets: { masterCanonicalId: targets.masterCanonicalId ?? "user:master", masterPrivateChannelId: next.masterPrivateChannelId, selfGroupChannelIds: next.selfGroupChannelIds }
});
if (res?.ok) refresh(); else notify(res?.error ?? "保存失败");
Expand Down Expand Up @@ -489,6 +493,12 @@ window.__ModuleLoader__.load({
form.enabled ? Row({ title: "空闲多久后" }, num("idleTriggerHours", "空闲多久后", 1, 48, 6), Muted("小时")) : null,
form.enabled ? Row({ title: "刚聊完先等等" }, num("idleRealGapMinutes", "刚聊完先等等", 0, 1440, 30), Muted("分钟"), Muted("0 = 不等")) : null,
form.enabled ? Row({ title: "自走日程" }, h(Switch, { label: "自走日程", checked: form.scheduleEnabled, onChange: (v) => save({ scheduleEnabled: v }) }), Muted("关掉就不排今天干什么")) : null,
form.enabled ? Row({ title: "分享视频", stack: true },
num("shareMaxPerDay", "分享视频每天最多", 0, 20, 2), Muted("条/天"),
Muted("她刷到特别想分享的才会发")) : null,
form.enabled ? Row({ title: "几天没分享就主动挑一条", stack: true },
num("shareFallbackDays", "几天没分享就主动挑一条", 0, 30, 2), Muted("天"),
Muted("0 = 不主动挑(只用她自己想分享的)")) : null,
form.enabled ? Row({ title: "主人私聊" }, Input({ value: form.masterPrivateChannelId, placeholder: "private:主人 QQ", onChange: (e) => patch({ masterPrivateChannelId: e.target.value }), onBlur: () => save() })) : null,
form.enabled ? Row({ title: "群聊", stack: true },
...form.selfGroupChannelIds.map((cid) => Tag(cid, undefined, { key: cid },
Expand Down
4 changes: 4 additions & 0 deletions lib/config-schema.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,10 @@ export function fishSoulConfigSchema(z) {
// #75:自走日程开关。关掉 = 不生成日程、不注入时段、不用忙/闲卡住主动与刷视频
scheduleEnabled: z.boolean().default(true),
shareMaxPerDay: z.number().default(2), // 刷到想分享的视频,一天最多主动发几条
shareVideos: z.boolean().default(true), // 分享视频总开关(以前代码读它但 schema 里没有 ⇒ 读不到,等于写不了)
// #133:最近 N 天没分享过就主动挑一条(0 = 关)。分享原本只靠模型标 [分享],
// 而提示词明说「大多数视频不用」⇒ 实测她几乎不标,分享待办长期为 0。
shareFallbackDays: z.number().default(2),
targets: z.object({
masterCanonicalId: z.string().default('user:master'),
masterPrivateChannelId: z.string().default(''),
Expand Down
4 changes: 3 additions & 1 deletion lib/douyin-browse.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,10 @@ export class DouyinBrowser {
* @param {import('./douyin-http.js').DouyinHttp} [deps.http] 纯 HTTP 客户端(http 模式用)
* @param {object} [deps.timing] 页面操作的时间上限(eval / send / next 的总预算)
*/
constructor({ db, clock, host, getConfig, callLlm, persona, worker, log, dwellMs = [5000, 20000], readDetail = detail, settleMs = 8000, fetchImpl, share, note, http, frames, timing = {} }) {
constructor({ db, clock, host, getConfig, callLlm, persona, worker, log, dwellMs = [5000, 20000], readDetail = detail, settleMs = 8000, fetchImpl, share, shareFallback, note, http, frames, timing = {} }) {
this.share = share ?? null;
// #133:同上 —— 漏了这个参数兜底就是死代码。
this.shareFallback = shareFallback ?? null;
this.note = note ?? null;
this.framesOf = frames ?? null; // 抽九宫格看画面(可缺:没有就只读文字)
this.db = db;
Expand Down
8 changes: 8 additions & 0 deletions lib/gateway-util.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,14 @@ export function parseRelayTarget(toRaw, platformRaw) {
return { ok: false, error: `收件人「${raw}」看不出是哪个平台的号。要么给纯数字 + platform,要么写成 qq:123 / bili:123 / douyin:123。` };
}

/** 宿主 user/message 事件里的正文(content 可能是字符串,也可能是 block 数组)。 */
export function textOfUserMessage(message) {
const content = message?.content;
if (typeof content === 'string') return content;
if (!Array.isArray(content)) return '';
return content.filter((b) => b && b.type === 'text' && typeof b.text === 'string').map((b) => b.text).join('\n').trim();
}

/** channel_id → 平台:bili:<UID> 是 B站私信,douyin:<名字> / douyin-group:<群名> 是抖音私信 / 群聊,其余(private:/group:)是 QQ。 */
export function platformOf(channelId) {
const s = String(channelId ?? '');
Expand Down
14 changes: 12 additions & 2 deletions lib/gateway.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import { applyAttachments, attachmentConfig } from './attachments.js';
import { parseCollect } from './stickers.js';
import { UNHEARD } from './voice.js';
import { saveVoiceFile, voiceIncomingEpoch, audioExt } from './voice-files.js';
import { typingDelayMs, interjectScore, interjectConfig, platformOf, splitChannelId, sessionChannelOf, isGroupChannelId, service, parseClosing, clampReplyWindow, normalizeRelayId } from './gateway-util.js';
import { typingDelayMs, interjectScore, interjectConfig, platformOf, splitChannelId, sessionChannelOf, isGroupChannelId, service, parseClosing, clampReplyWindow, normalizeRelayId, textOfUserMessage } from './gateway-util.js';
import { mediaMethods } from './gateway-media.js';
import { Outbox, classifySendError } from './outbox.js';
import { safeDownload } from './safe-download.js';
Expand Down Expand Up @@ -1690,7 +1690,14 @@ export class ChatGateway {
const pending = this.pendingVoicePaths?.get(String(msg?.id ?? ''));
st.voicePaths = kind === SOURCE_QQ && pending?.sessionId === sessionId && Date.now() - pending.at <= 300_000 ? pending.paths : [];
if (pending) this.pendingVoicePaths.delete(String(msg.id));
} else if (kind === 'user') { st.fromUs = false; st.dshTyped = true; st.voicePaths = []; } // #78:DSH 桌面端打字,不外发但要记动态
} else if (kind === 'user') {
st.fromUs = false; st.dshTyped = true; st.voicePaths = [];
// #78:主人自己打的字也记下来。动态页原来只显示她的发言 ⇒ 主人看到
// 「动态里只有一条 DSH,内容是她的发言,我的发言去哪了」。
// 记忆整理不受影响(他的发言经 beginTurn 的 speakers 进 journal),
// 缺的是动态页这一轮的上下文。
st.userText = textOfUserMessage(msg);
}
// 其他宿主上下文(runtime-context / model-selection 等):不动 fromUs ——
// 它们不是我们发的消息,但也不是真人打字,重置会把 B站/抖音 的回复憋回去(smoke #13 守着)
// 共享会话里一个会话对应多个通道(QQ + B站):这一轮从哪个通道进来的,来源里也带着 ——
Expand Down Expand Up @@ -1766,6 +1773,9 @@ export class ChatGateway {
this.note('dsh', {
channelId: st.channelId ?? this.bound.get(sessionId)?.channel_id ?? '',
text: String(st.text ?? '').slice(0, 60),
// 主人这一轮说了什么也带上(#78):动态页只显示她的发言,
// 主人会以为自己的话丢了。带上之后这一轮是完整的一问一答。
who: String(st.userText ?? '').trim() === '' ? '' : '主人:' + String(st.userText).trim().slice(0, 40),
reason: '在 DSH 里聊的,不外发',
memories: recall.memories ?? [],
recallAt: recall.at ?? 0,
Expand Down
4 changes: 2 additions & 2 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ async function startup(ctx, config, { log, gate }) {
});
const browser = new BiliBrowser({
db, clock, client: biliClient, getConfig: biliCfg, callLlm: llmRouter.bound('browse'), worker, log,
share: (x) => life.queueShare(x), note: (k, x) => gateway?.note(k, x),
share: (x) => life.queueShare(x), shareFallback: (x) => life.queueShareFallback(x), note: (k, x) => gateway?.note(k, x),
persona: () => ({ name: persona.name, brief: personaBrief() }),
// 抽帧看画面(bili.browse.frames 开才用):一条失败不影响她看完这条视频
// 超时 60s:CDN 卡住时 ffmpeg 永久挂起会拖死整轮 watch(),到点 kill 退回纯文字
Expand Down Expand Up @@ -380,7 +380,7 @@ async function startup(ctx, config, { log, gate }) {
// 抽帧看画面(douyin.browse.frames 开才用):play_addr 直链 → ffmpeg 九宫格。
// 超时 90 秒(抖音 CDN 会挂);一条失败不影响她看完这条,照旧只看文字。
frames: (v) => douyinFrames(v.urls, { id: v.id, durationMs: v.durationMs, signal: AbortSignal.timeout(90_000) }),
share: (x) => life.queueShare(x), note: (k, x) => gateway?.note(k, x),
share: (x) => life.queueShare(x), shareFallback: (x) => life.queueShareFallback(x), note: (k, x) => gateway?.note(k, x),
persona: () => ({ name: persona.name, brief: personaBrief() })
});
// 抖音自己发图文 / 回评论(默认都关;走专用浏览器,尽力而为)
Expand Down
Loading
Loading