feiyu-brain 1.6.2 → 1.6.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cli.mjs +10 -1
- package/core/apps.js +7 -0
- package/core/derive.js +9 -1
- package/core/driver.js +12 -1
- package/core/extract.js +3 -1
- package/core/persona.js +14 -4
- package/core/platforms.js +28 -0
- package/index.js +52 -2
- package/lib/dsh-plugin.mjs +11 -4
- package/lib/say.mjs +2 -1
- package/package.json +1 -1
- package/store.js +74 -4
package/cli.mjs
CHANGED
|
@@ -459,6 +459,15 @@ async function run() {
|
|
|
459
459
|
return;
|
|
460
460
|
}
|
|
461
461
|
|
|
462
|
+
case 'trait': {
|
|
463
|
+
const name = args[0];
|
|
464
|
+
if (!name) { line('用法:npx feiyu trait <维度名> [权重0~1]'); return; }
|
|
465
|
+
const w = Number(args[1] ?? 0.6);
|
|
466
|
+
const r = brain.defineTrait(ID, name, w);
|
|
467
|
+
line(r.ok ? `✔ 加上了「${r.name}」= ${r.weight}(现在共 ${r.total} 个维度)` : `✘ ${r.reason}`);
|
|
468
|
+
return;
|
|
469
|
+
}
|
|
470
|
+
|
|
462
471
|
case 'say': {
|
|
463
472
|
const flag = (f) => { const i = args.indexOf(f); return i >= 0 ? args[i + 1] : undefined; };
|
|
464
473
|
const via = flag('--via') || 'auto';
|
|
@@ -524,7 +533,7 @@ async function run() {
|
|
|
524
533
|
}
|
|
525
534
|
|
|
526
535
|
default:
|
|
527
|
-
line('用法:npx feiyu [status|brief|observe|settle|audit|spread|body|rebirth|snapshot|restore|snapshots|lint|import|migrate|verify|diary|doctor|serve|vocab|say|mouth]');
|
|
536
|
+
line('用法:npx feiyu [status|brief|observe|settle|audit|spread|body|rebirth|snapshot|restore|snapshots|lint|import|migrate|verify|diary|doctor|serve|vocab|say|mouth|trait]');
|
|
528
537
|
}
|
|
529
538
|
}
|
|
530
539
|
|
package/core/apps.js
CHANGED
|
@@ -27,6 +27,9 @@ function clamp01(n) {
|
|
|
27
27
|
|
|
28
28
|
/** 内容类型 ↔ 特质:谁爱看什么。这是"人设决定口味"的那张表。 */
|
|
29
29
|
export const AFFINITY = {
|
|
30
|
+
// 补两个平台:能存记忆,就该有口味
|
|
31
|
+
xiaohongshu: { 美妆: 0.9, 穿搭: 0.85, 旅行: 0.8, 美食: 0.85, 宠物: 0.8, 家居: 0.7, 学习: 0.6 },
|
|
32
|
+
video: { 老歌: 0.8, 翻唱: 0.8, 纪录片: 0.7, 情感: 0.7, 新闻: 0.6, 搞笑: 0.75 },
|
|
30
33
|
解压: { 懒: 0.8, 理性: 0.3, 好动: -0.3 },
|
|
31
34
|
搞笑: { 活泼: 0.9, 嘴硬: 0.4, 好奇: 0.3 },
|
|
32
35
|
动物: { 心软: 0.9, 活泼: 0.3 },
|
|
@@ -48,6 +51,10 @@ export const AFFINITY = {
|
|
|
48
51
|
* 这不对。看得多只会更懒。
|
|
49
52
|
*/
|
|
50
53
|
export const NUDGE = {
|
|
54
|
+
// 小红书:看得多会变得爱琢磨审美
|
|
55
|
+
xiaohongshu: { 敏感: 0.010, 爱反思: 0.006, 好奇: 0.006 },
|
|
56
|
+
// 视频号:看得多会变得慢一点、软一点
|
|
57
|
+
video: { 心软: 0.010, 敏感: 0.006, 活泼: -0.004 },
|
|
51
58
|
解压: { 懒: 1.0, 好动: -0.6 },
|
|
52
59
|
搞笑: { 活泼: 1.0, 嘴硬: 0.4 },
|
|
53
60
|
动物: { 心软: 1.0 },
|
package/core/derive.js
CHANGED
|
@@ -64,7 +64,15 @@ export function styleVector(traits) {
|
|
|
64
64
|
const denial = 0.8 * (traits.嘴硬 ?? 0) + 0.2 * (traits.敏感 ?? 0);
|
|
65
65
|
const fixed = 0.8 * (traits.固执 ?? 0) + 0.2 * (traits.自信 ?? 0);
|
|
66
66
|
const naive = Math.max(0.02, 1 - Math.max(aware, denial, fixed));
|
|
67
|
-
|
|
67
|
+
// 开放维度(卡里长出来的「洁癖」「工作狂」)不归任何固定轴,
|
|
68
|
+
// 但它们是"这个人独特的地方",单独给一个分量,宿主可以拿去用。
|
|
69
|
+
const KNOWN = new Set(['嘴硬', '心软', '好奇', '好动', '敏感', '固执', '自信', '爱反思', '理性', '社交', '活泼', '懒']);
|
|
70
|
+
const openVals = Object.entries(traits || {}).filter(([k]) => !KNOWN.has(k)).map(([, v]) => Number(v) || 0);
|
|
71
|
+
const custom = openVals.length ? Math.min(1, openVals.reduce((a, b) => a + b, 0) / openVals.length) : 0;
|
|
72
|
+
const vec = norm({ aware, denial, fixed, naive });
|
|
73
|
+
// 只有真的长出开放维度才挂这一项——否则会破坏"Σ4 = 1"的不变量
|
|
74
|
+
if (custom > 0) vec.custom = custom;
|
|
75
|
+
return vec;
|
|
68
76
|
}
|
|
69
77
|
|
|
70
78
|
/** 按 style 向量抽样。抽样由调用方传 rng(确定性输入),保证可回放。 */
|
package/core/driver.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { resolveTarget } from './platforms.js';
|
|
1
2
|
// 身体驱动:真的去开 App、真的去截图、真的去卸载。
|
|
2
3
|
//
|
|
3
4
|
// 三种驱动:
|
|
@@ -177,7 +178,8 @@ export class DesktopDriver {
|
|
|
177
178
|
return ok({ evidence: `desktop:scroll:${delta}` });
|
|
178
179
|
}
|
|
179
180
|
case 'open_app': {
|
|
180
|
-
const
|
|
181
|
+
const raw = action.target || action.package;
|
|
182
|
+
const target = resolveTarget(raw, { android: false });
|
|
181
183
|
if (!target) return fail('E_ARGS', 'open_app 需要 target');
|
|
182
184
|
await run('powershell', ['-NoProfile', '-Command', `Start-Process ${JSON.stringify(target)}`], { timeout: this.timeoutMs });
|
|
183
185
|
return ok({ evidence: `desktop:start:${target}`, app: target });
|
|
@@ -244,6 +246,15 @@ export class DryDriver {
|
|
|
244
246
|
* @param {object} body createBody() 的结果
|
|
245
247
|
* @param {object} [opts] { adbPath, deviceId, evidenceDir }
|
|
246
248
|
*/
|
|
249
|
+
function hasAdbDevice() {
|
|
250
|
+
try {
|
|
251
|
+
const out = require('node:child_process').execFileSync('adb', ['devices'], { timeout: 2000, encoding: 'utf8' });
|
|
252
|
+
return /\tdevice\b/.test(out);
|
|
253
|
+
} catch {
|
|
254
|
+
return false; // 没装 adb / 没设备
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
|
|
247
258
|
export function driverFor(body, opts = {}) {
|
|
248
259
|
if (!body) return new DryDriver();
|
|
249
260
|
if (body.kind === 'phone' || body.kind === 'tablet' || body.emulated) {
|
package/core/extract.js
CHANGED
|
@@ -24,7 +24,7 @@ export const TRAIT_LEXICON = {
|
|
|
24
24
|
};
|
|
25
25
|
|
|
26
26
|
/** 角色卡里可以直接写:`性格:嘴硬=0.9 心软=0.6` —— 手写覆盖自动统计 */
|
|
27
|
-
const HINT_RE = /^(?:性格|特质|traits)\s*[::]\s*(.+)$/im;
|
|
27
|
+
const HINT_RE = /^[\s#>*\-\d.、]*?(?:性格|特质|traits)\s*[::]\s*(.+)$/im;
|
|
28
28
|
|
|
29
29
|
/** 压缩指数:让"出现最多的特质"不至于把其余全部压到地板。
|
|
30
30
|
* 1.0 = 原始比例(很极端);0.7 = 感知上更接近"人都有一点"。 */
|
|
@@ -114,6 +114,8 @@ export function extractOpenTraits(cardText, { max = 8, known = null } = {}) {
|
|
|
114
114
|
const word = stripAdverb(String(raw ?? '').trim());
|
|
115
115
|
if (!word || word.length < 2 || word.length > 4) return;
|
|
116
116
|
if (NOT_TRAIT.has(word)) return;
|
|
117
|
+
// 系动词碎片:「是鱼」「的鱼」这种不是性格
|
|
118
|
+
if (/^[是的了在有和与或个只把被]/.test(word)) return;
|
|
117
119
|
if (knownTraitOf(word)) return; // 归到已知维度了,不重复
|
|
118
120
|
if (known && known[word] !== undefined) return;
|
|
119
121
|
counts.set(word, (counts.get(word) ?? 0) + 1);
|
package/core/persona.js
CHANGED
|
@@ -4,7 +4,11 @@
|
|
|
4
4
|
// 全部是纯函数:给定输入 → 确定输出。没有 IO,没有随机。
|
|
5
5
|
|
|
6
6
|
export const WEIGHT_STEP = 0.01; // 每次 ±0.01:100 次才显著 = "不知不觉"
|
|
7
|
-
|
|
7
|
+
// 每天 ×DAILY_DECAY。这个数不是拍的——它决定"多久没人提,这条性格就掉了"。
|
|
8
|
+
// 0.999 → 从 0.6 掉到 0.15 要 1386 天(3.8 年)→ 蜕皮永远不会发生
|
|
9
|
+
// 0.9975 → 约 730 天(2 年)→ 和"记忆两年遗忘"同一个尺度
|
|
10
|
+
// 人设淡忘不该比记忆慢:两年没人提的性格,就该沉进旧我。
|
|
11
|
+
export const DAILY_DECAY = 0.9975;
|
|
8
12
|
export const SHED_THRESHOLD = 0.15; // 低于此值沉进 formerSelves
|
|
9
13
|
|
|
10
14
|
const BRIEF_MAX_CHARS = 300;
|
|
@@ -102,12 +106,18 @@ export function speechProfile(traits = {}) {
|
|
|
102
106
|
- 0.20 * g('嘴硬'),
|
|
103
107
|
));
|
|
104
108
|
|
|
109
|
+
// 独特的地方越多,越懒得解释(洁癖/工作狂那种人通常话少而直接)
|
|
110
|
+
const KNOWN = new Set(['嘴硬', '心软', '好奇', '好动', '敏感', '固执', '自信', '爱反思', '理性', '社交', '活泼', '懒']);
|
|
111
|
+
const customVals = Object.entries(traits || {}).filter(([k]) => !KNOWN.has(k)).map(([, v]) => Number(v) || 0);
|
|
112
|
+
const customShare = customVals.length ? customVals.reduce((a, b) => a + b, 0) / customVals.length : 0;
|
|
113
|
+
const finalVerbosity = Math.max(0.05, verbosity - 0.15 * customShare);
|
|
114
|
+
|
|
105
115
|
// 话多 → brief 用满 300;话少 → 只有 130
|
|
106
|
-
const chars = Math.round(130 + 170 *
|
|
107
|
-
const label =
|
|
116
|
+
const chars = Math.round(130 + 170 * finalVerbosity);
|
|
117
|
+
const label = finalVerbosity > 0.66 ? '话多' : finalVerbosity > 0.36 ? '话一般' : '话少';
|
|
108
118
|
|
|
109
119
|
return {
|
|
110
|
-
verbosity: Number(
|
|
120
|
+
verbosity: Number(finalVerbosity.toFixed(2)),
|
|
111
121
|
label,
|
|
112
122
|
chars,
|
|
113
123
|
// 给宿主/调试看的一句话,不进 brief
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
// 平台 → 怎么打开。
|
|
2
|
+
//
|
|
3
|
+
// 「让她去开抖音」这句话要能真的落地,得知道在每个系统上它叫什么。
|
|
4
|
+
// 以前 Start-Process "douyin" 直接失败,因为没人做这层映射。
|
|
5
|
+
|
|
6
|
+
export const PLATFORMS = {
|
|
7
|
+
douyin: { name: '抖音', win: 'douyin', android: 'com.ss.android.ugc.aweme' },
|
|
8
|
+
kuaishou: { name: '快手', win: 'kuaishou', android: 'com.smile.gifmaker' },
|
|
9
|
+
bilibili: { name: 'B站', win: 'bilibili', android: 'tv.danmaku.bili' },
|
|
10
|
+
xiaohongshu: { name: '小红书', win: 'xiaohongshu', android: 'com.xingin.xhs' },
|
|
11
|
+
wechat: { name: '微信', win: 'WeChat', android: 'com.tencent.mm' },
|
|
12
|
+
qq: { name: 'QQ', win: 'QQ', android: 'com.tencent.mobileqq' },
|
|
13
|
+
video: { name: '视频号', win: 'WeChat', android: 'com.tencent.mm' },
|
|
14
|
+
weibo: { name: '微博', win: 'weibo', android: 'com.sina.weibo' },
|
|
15
|
+
browser: { name: '浏览器', win: 'msedge', android: 'com.android.chrome' },
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
/** 她说的平台名 → 这个系统上该传什么 */
|
|
19
|
+
export function resolveTarget(platform, { android = false } = {}) {
|
|
20
|
+
const key = String(platform ?? '').toLowerCase().trim();
|
|
21
|
+
const p = PLATFORMS[key];
|
|
22
|
+
if (!p) return String(platform ?? '');
|
|
23
|
+
return android ? p.android : p.win;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export function platformName(platform) {
|
|
27
|
+
return PLATFORMS[String(platform ?? '').toLowerCase()]?.name ?? String(platform ?? '');
|
|
28
|
+
}
|
package/index.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { execFileSync } from 'node:child_process';
|
|
1
2
|
// 对外只有几个方法:出生 / 取 brief / 唤醒 / 观察 / 结算 / 快照。
|
|
2
3
|
//
|
|
3
4
|
// 两种用法:
|
|
@@ -164,6 +165,13 @@ export function resolveRoleCard(roleName) {
|
|
|
164
165
|
name = null;
|
|
165
166
|
}
|
|
166
167
|
}
|
|
168
|
+
// 没写 current-role.json 时别直接放弃:roles/ 里只有一张卡,那就是她
|
|
169
|
+
if (!name) {
|
|
170
|
+
try {
|
|
171
|
+
const md = fs.readdirSync(roleDir()).filter((f) => f.toLowerCase().endsWith('.md'));
|
|
172
|
+
if (md.length === 1) name = md[0].replace(/\.md$/i, '');
|
|
173
|
+
} catch { /* 目录都没有 */ }
|
|
174
|
+
}
|
|
167
175
|
if (!name) return null;
|
|
168
176
|
const file = path.join(roleDir(), `${name}.md`);
|
|
169
177
|
if (!fs.existsSync(file)) return null;
|
|
@@ -417,9 +425,16 @@ export function observe(id = DEFAULT_ID, event = {}, opts = {}) {
|
|
|
417
425
|
const doEvolve = opts?.evolve !== false;
|
|
418
426
|
const doRemember = opts?.remember !== false;
|
|
419
427
|
|
|
420
|
-
|
|
428
|
+
// 事件归一化会只留下聊天字段,把"刷到了什么/什么反应"丢掉。
|
|
429
|
+
// 那样"经历改变性格"这条闭环永远不触发——所以这里先留下来再合并。
|
|
430
|
+
const KEEP = ['app', 'category', 'title', 'reaction', 'minutes', 'duration', 'valence', 'intensity', 'care', 'what'];
|
|
431
|
+
const kept = {};
|
|
432
|
+
for (const k of KEEP) if (event?.[k] !== undefined) kept[k] = event[k];
|
|
433
|
+
|
|
434
|
+
const evBase = event.consistent || event.conflicting || !event.sender
|
|
421
435
|
? event
|
|
422
436
|
: normalizeEvent(event, event.platform);
|
|
437
|
+
const ev = { ...evBase, ...kept };
|
|
423
438
|
|
|
424
439
|
const consistent = ev.consistent ?? matchUnits(brain.persona.units, ev.text ?? '').consistent;
|
|
425
440
|
const conflicting = ev.conflicting ?? matchUnits(brain.persona.units, ev.text ?? '').conflicting;
|
|
@@ -555,7 +570,14 @@ export function observe(id = DEFAULT_ID, event = {}, opts = {}) {
|
|
|
555
570
|
// 看的解压视频多了,"懒"这条特质就真的涨一点;人设变了,下次爱看的就不一样。
|
|
556
571
|
// evolve:false 时这条也关掉——只当记忆库用,就不该偷偷改人设。
|
|
557
572
|
if (doEvolve) {
|
|
558
|
-
|
|
573
|
+
// 特征漂移要的是"她在哪个 App 上看到什么、什么反应"。
|
|
574
|
+
// 原来传的是 ev.kind(永远是 'message'),NUDGE 里查不到 → 永远不触发。
|
|
575
|
+
const REACTION_SCORE = { like: 1, love: 1, favorite: 1, collect: 1, comment: 0.6, share: 0.5, view: 0.2, see: 0.2, skip: -1, dislike: -1, block: -1 };
|
|
576
|
+
const rawReaction = ev.reaction;
|
|
577
|
+
const reactionN = typeof rawReaction === 'number'
|
|
578
|
+
? rawReaction
|
|
579
|
+
: (REACTION_SCORE[String(rawReaction ?? '')] ?? (Number(rawReaction) || 0));
|
|
580
|
+
const { traits: nextTraits, delta } = nudgeTraits(brain.persona.traits, ev.category ?? ev.kind ?? ev.app ?? '', reactionN);
|
|
559
581
|
if (Object.keys(delta).length) {
|
|
560
582
|
brain.persona.traits = nextTraits;
|
|
561
583
|
brain.self.style = styleVector(nextTraits);
|
|
@@ -833,6 +855,8 @@ export function touch(id, key, { pool = 'facts' } = {}) {
|
|
|
833
855
|
* 没有身体也能活着——只是"想而不得"。
|
|
834
856
|
*/
|
|
835
857
|
export function setBody(id = DEFAULT_ID, kind, { ownership, apps, scope } = {}) {
|
|
858
|
+
// 允许直接传 { kind: 'desktop' },少踩一次坑
|
|
859
|
+
if (kind && typeof kind === 'object') kind = kind.kind;
|
|
836
860
|
const brain = ensureBrain(id);
|
|
837
861
|
const prev = brain.body?.kind ?? null;
|
|
838
862
|
brain.body = createBody({
|
|
@@ -1034,7 +1058,33 @@ export function cardsOf(id = DEFAULT_ID) {
|
|
|
1034
1058
|
|
|
1035
1059
|
const drivers = new Map(); // id -> driver
|
|
1036
1060
|
|
|
1061
|
+
/**
|
|
1062
|
+
* 老鱼的身体可能还写着 phone(它是在手机语境下长大的),搬到电脑上"手"就废了。
|
|
1063
|
+
* 不偷偷换身体——但真要用手的这一刻,发现这台机器根本没有手机,
|
|
1064
|
+
* 就当场纠正并记一笔,让她自己知道"我换了个身体"。
|
|
1065
|
+
*/
|
|
1066
|
+
function autoHealBody(brain) {
|
|
1067
|
+
const kind = brain?.body?.kind;
|
|
1068
|
+
if (kind !== 'phone' && kind !== 'tablet') return null;
|
|
1069
|
+
const onDesktop = process.platform === 'win32' || process.platform === 'darwin' || process.platform === 'linux';
|
|
1070
|
+
if (!onDesktop) return null;
|
|
1071
|
+
let hasAdb = false;
|
|
1072
|
+
try {
|
|
1073
|
+
const out = execFileSync('adb', ['devices'], { timeout: 2000, encoding: 'utf8' });
|
|
1074
|
+
hasAdb = /\tdevice\b/.test(String(out));
|
|
1075
|
+
} catch {
|
|
1076
|
+
hasAdb = false;
|
|
1077
|
+
}
|
|
1078
|
+
if (hasAdb) return null;
|
|
1079
|
+
const from = brain.body.kind;
|
|
1080
|
+
brain.body = { ...brain.body, kind: 'desktop', healedFrom: from, healedAt: nowMs() };
|
|
1081
|
+
try { appendAudit(brain.id, { kind: 'body-heal', from, to: 'desktop', why: '这台是电脑,没有手机设备' }); } catch { /* 记不上就算了 */ }
|
|
1082
|
+
return { from, to: 'desktop' };
|
|
1083
|
+
}
|
|
1084
|
+
|
|
1037
1085
|
function getDriver(brain) {
|
|
1086
|
+
// 老鱼可能还写着 phone,但这台是电脑——真要用手的这一刻当场纠正
|
|
1087
|
+
autoHealBody(brain);
|
|
1038
1088
|
const key = `${brain.id}:${brain.body?.kind}:${brain.body?.ownership}`;
|
|
1039
1089
|
if (drivers.has(key)) return drivers.get(key);
|
|
1040
1090
|
const d = driverFor(brain.body, {
|
package/lib/dsh-plugin.mjs
CHANGED
|
@@ -342,9 +342,9 @@ export function apply(ctx, entryConfig = {}) {
|
|
|
342
342
|
tool({
|
|
343
343
|
name: 'feiyu_app',
|
|
344
344
|
description:
|
|
345
|
-
'让她真的动起来:开 App
|
|
345
|
+
'让她真的动起来:开 App/网页、聚焦窗口、点击、打字、按键、滚动、截屏。'
|
|
346
346
|
+ '走真实设备——手机/平板用 adb,电脑用 PowerShell。没有设备返回 E_NO_DEVICE。'
|
|
347
|
-
+ '
|
|
347
|
+
+ '每个动作都留证据;没有证据的动作不算发生。卸载要过临界点+三问;shell 不在工具层开放(太危险)。',
|
|
348
348
|
parameters: {
|
|
349
349
|
type: 'object',
|
|
350
350
|
properties: {
|
|
@@ -374,10 +374,17 @@ export function apply(ctx, entryConfig = {}) {
|
|
|
374
374
|
|
|
375
375
|
const map = {
|
|
376
376
|
open: { type: 'open_app', package: pickStr(args?.package), target: pickStr(args?.target), capability: 2 },
|
|
377
|
+
open_app: { type: 'open_app', package: pickStr(args?.package), target: pickStr(args?.target), capability: 2 },
|
|
378
|
+
open_url: { type: 'open_url', url: pickStr(args?.target) || pickStr(args?.package), capability: 2 },
|
|
379
|
+
focus: { type: 'focus', title: pickStr(args?.target), capability: 1 },
|
|
380
|
+
click: { type: 'click', x: Number(args?.x), y: Number(args?.y), capability: 1 },
|
|
381
|
+
type: { type: 'type', text: pickStr(args?.target), capability: 1 },
|
|
382
|
+
key: { type: 'key', key: pickStr(args?.target), capability: 1 },
|
|
383
|
+
scroll: { type: 'scroll', delta: Number(args?.delta ?? -3), capability: 1 },
|
|
377
384
|
screenshot: { type: 'screenshot', capability: 1 },
|
|
378
385
|
};
|
|
379
386
|
const act = map[action];
|
|
380
|
-
if (!act) return { ok: false, code: 'E_ARGS', text: '❌ action 只能是 open / screenshot / uninstall' };
|
|
387
|
+
if (!act) return { ok: false, code: 'E_ARGS', text: '❌ action 只能是 open / open_url / focus / click / type / key / scroll / screenshot / uninstall' };
|
|
381
388
|
|
|
382
389
|
const r = await brain.execAction(id, act);
|
|
383
390
|
if (r.ok === false) return { ok: false, code: r.code, text: `❌ ${r.reason ?? r.code}` };
|
|
@@ -403,7 +410,7 @@ export function apply(ctx, entryConfig = {}) {
|
|
|
403
410
|
let text = raw;
|
|
404
411
|
if (!text) {
|
|
405
412
|
const card = brain.resolveRoleCard();
|
|
406
|
-
if (!card?.text) return fail('没有现成的卡可读;把卡内容贴进 text
|
|
413
|
+
if (!card?.text) return fail('没有现成的卡可读;把卡内容贴进 text 参数,或先建一张卡(npx feiyu status 有引导)');
|
|
407
414
|
text = card.text;
|
|
408
415
|
}
|
|
409
416
|
const r = brain.lintCard(text);
|
package/lib/say.mjs
CHANGED
|
@@ -130,5 +130,6 @@ export async function say({ text = '', via = 'auto', title = '', target = '', en
|
|
|
130
130
|
return { ok: false, code: 'E_SEND', via, text: String(e?.message ?? e).slice(0, 200) };
|
|
131
131
|
}
|
|
132
132
|
}
|
|
133
|
-
|
|
133
|
+
// 只给 target 不给 title 时也要能用(工具层传的是 target)
|
|
134
|
+
return sendToWindow({ title: title || target, text, enter, dryRun });
|
|
134
135
|
}
|
package/package.json
CHANGED
package/store.js
CHANGED
|
@@ -142,10 +142,30 @@ function writeYearShard(id, year, list) {
|
|
|
142
142
|
try { if (fs.existsSync(file)) fs.unlinkSync(file); } catch { /* 删不掉也无所谓 */ }
|
|
143
143
|
return null;
|
|
144
144
|
}
|
|
145
|
-
|
|
145
|
+
// 多进程同时写同一个脑:每个进程内存里各有一份,
|
|
146
|
+
// 直接整文件重写 = 后写的把先写的全盖掉(实测 3 进程丢 2/3)。
|
|
147
|
+
// 所以落盘前先把它现在磁盘上的读回来,按 id 合并。
|
|
148
|
+
const onDisk = (() => {
|
|
149
|
+
try { return readYearShard(id, year); } catch { return []; }
|
|
150
|
+
})();
|
|
151
|
+
const merged = (() => {
|
|
152
|
+
const byId = new Map();
|
|
153
|
+
const key = (e) => e?.id ?? `${e?.at ?? 0}|${String(e?.what ?? e?.text ?? '').slice(0, 24)}`;
|
|
154
|
+
for (const e of onDisk) byId.set(key(e), e);
|
|
155
|
+
for (const e of list) byId.set(key(e), e);
|
|
156
|
+
return [...byId.values()].sort((a, b) => (a.at ?? 0) - (b.at ?? 0));
|
|
157
|
+
})();
|
|
158
|
+
|
|
159
|
+
const body = `${merged.map((e) => JSON.stringify(e)).join('\n')}\n`;
|
|
146
160
|
const tmp = `${file}.${process.pid}.tmp`;
|
|
147
161
|
fs.writeFileSync(tmp, body, 'utf8');
|
|
148
|
-
|
|
162
|
+
for (let attempt = 0; ; attempt += 1) {
|
|
163
|
+
try { renameWithRetry(tmp, file); break; } catch (e) {
|
|
164
|
+
if (attempt >= 5) throw e;
|
|
165
|
+
const until = Date.now() + 20;
|
|
166
|
+
while (Date.now() < until) { /* 让出一下,等占用释放 */ }
|
|
167
|
+
}
|
|
168
|
+
}
|
|
149
169
|
const ats = list.map((e) => Number(e.at) || 0).filter(Boolean);
|
|
150
170
|
return {
|
|
151
171
|
count: list.length,
|
|
@@ -165,11 +185,23 @@ function readYearShard(id, year) {
|
|
|
165
185
|
}
|
|
166
186
|
return out;
|
|
167
187
|
}
|
|
168
|
-
export function
|
|
188
|
+
export function renameWithRetry(from, to, tries = 8) {
|
|
189
|
+
let last;
|
|
190
|
+
for (let i = 0; i < tries; i += 1) {
|
|
191
|
+
try { fs.renameSync(from, to); return true; } catch (e) {
|
|
192
|
+
last = e;
|
|
193
|
+
const until = Date.now() + 15 * (i + 1);
|
|
194
|
+
while (Date.now() < until) { /* 让出 CPU 等占用释放 */ }
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
throw last;
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
function writeJsonAtomic(file, data) {
|
|
169
201
|
ensureDir(path.dirname(file));
|
|
170
202
|
const tmp = `${file}.${process.pid}.tmp`;
|
|
171
203
|
fs.writeFileSync(tmp, `${JSON.stringify(data, null, 2)}\n`, 'utf8');
|
|
172
|
-
|
|
204
|
+
renameWithRetry(tmp, file);
|
|
173
205
|
}
|
|
174
206
|
|
|
175
207
|
const AUDIT_MAX_BYTES = 2 * 1024 * 1024;
|
|
@@ -286,7 +318,45 @@ export function listYears(id) {
|
|
|
286
318
|
.sort((a, b) => a.year - b.year);
|
|
287
319
|
}
|
|
288
320
|
|
|
321
|
+
/**
|
|
322
|
+
* 一把粗糙但有效的文件锁。
|
|
323
|
+
*
|
|
324
|
+
* 三个进程同时写同一个脑时,各自内存里有一份,"读-改-写"必然互相覆盖。
|
|
325
|
+
* 加锁串行化之后,每次写都能看见别人刚写的东西。
|
|
326
|
+
*/
|
|
327
|
+
function withLock(id, fn) {
|
|
328
|
+
if (!fs.existsSync(brainDir(id))) ensureDir(brainDir(id));
|
|
329
|
+
const lock = path.join(brainDir(id), '.lock');
|
|
330
|
+
const deadline = Date.now() + 5000;
|
|
331
|
+
let fd = null;
|
|
332
|
+
while (Date.now() < deadline) {
|
|
333
|
+
try {
|
|
334
|
+
fd = fs.openSync(lock, 'wx');
|
|
335
|
+
break;
|
|
336
|
+
} catch (e) {
|
|
337
|
+
if (e.code !== 'EEXIST') throw e;
|
|
338
|
+
// 陈旧锁(进程死了没删):超过 10 秒就当它没用
|
|
339
|
+
try {
|
|
340
|
+
if (Date.now() - fs.statSync(lock).mtimeMs > 10000) { fs.unlinkSync(lock); continue; }
|
|
341
|
+
} catch { /* 别人刚删 */ }
|
|
342
|
+
const until = Date.now() + 8;
|
|
343
|
+
while (Date.now() < until) { /* 等一会儿再试 */ }
|
|
344
|
+
}
|
|
345
|
+
}
|
|
346
|
+
if (fd === null) return fn(); // 拿不到锁也别卡死,退回无锁写
|
|
347
|
+
try {
|
|
348
|
+
return fn();
|
|
349
|
+
} finally {
|
|
350
|
+
try { fs.closeSync(fd); } catch { /* 忽略 */ }
|
|
351
|
+
try { fs.unlinkSync(lock); } catch { /* 忽略 */ }
|
|
352
|
+
}
|
|
353
|
+
}
|
|
354
|
+
|
|
289
355
|
export function saveBrain(brain) {
|
|
356
|
+
return withLock(brain.id, () => saveBrainUnlocked(brain));
|
|
357
|
+
}
|
|
358
|
+
|
|
359
|
+
function saveBrainUnlocked(brain) {
|
|
290
360
|
const file = brainFile(brain.id);
|
|
291
361
|
try {
|
|
292
362
|
if (fs.existsSync(file)) fs.copyFileSync(file, `${file}.bak`);
|