feiyu-brain 1.6.0 → 1.6.2

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 CHANGED
@@ -441,7 +441,7 @@ async function run() {
441
441
  line(' 或者手工指定:npx feiyu say --via onebot --base http://127.0.0.1:3000 --token xxx');
442
442
  return;
443
443
  }
444
- C.saveChannels(brain.dataDir(), found.map(({ impl, implName, baseUrl, token, uin, nickname }) => ({ impl, implName, baseUrl, token, uin, nickname })));
444
+ C.saveChannels(brain.dataDir(), found.map(({ impl, implName, baseUrl, token, uin, nickname, file }) => ({ impl, implName, baseUrl, token, file, uin, nickname })));
445
445
  line(`✔ 找到 ${found.length} 个,已记住`);
446
446
  for (const f of found) line(` ${f.implName.padEnd(16)} ${f.baseUrl} ${f.uin ?? ''} ${f.nickname ?? ''}`);
447
447
  return;
@@ -461,7 +461,7 @@ async function run() {
461
461
 
462
462
  case 'say': {
463
463
  const flag = (f) => { const i = args.indexOf(f); return i >= 0 ? args[i + 1] : undefined; };
464
- const via = flag('--via') || 'window';
464
+ const via = flag('--via') || 'auto';
465
465
  const target = flag('--target') || flag('--to') || '';
466
466
  const skip = new Set(['--via', '--target', '--to', '--kind', '--base', '--token']);
467
467
  const words = [];
@@ -483,6 +483,8 @@ async function run() {
483
483
  kind: flag('--kind') || 'group',
484
484
  baseUrl: flag('--base') || '',
485
485
  token: flag('--token') || '',
486
+ dataDir: brain.dataDir(),
487
+ allowDirect: true, // 用户在命令行亲口说要发,算显式授权
486
488
  });
487
489
  if (!r.ok) {
488
490
  line(`✘ ${r.code}: ${r.text}`);
package/index.js CHANGED
@@ -2008,6 +2008,29 @@ export async function speak(id = DEFAULT_ID, event = {}, { mouth = null, section
2008
2008
  }
2009
2009
 
2010
2010
  export function snapshot(id = DEFAULT_ID) {
2011
+ // 崩在宿主里 = 她一句话都发不出来。所以这里一律兜住,给人话。
2012
+ // 但"坏档"不是"没卡":坏档必须喊出来,绝不能当空壳继续跑。
2013
+ try {
2014
+ return snapshotInner(id);
2015
+ } catch (e) {
2016
+ if (e && e.code === 'E_BRAIN_CORRUPT') throw e;
2017
+ return {
2018
+ ok: false,
2019
+ code: 'E_NO_CARD',
2020
+ text: '找不到角色卡:她还没有人设,所以现在只是个空壳。',
2021
+ guide: {
2022
+ step1: '写一张卡:~/.feiyu-brain/roles/<名字>.md(第一行写你是谁,后面一行一条:性格、说话方式、不能做什么)',
2023
+ step2: 'npx feiyu lint —— 检查卡有没有写歪',
2024
+ step3: 'npx feiyu status —— 再来看她',
2025
+ },
2026
+ detail: String(e?.message ?? e).slice(0, 160),
2027
+ dataDir: dataDir(),
2028
+ roleDir: roleDir(),
2029
+ };
2030
+ }
2031
+ }
2032
+
2033
+ function snapshotInner(id = DEFAULT_ID) {
2011
2034
  const brain = ensureBrain(id);
2012
2035
  const level = flowLevel(brain.state, { boredom: brain.drive.boredom });
2013
2036
  return {
package/lib/channels.mjs CHANGED
@@ -136,6 +136,7 @@ export async function detect({ extraTokens = [], timeoutMs = 2500 } = {}) {
136
136
  token,
137
137
  uin: r.data?.user_id ?? null,
138
138
  nickname: r.data?.nickname ?? '',
139
+ file: seed?.file ?? '',
139
140
  source: seed ? `config:${seed.file}` : 'probe',
140
141
  });
141
142
  break; // 这个端口通了就不试别的 token
@@ -163,10 +164,44 @@ export function loadChannels(dataDir) {
163
164
  }
164
165
  }
165
166
 
167
+ /**
168
+ * 存通道。
169
+ *
170
+ * **不存明文 token**——只存"从哪读"(tokenRef)。
171
+ * 磁盘上多一份明文 token,等于多一个泄漏面。
172
+ *
173
+ * 权限 0600:只有本人能读。
174
+ */
166
175
  export function saveChannels(dataDir, channels) {
176
+ if (!dataDir) return 0; // 没指定就不落盘——绝不写第二份
167
177
  fs.mkdirSync(channelsDir(dataDir), { recursive: true });
168
- fs.writeFileSync(channelsFile(dataDir), `${JSON.stringify({ version: 1, channels }, null, 2)}\n`, 'utf8');
169
- return channels.length;
178
+ const safe = channels.map((ch) => {
179
+ const { token, ...rest } = ch;
180
+ // 有来源文件就存引用;否则存 env 名;再否则只能存内存标记
181
+ const tokenRef = ch.tokenRef
182
+ ?? (ch.file ? { kind: 'file', path: ch.file } : (token ? { kind: 'inline-redacted' } : null));
183
+ return { ...rest, tokenRef };
184
+ });
185
+ const file = channelsFile(dataDir);
186
+ fs.writeFileSync(file, `${JSON.stringify({ version: 2, channels: safe }, null, 2)}\n`, { encoding: 'utf8', mode: 0o600 });
187
+ try { fs.chmodSync(file, 0o600); } catch { /* 平台不支持就算了 */ }
188
+ return safe.length;
189
+ }
190
+
191
+ /** 用的时候才把 token 取出来(从文件/环境变量),不留在磁盘上 */
192
+ export function resolveToken(ch) {
193
+ const ref = ch?.tokenRef;
194
+ if (!ref) return ch?.token ?? '';
195
+ if (ref.kind === 'env') return process.env[ref.name] ?? '';
196
+ if (ref.kind === 'file') {
197
+ try {
198
+ const text = fs.readFileSync(ref.path, 'utf8');
199
+ const m = text.match(/"accessToken"\s*:\s*"([^"]+)"/);
200
+ if (m) return m[1];
201
+ } catch { /* 文件没了 */ }
202
+ return '';
203
+ }
204
+ return '';
170
205
  }
171
206
 
172
207
  /**
@@ -177,13 +212,13 @@ export async function resolveMouth({ dataDir, prefer = '' } = {}) {
177
212
  const ordered = prefer ? [...saved.filter((c) => c.impl === prefer), ...saved.filter((c) => c.impl !== prefer)] : saved;
178
213
 
179
214
  for (const c of ordered) {
180
- const r = await probe(c.baseUrl, c.token);
181
- if (r.ok) return { ...c, alive: true, source: 'saved' };
215
+ const r = await probe(c.baseUrl, resolveToken(c));
216
+ if (r.ok) return { ...c, token: resolveToken(c), alive: true, source: 'saved' };
182
217
  }
183
218
  const found = await detect();
184
219
  if (!found.length) return null;
185
220
  // 发现到了就存下来,下次直接用
186
- saveChannels(dataDir, found.map(({ impl, implName, baseUrl, token, uin, nickname }) => ({ impl, implName, baseUrl, token, uin, nickname })));
221
+ saveChannels(dataDir, found.map(({ impl, implName, baseUrl, token, uin, nickname, file }) => ({ impl, implName, baseUrl, token, file, uin, nickname })));
187
222
  return { ...found[0], source: 'detected' };
188
223
  }
189
224
 
@@ -192,8 +227,8 @@ export async function statusOf(dataDir) {
192
227
  const saved = loadChannels(dataDir);
193
228
  const out = [];
194
229
  for (const c of saved) {
195
- const r = await probe(c.baseUrl, c.token);
196
- out.push({ ...c, alive: r.ok, uin: r.data?.user_id ?? c.uin, nickname: r.data?.nickname ?? c.nickname });
230
+ const r = await probe(c.baseUrl, resolveToken(c));
231
+ out.push({ ...c, token: '', alive: r.ok, uin: r.data?.user_id ?? c.uin, nickname: r.data?.nickname ?? c.nickname });
197
232
  }
198
233
  return out;
199
234
  }
package/lib/checks.mjs ADDED
@@ -0,0 +1,70 @@
1
+ // 数据侧体检:不是"装没装上",是"能不能长期跑"。
2
+ //
3
+ // 铺到无数条鱼之后,真正出事的是这些:
4
+ // 没有 current-role.json / 口令权限太松 / 审计无限长 / 有隔离档没处理
5
+
6
+ import fs from 'node:fs';
7
+ import path from 'node:path';
8
+
9
+ const ok = (key, text) => ({ level: 'ok', key, text });
10
+ const warn = (key, text, fix) => ({ level: 'warn', key, text, fix });
11
+
12
+ export function dataChecks({ dataDir, id = 'default' } = {}) {
13
+ const out = [];
14
+ if (!dataDir) return out;
15
+
16
+ // ① 角色卡指针
17
+ const cur = path.join(dataDir, 'current-role.json');
18
+ if (!fs.existsSync(cur)) {
19
+ out.push(warn(
20
+ 'current-role',
21
+ '没有 current-role.json —— 光把卡放进 roles/ 还不行,她不知道用哪一张',
22
+ `写 {"role":"<卡名>"} 到 ${cur}`,
23
+ ));
24
+ } else {
25
+ out.push(ok('current-role', 'current-role.json 存在'));
26
+ }
27
+
28
+ // ② 通道口令
29
+ const ch = path.join(dataDir, 'channels.json');
30
+ if (fs.existsSync(ch)) {
31
+ let mode = 0;
32
+ try { mode = fs.statSync(ch).mode & 0o777; } catch { /* 忽略 */ }
33
+ // Windows 上 chmod 基本无效(只映射成只读属性),别给假警告
34
+ if (process.platform !== 'win32' && mode && mode !== 0o600) {
35
+ out.push(warn('channels-mode', `channels.json 权限 ${mode.toString(8)},太松`, `chmod 600 ${ch}`));
36
+ } else {
37
+ out.push(ok('channels-mode', process.platform === 'win32' ? 'channels.json 权限(Windows 由 ACL 决定)' : `channels.json 权限 ${mode.toString(8)}`));
38
+ }
39
+ try {
40
+ const raw = fs.readFileSync(ch, 'utf8');
41
+ if (/"(?:token|accessToken)"\s*:\s*"[^"]{8,}"/.test(raw)) {
42
+ out.push(warn('channels-plain', 'channels.json 里还有明文口令', '重跑 npx feiyu mouth detect(会改存引用)'));
43
+ } else {
44
+ out.push(ok('channels-plain', 'channels.json 没有明文口令'));
45
+ }
46
+ } catch { /* 读不了跳过 */ }
47
+ }
48
+
49
+ // ③ 审计体积
50
+ const audit = path.join(dataDir, 'brains', id, 'audit.jsonl');
51
+ if (fs.existsSync(audit)) {
52
+ const size = fs.statSync(audit).size;
53
+ const mb = size / 1024 / 1024;
54
+ out.push(mb > 4
55
+ ? warn('audit-size', `audit.jsonl ${mb.toFixed(1)} MB,该轮转了`)
56
+ : ok('audit-size', `audit.jsonl ${mb.toFixed(1)} MB`));
57
+ }
58
+
59
+ // ④ 隔离档(坏过)
60
+ try {
61
+ const broken = fs.readdirSync(path.join(dataDir, 'brains', id)).filter((f) => f.includes('.broken-'));
62
+ if (broken.length) {
63
+ out.push(warn('broken', `有 ${broken.length} 个隔离档没处理:${broken.join(', ')}`, 'npx feiyu restore <快照名>,或手工看'));
64
+ } else {
65
+ out.push(ok('broken', '没有隔离档'));
66
+ }
67
+ } catch { /* 没有这个鱼 */ }
68
+
69
+ return out;
70
+ }
package/lib/doctor.mjs CHANGED
@@ -7,7 +7,7 @@
7
7
  //
8
8
  // 剩下的(数据目录、角色卡)本来就归它自己管。
9
9
 
10
- import fs from 'node:fs';
10
+ import { dataChecks } from './checks.mjs';
11
11
  import os from 'node:os';
12
12
  import path from 'node:path';
13
13
  import { execFileSync } from 'node:child_process';
@@ -52,12 +52,26 @@ function hasPnpm() {
52
52
  * 体检。只读,不改任何东西。
53
53
  * @returns {{ok:boolean, checks:Array}}
54
54
  */
55
- export function diagnose({ profile = 'desktop', packageName = 'feiyu-brain' } = {}) {
55
+ export function diagnose({ profile = 'desktop', packageName = 'feiyu-brain', dataDir = '', brainId = 'default' } = {}) {
56
56
  const home = dshHome();
57
57
  const profileFile = path.join(home, 'profiles', profile, 'package.json');
58
58
  const allowFile = path.join(home, 'state', 'tool-allow.json');
59
59
  const checks = [];
60
60
 
61
+ // ⓪ 数据侧:能不能长期跑(角色卡指针 / 口令权限 / 审计 / 隔离档)
62
+ try {
63
+ for (const c of dataChecks({ dataDir, id: brainId })) {
64
+ checks.push({
65
+ id: c.key,
66
+ level: c.level,
67
+ title: c.text,
68
+ detail: '',
69
+ fixable: false,
70
+ fix: c.fix ?? '',
71
+ });
72
+ }
73
+ } catch { /* 数据检查失败不影响装机检查 */ }
74
+
61
75
  // ① pnpm
62
76
  const pnpm = hasPnpm();
63
77
  checks.push({
@@ -118,6 +118,18 @@ export function apply(ctx, entryConfig = {}) {
118
118
  try {
119
119
  return safe(await spec.execute(args));
120
120
  } catch (e) {
121
+ // 边界兜底:不把堆栈丢给模型,给一句能照做的话
122
+ const msg = String(e?.message ?? e);
123
+ if (e && e.code === 'E_BRAIN_CORRUPT') return safe(fail(msg, 'E_BRAIN_CORRUPT'));
124
+ if (/找不到角色卡|Cannot convert undefined|undefined or null/.test(msg)) {
125
+ return safe(fail(
126
+ '找不到角色卡:她还没有人设,所以现在只是个空壳。\\n'
127
+ + ' 1. 写一张卡:~/.feiyu-brain/roles/<名字>.md(第一行写你是谁,后面一行一条:性格、说话方式、不能做什么)\\n'
128
+ + ' 2. npx feiyu lint —— 检查卡有没有写歪\\n'
129
+ + ' 3. npx feiyu status —— 再来看她',
130
+ 'E_NO_CARD',
131
+ ));
132
+ }
121
133
  return safe(fail(`工具执行出错:${explain(e)}`, 'E_THROWN'));
122
134
  }
123
135
  },
@@ -337,7 +349,7 @@ export function apply(ctx, entryConfig = {}) {
337
349
  type: 'object',
338
350
  properties: {
339
351
  id: { type: 'string', description: '鱼的 id,默认 default' },
340
- action: { type: 'string', description: 'open / screenshot / uninstall' },
352
+ action: { type: 'string', description: 'open_app / open_url / focus / click / type / key / scroll / screenshot(uninstall 桌面端拒绝;shell 需 force)' },
341
353
  package: { type: 'string', description: 'Android 包名,例如 com.ss.android.ugc.aweme' },
342
354
  target: { type: 'string', description: '电脑上要启动的程序' },
343
355
  why: { type: 'string', description: '卸载 Q1:为什么想删' },
@@ -0,0 +1,22 @@
1
+ // 人格指纹:她还是不是她。
2
+ //
3
+ // 静默漂移只能事后发现,所以每次出生/蜕壳算一次指纹,写进 audit。
4
+ // 升级、降级、从快照恢复之后一比,就知道"人设有没有被动过"。
5
+
6
+ import { createHash } from 'node:crypto';
7
+
8
+ export function fingerprint(units = [], traits = {}) {
9
+ const basis = (units ?? [])
10
+ .map((u) => `${u.id}:${u.kind}:${String(u.text ?? '').slice(0, 40)}`)
11
+ .sort()
12
+ .join('|');
13
+ const t = Object.keys(traits ?? {})
14
+ .sort()
15
+ .map((k) => `${k}=${Number(traits[k]).toFixed(3)}`)
16
+ .join(',');
17
+ return createHash('sha256').update(`${basis}#${t}`).digest('hex').slice(0, 16);
18
+ }
19
+
20
+ export function describe(fp) {
21
+ return fp ? `人设指纹 ${fp}` : '人设指纹(还没算过)';
22
+ }
package/lib/llm.mjs CHANGED
@@ -29,7 +29,7 @@ const DEFAULTS = {
29
29
  */
30
30
  export function createMouth({
31
31
  baseUrl = process.env.FEIYU_LLM_BASE || DEFAULTS.baseUrl,
32
- apiKey = process.env.FEIYU_LLM_KEY || process.env.OPENAI_API_KEY || '',
32
+ apiKey = process.env.FEIYU_LLM_KEY || '', // 不用 OPENAI_API_KEY:那是宿主的 key,不该被动用
33
33
  model = process.env.FEIYU_LLM_MODEL || DEFAULTS.model,
34
34
  timeoutMs = DEFAULTS.timeoutMs,
35
35
  } = {}) {
package/lib/say.mjs CHANGED
@@ -74,7 +74,21 @@ export async function sendToWindow({ title = '', text = '', enter = true, dryRun
74
74
  * @param {'window'|'qq'|'http'} [o.via]
75
75
  * @param {object} deps { log, bridgeAdapter, brain, id }
76
76
  */
77
- export async function say({ text = '', via = 'auto', title = '', target = '', enter = true, dryRun = false, kind = 'group', baseUrl = '', token = '', dataDir = '' } = {}, deps = {}) {
77
+ export async function say({ text = '', via = 'auto', title = '', target = '', enter = true, dryRun = false, kind = 'group', baseUrl = '', token = '', dataDir = '', allowDirect = false } = {}, deps = {}) {
78
+ // 直连网关会绕过宿主桥接的白名单/限流/审计。
79
+ // 所以默认不许直连,必须显式 allowDirect:true 或 FEIYU_ALLOW_DIRECT=1。
80
+ const directAllowed = deps.allowDirect === true || allowDirect === true || process.env.FEISHU_ALLOW_DIRECT === '1';
81
+ const wantsDirect = via === 'auto' || via === 'onebot';
82
+ if (wantsDirect && !directAllowed) {
83
+ return {
84
+ ok: false,
85
+ code: 'E_NEED_OPT_IN',
86
+ via,
87
+ text: '直连 OneBot 会绕过宿主的白名单/限流/审计。要发请显式传 allowDirect:true,'
88
+ + '或设环境变量 FEISHU_ALLOW_DIRECT=1;走桥接则用 via:"http" 指向桥接的发送接口。',
89
+ };
90
+ }
91
+
78
92
  // auto:先找用户配过的/能扫到的 OneBot,找不到再退回窗口
79
93
  if (via === 'auto') {
80
94
  const { resolveMouth } = await import('./channels.mjs');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "feiyu-brain",
3
- "version": "1.6.0",
3
+ "version": "1.6.2",
4
4
  "description": "给 AI 装一颗有记忆、有情绪、会变化的脑;带上嘴(外接 OneBot/官方)和手(点、打、滑、执行)。",
5
5
  "type": "module",
6
6
  "license": "MIT",
package/store.js CHANGED
@@ -207,16 +207,53 @@ export function listBrains() {
207
207
 
208
208
  export function loadBrain(id) {
209
209
  const file = brainFile(id);
210
+ const mainExists = fs.existsSync(file);
210
211
  let main = readJson(file, null);
212
+ let recovered = false;
213
+
211
214
  if (!main) {
212
215
  // 主文件坏了就退到备份——单文件损坏不该等于丢档
213
216
  const bak = readJson(`${file}.bak`, null);
214
217
  if (bak) {
215
218
  main = bak;
219
+ recovered = true;
216
220
  try { writeJsonAtomic(file, bak); } catch { /* 修不回来也不影响这次读 */ }
217
221
  }
218
222
  }
219
- if (!main) return null;
223
+
224
+ // ── 双损坏:绝不静默重生 ────────────────────────────────────
225
+ //
226
+ // 一次磁盘抖动 + 一次写中断,就会让主档和备份同时坏。
227
+ // 如果这时候还照常"找不到就出生",她会**换一个灵魂**,而且没人知道。
228
+ //
229
+ // 所以:坏档先隔离、留证据,然后**喊出来**。
230
+ if (!main) {
231
+ const hasHistory = mainExists
232
+ || fs.existsSync(`${file}.bak`)
233
+ || (() => { try { return fs.readdirSync(yearsDir(id)).length > 0; } catch { return false; } })();
234
+
235
+ if (hasHistory) {
236
+ const stamp = new Date().toISOString().replace(/[:.]/g, '-');
237
+ const broken = `${file}.broken-${stamp}`;
238
+ try { if (mainExists) fs.renameSync(file, broken); } catch { /* 隔离失败也要继续喊 */ }
239
+ try { if (fs.existsSync(`${file}.bak`)) fs.copyFileSync(`${file}.bak`, `${broken}.bak`); } catch { /* 同上 */ }
240
+ const err = new Error(
241
+ `大脑档案损坏,已隔离到 ${broken}。\n`
242
+ + '她的经历(years/ 分片)还在,但人设和关系读不出来了。\n'
243
+ + '不要急着重开:先看 npx feiyu doctor,或从快照恢复 npx feiyu restore <快照名>。',
244
+ );
245
+ err.code = 'E_BRAIN_CORRUPT';
246
+ err.quarantinedTo = broken;
247
+ throw err;
248
+ }
249
+ return null; // 真·第一次:没有任何历史痕迹,正常出生
250
+ }
251
+
252
+ if (recovered) {
253
+ const err = { recovered: true, from: `${file}.bak` };
254
+ // 不抛错,但要让调用方知道这次是"捡回来的"
255
+ main.__recoveredFrom = err.from;
256
+ }
220
257
 
221
258
  // ── 把窗口内的年份读回内存(更早的留在磁盘上,不加载)──
222
259
  main.memory = main.memory ?? {};