feiyu-brain 1.6.3 → 1.6.5

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/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/body.js CHANGED
@@ -52,7 +52,9 @@ export const CAPABILITY = {
52
52
  /** 不同归属默认给到哪一级。L4 永不默认。 */
53
53
  export const DEFAULT_SCOPE = {
54
54
  owned: [CAPABILITY.OBSERVE, CAPABILITY.OPERATE, CAPABILITY.DESTROY],
55
- borrowed: [CAPABILITY.OBSERVE, CAPABILITY.OPERATE],
55
+ // 借来的设备只给「看」。打字/点击/按键会打到别人的窗口里,
56
+ // 要动手必须先显式升级(ownership='owned' 或经授权)。
57
+ borrowed: [CAPABILITY.OBSERVE],
56
58
  emulator: [CAPABILITY.OBSERVE, CAPABILITY.OPERATE, CAPABILITY.DESTROY],
57
59
  };
58
60
 
package/core/driver.js CHANGED
@@ -1,3 +1,5 @@
1
+ import { resolveTarget } from './platforms.js';
2
+ import { findDesktopApp, notInstalledHint } from './findapp.js';
1
3
  // 身体驱动:真的去开 App、真的去截图、真的去卸载。
2
4
  //
3
5
  // 三种驱动:
@@ -177,8 +179,11 @@ export class DesktopDriver {
177
179
  return ok({ evidence: `desktop:scroll:${delta}` });
178
180
  }
179
181
  case 'open_app': {
180
- const target = action.target || action.package;
182
+ const raw = action.target || action.package;
183
+ const target = resolveTarget(raw, { android: false });
181
184
  if (!target) return fail('E_ARGS', 'open_app 需要 target');
185
+ // 名字 → 真的找得到才开;找不到就明说没装
186
+ if (!findDesktopApp(target)) return fail('E_NOT_INSTALLED', notInstalledHint(raw));
182
187
  await run('powershell', ['-NoProfile', '-Command', `Start-Process ${JSON.stringify(target)}`], { timeout: this.timeoutMs });
183
188
  return ok({ evidence: `desktop:start:${target}`, app: target });
184
189
  }
@@ -0,0 +1,74 @@
1
+ // 桌面程序到底能不能开。
2
+ //
3
+ // 光有"名字"没用:Windows 上 douyin / WeChat 都不在 PATH 里。
4
+ // 但**不许瞎猜路径**——没装就是没装,要说清楚。
5
+ //
6
+ // 顺序:PATH → 注册表 App Paths → 明确失败。
7
+
8
+ import fs from 'node:fs';
9
+ import { execFileSync } from 'node:child_process';
10
+ import { PLATFORMS } from './platforms.js';
11
+
12
+ /** 已知一定能开的(Windows 自带) */
13
+ export const ALWAYS_OPENABLE = ['notepad', 'calc', 'mspaint', 'explorer', 'cmd', 'msedge'];
14
+
15
+ function viaPath(name) {
16
+ try {
17
+ const out = execFileSync('where.exe', [name], { timeout: 2000, encoding: 'utf8' });
18
+ const first = String(out).split(/\r?\n/).map((x) => x.trim()).find(Boolean);
19
+ return first || null;
20
+ } catch {
21
+ return null;
22
+ }
23
+ }
24
+
25
+ function viaRegistry(name) {
26
+ const base = name.replace(/\.exe$/i, '');
27
+ const ps = [
28
+ `$p = (Get-ItemProperty "HKLM:\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\${base}.exe" -ErrorAction SilentlyContinue).'(default)'`,
29
+ 'if ($p) { Write-Output $p }',
30
+ ].join('; ');
31
+ try {
32
+ const out = execFileSync('powershell', ['-NoProfile', '-Command', ps], { timeout: 3000, encoding: 'utf8' });
33
+ const first = String(out).trim().split(/\r?\n/).map((x) => x.trim()).find(Boolean);
34
+ return first || null;
35
+ } catch {
36
+ return null;
37
+ }
38
+ }
39
+
40
+ /**
41
+ * 找得到就返回绝对路径,找不到返回 null。
42
+ * **不编路径**——这台电脑没装,就该说没装。
43
+ */
44
+ export function findDesktopApp(name) {
45
+ const raw = String(name ?? '').trim();
46
+ if (!raw) return null;
47
+ if (/^[A-Za-z]:[\\/]/.test(raw)) return fs.existsSync(raw) ? raw : null;
48
+
49
+ const candidates = [raw];
50
+ if (!/\.exe$/i.test(raw)) candidates.push(raw + '.exe');
51
+
52
+ for (const c of candidates) {
53
+ const p = viaPath(c);
54
+ if (p) return p;
55
+ }
56
+ for (const c of candidates) {
57
+ const p = viaRegistry(c);
58
+ if (p && fs.existsSync(p)) return p;
59
+ }
60
+ return null;
61
+ }
62
+
63
+ /** 找不到时给她一句能照做的话 */
64
+ export function notInstalledHint(name) {
65
+ const key = String(name ?? '').toLowerCase();
66
+ const p = PLATFORMS[key];
67
+ const label = p ? p.name : String(name ?? '');
68
+ return [
69
+ '这台电脑上没找到「' + label + '」。',
70
+ '可能没装,也可能装在很偏的地方。',
71
+ '现在能直接开的:' + ALWAYS_OPENABLE.join(' / ') + '。',
72
+ '要开别的,就把完整路径当 target 传进来。',
73
+ ].join('');
74
+ }
@@ -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
@@ -165,6 +165,13 @@ export function resolveRoleCard(roleName) {
165
165
  name = null;
166
166
  }
167
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
+ }
168
175
  if (!name) return null;
169
176
  const file = path.join(roleDir(), `${name}.md`);
170
177
  if (!fs.existsSync(file)) return null;
@@ -570,7 +577,7 @@ export function observe(id = DEFAULT_ID, event = {}, opts = {}) {
570
577
  const reactionN = typeof rawReaction === 'number'
571
578
  ? rawReaction
572
579
  : (REACTION_SCORE[String(rawReaction ?? '')] ?? (Number(rawReaction) || 0));
573
- const { traits: nextTraits, delta } = nudgeTraits(brain.persona.traits, ev.category ?? ev.app ?? '', reactionN);
580
+ const { traits: nextTraits, delta } = nudgeTraits(brain.persona.traits, ev.category ?? ev.kind ?? ev.app ?? '', reactionN);
574
581
  if (Object.keys(delta).length) {
575
582
  brain.persona.traits = nextTraits;
576
583
  brain.self.style = styleVector(nextTraits);
@@ -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,33 @@ 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: 2 },
380
+ // 点一下、打一段字、按个键、滚一下——这些会真的作用到**当前焦点窗口**,
381
+ // 不是"看一眼"。所以统统一律 OPERATE,而且没 approved 就先干跑。
382
+ click: { type: 'click', x: Number(args?.x), y: Number(args?.y), capability: 2 },
383
+ type: { type: 'type', text: pickStr(args?.target), capability: 2 },
384
+ key: { type: 'key', key: pickStr(args?.target), capability: 2 },
385
+ scroll: { type: 'scroll', delta: Number(args?.delta ?? -3), capability: 2 },
377
386
  screenshot: { type: 'screenshot', capability: 1 },
378
387
  };
379
388
  const act = map[action];
380
- if (!act) return { ok: false, code: 'E_ARGS', text: '❌ action 只能是 open / screenshot / uninstall' };
389
+ if (!act) return { ok: false, code: 'E_ARGS', text: '❌ action 只能是 open / open_url / focus / click / type / key / scroll / screenshot / uninstall' };
390
+
391
+ // 会真的作用到桌面上的动作,第一次先干跑。
392
+ // 想真的做,再调一次并传 approved: true。
393
+ const approved = args?.approved === true;
394
+ if (act.capability >= 2 && !approved && action !== 'open' && action !== 'open_app') {
395
+ return {
396
+ ok: false,
397
+ code: 'E_NEED_APPROVAL',
398
+ text: `⚠️ 这是干跑:${action} ${JSON.stringify(act).slice(0, 80)}\n`
399
+ + '它会真的作用到你现在的焦点窗口。确认要做,就再调一次并传 approved: true。',
400
+ dryRun: true,
401
+ would: act,
402
+ };
403
+ }
381
404
 
382
405
  const r = await brain.execAction(id, act);
383
406
  if (r.ok === false) return { ok: false, code: r.code, text: `❌ ${r.reason ?? r.code}` };
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
- return sendToWindow({ title, text, enter, dryRun });
133
+ // 只给 target 不给 title 时也要能用(工具层传的是 target)
134
+ return sendToWindow({ title: title || target, text, enter, dryRun });
134
135
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "feiyu-brain",
3
- "version": "1.6.3",
3
+ "version": "1.6.5",
4
4
  "description": "给 AI 装一颗有记忆、有情绪、会变化的脑;带上嘴(外接 OneBot/官方)和手(点、打、滑、执行)。",
5
5
  "type": "module",
6
6
  "license": "MIT",
package/selftest.mjs CHANGED
@@ -267,9 +267,11 @@ t('三具身体都能造出来', () => {
267
267
  }
268
268
  });
269
269
 
270
- t('借来的手机不能删软件(没有 L3)', () => {
270
+ t('借来的设备只能看,不能动手也不能删', () => {
271
271
  const b = createBody({ kind: 'phone', ownership: 'borrowed' });
272
- assert.equal(canDo(b, { capability: CAPABILITY.OPERATE }).ok, true);
272
+ // 借来的设备打字/点击会打到别人的窗口里,所以连 OPERATE 都不给(1.6.5 起)
273
+ assert.equal(canDo(b, { capability: CAPABILITY.OBSERVE }).ok, true);
274
+ assert.equal(canDo(b, { capability: CAPABILITY.OPERATE }).ok, false);
273
275
  assert.equal(canDo(b, { capability: CAPABILITY.DESTROY }).ok, false);
274
276
  });
275
277
 
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
- const body = `${list.map((e) => JSON.stringify(e)).join('\n')}\n`;
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
- fs.renameSync(tmp, file);
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 writeJsonAtomic(file, data) {
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
- fs.renameSync(tmp, file);
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`);