@glittering0717/ai-browser 1.2.1 → 1.3.0

package/scripts/build_dmg.cjs

@@ -0,0 +1,220 @@
+#!/usr/bin/env node
+// scripts/build_dmg.cjs — 把 AI Browser 打成 macOS .app，再压成 .dmg。
+//
+// # 为什么用 @electron/packager + hdiutil，而不是 electron-builder
+//
+// electron-builder 有一条硬校验（app-builder-lib/out/util/packageMetadata.js）：
+//     const deps = ["electron", "electron-prebuilt", "electron-rebuild"];
+//     for (const name of deps) if (name in dependencies) errors.push(...)
+// `electron` 出现在 dependencies 里就直接报错，**没有任何环境变量能绕过**
+// （ALLOW_ELECTRON_BUILDER_AS_PRODUCTION_DEPENDENCY 只管 electron-builder 自己）。
+//
+// 这条校验的假设是"Electron 应用不该把 electron 当运行时依赖分发"。而本项目的
+// npm 渠道恰恰是这么设计的：`npx -y @glittering0717/ai-browser mcp` 要把 electron
+// 装进 node_modules 再拉起来。所以两个渠道对 package.json 的要求是冲突的。
+//
+// 眼前的产物只是一个**未签名、不自动更新**的 dmg，electron-builder 的核心卖点
+// （签名/公证/自动更新/NSIS/Squirrel）一个都用不上，却要为此引入架构冲突和
+// 一堆从 GitHub 下载的二进制。@electron/packager 只做"打包"这一件事，
+// hdiutil 是 macOS 自带，不需要下载任何外部工具。
+//
+// 如果将来真要签名+公证+自动更新，正确的做法是改用 electron-builder 官方推荐的
+// 双 package.json 布局（根目录放开发依赖，app/ 子目录放应用清单），而不是在这里
+// 加 hack。
+//
+// # 用法
+//   node scripts/build_dmg.cjs              # 打当前架构
+//   node scripts/build_dmg.cjs --arch arm64 # 指定架构
+//   node scripts/build_dmg.cjs --skip-dmg   # 只出 .app，不压 dmg
+'use strict';
+
+const { spawnSync } = require('node:child_process');
+const fs = require('node:fs');
+const os = require('node:os');
+const path = require('node:path');
+
+const root = path.resolve(__dirname, '..');
+const pkg = require('../package.json');
+
+const APP_NAME = 'AI Browser';
+const OUT_DIR = path.join(root, 'dist');
+
+function parseArgs(argv) {
+  const args = { arch: process.arch, skipDmg: false };
+  for (let i = 0; i < argv.length; i++) {
+    if (argv[i] === '--arch') args.arch = argv[++i];
+    else if (argv[i] === '--skip-dmg') args.skipDmg = true;
+    else {
+      console.error(`[build] unknown argument: ${argv[i]}`);
+      process.exit(2);
+    }
+  }
+  return args;
+}
+
+// 黑名单。用黑名单而不是白名单是因为 packager 只有 ignore 这一个过滤手段，
+// 所以每一条都要写清"为什么它不该进安装包"——
+//   outputs/        28MB 截图证据，纯本地产物
+//   docs/           内部文档，含营销资料
+//   e2e/ tests/     测试代码与夹具
+//   tools/_oneoff/  一次性调试脚本（dep_closure / peek_* 等）
+//   dist/           上一次的构建产物
+//   .git/           版本库
+//   node_modules/.cache|.bin  npm 缓存与可执行文件软链
+//   node_modules/electron    243MB 的 Electron 发行版——打包后的可执行文件
+//                   **就是** Electron，asar 里再放一份纯属浪费；src 里所有
+//                   `from 'electron'` 都由 Electron 内置模块系统解析，不经过
+//                   node_modules。（这一点和 electron-builder 的默认行为一致。）
+//   build/           图标母版与中间产物。打包只需要 build/icon.icns 这一个
+//                    文件（由下面的 icon 选项显式指定，从源目录读取），
+//                    目录里的 svg/png/iconset 都不该随包分发；src 里也没有
+//                    任何地方引用 build/。
+const IGNORE = new RegExp(
+  '(^|\\/)(\\.git|outputs|docs|e2e|tests|dist|build|node_modules\\/\\.cache|node_modules\\/\\.bin|node_modules\\/electron|tools\\/_oneoff)(\\/|$)'
+);
+
+function run(cmd, args, opts = {}) {
+  const r = spawnSync(cmd, args, { cwd: root, stdio: 'inherit', ...opts });
+  if (r.error) throw new Error(`${cmd} failed to start: ${r.error.message}`);
+  if (r.status !== 0) throw new Error(`${cmd} exited with code ${r.status}`);
+  return r;
+}
+
+function dirSize(p) {
+  let total = 0;
+  const stack = [p];
+  while (stack.length) {
+    const cur = stack.pop();
+    let entries;
+    try { entries = fs.readdirSync(cur, { withFileTypes: true }); } catch (e) { continue; }
+    for (const e of entries) {
+      const full = path.join(cur, e.name);
+      if (e.isDirectory()) stack.push(full);
+      else { try { total += fs.statSync(full).size; } catch (_) {} }
+    }
+  }
+  return total;
+}
+
+function mb(bytes) {
+  return (bytes / 1024 / 1024).toFixed(1) + ' MB';
+}
+
+// @electron/packager 默认走 downloadElectronZip 从 GitHub 拉 Electron zip。
+// 本机到 GitHub 的连接不稳定（间歇性 502 / fetch failed），而
+// ~/Library/Caches/electron/<hash>/ 下通常已经有下载好的 zip。
+// 这里探测缓存：有对应版本的 zip 就用 electronZipDir 指过去（packager 的
+// getElectronZipPath 见到这个选项就直接用本地文件，完全不联网），
+// 没有才回落到在线下载。注意 electronZipDir 要求目录里躺着
+// electron-v<version>-<platform>-<arch>.zip。
+function findElectronZipDir(version, platform, arch) {
+  const cacheRoot = path.join(os.homedir(), 'Library', 'Caches', 'electron');
+  const zipName = `electron-v${version}-${platform}-${arch}.zip`;
+  let entries = [];
+  try {
+    entries = fs.readdirSync(cacheRoot, { withFileTypes: true });
+  } catch (_) {
+    return null;
+  }
+  for (const e of entries) {
+    if (!e.isDirectory()) continue;
+    const dir = path.join(cacheRoot, e.name);
+    if (fs.existsSync(path.join(dir, zipName))) return dir;
+  }
+  return null;
+}
+
+function main() {
+  const args = parseArgs(process.argv.slice(2));
+  // @electron/packager v20 是纯 ESM（"type": "module" + exports 只指向 dist/index.js），
+  // require() 拿到的是模块命名空间而不是函数，必须用动态 import。
+  // 它的导出是命名导出 `packager`，没有 default —— 别写成 mod.default。
+  import('@electron/packager')
+    .then((mod) => build(mod.packager, args))
+    .catch((e) => {
+      console.error(`[build] FAILED: ${e.message}`);
+      process.exit(1);
+    });
+}
+
+function build(packager, args) {
+  fs.rmSync(OUT_DIR, { recursive: true, force: true });
+  fs.mkdirSync(OUT_DIR, { recursive: true });
+
+  console.log(`[build] ${APP_NAME} ${pkg.version} — darwin/${args.arch}`);
+  console.log(`[build] ignore: ${IGNORE}`);
+
+  // electron 的实际版本以 node_modules 里装的那份为准（package.json 里是 ^ 范围）
+  const electronVersion = require('electron/package.json').version;
+  const zipDir = findElectronZipDir(electronVersion, 'darwin', args.arch);
+  if (zipDir) {
+    console.log(`[build] electron zip: 使用本地缓存 ${zipDir}（不联网）`);
+  } else {
+    console.log(`[build] electron zip: 本地无缓存，将从 GitHub 下载 v${electronVersion}`);
+  }
+
+  packager({
+    dir: root,
+    name: APP_NAME,
+    platform: 'darwin',
+    arch: args.arch,
+    out: OUT_DIR,
+    overwrite: true,
+    ignore: IGNORE,
+    electronZipDir: zipDir || undefined,
+    // 只打生产依赖：npm prune --production 会把 devDependencies（vitest、jsdom、
+    // @electron/packager 自己）从安装包里剔掉。用户侧少一整套测试工具链。
+    prune: true,
+    asar: true,
+    appBundleId: 'com.glittering.ai-browser',
+    appCategoryType: 'public.app-categories.productivity',
+    // 图标必须显式传 icon 选项。@electron/packager 的 mac.js copyIcon() 在
+    // `!this.opts.icon` 时直接 return —— 它**不会**自动去 build/ 里找
+    // icon.icns（老版 electron-packager 的行为，v20 已经没有了）。
+    // normalizeIconExtension 只在源目录路径上 existsSync，与 IGNORE 无关，
+    // 所以 build/ 可以同时留在 ignore 列表里，不进安装包。
+    icon: path.join(root, 'build', 'icon.icns'),
+    // 图标母版是 build/icon.svg，由 scripts/render_icon.cjs 用项目自带的
+    // Chromium 栅格化，再经 sips + iconutil 打成 icns。改图标走这条链，
+    // 不要直接改 png。
+  })
+    .then((paths) => {
+      const appPath = paths[0];
+      const size = dirSize(appPath);
+      console.log(`[build] app bundle: ${appPath}`);
+      console.log(`[build] app size:   ${mb(size)}`);
+
+      if (args.skipDmg) {
+        console.log('[build] --skip-dmg，不压 dmg');
+        return;
+      }
+
+      const dmg = path.join(OUT_DIR, `AI-Browser-${pkg.version}-${args.arch}.dmg`);
+      console.log(`[build] creating dmg: ${dmg}`);
+      // hdiutil 是 macOS 自带的，不需要 electron-builder 那套从 GitHub 下载的
+      // dmg-license 等二进制——在国内网络下那一步经常卡住。
+      // UDZO = zlib 压缩，比 UDBZ(bzip2) 快得多，体积只大一点。
+      run('hdiutil', [
+        'create',
+        '-volname', `${APP_NAME} ${pkg.version}`,
+        '-srcfolder', appPath,
+        '-ov',
+        '-format', 'UDZO',
+        dmg,
+      ]);
+
+      const dmgSize = fs.statSync(dmg).size;
+      console.log('');
+      console.log('[build] ===== 结果 =====');
+      console.log(`[build] dmg:  ${dmg}`);
+      console.log(`[build] size: ${mb(dmgSize)}`);
+      console.log(`[build] app:  ${mb(size)}（解压后占用）`);
+      console.log('[build] 未签名、未公证：用户需要"右键 → 打开"，见 docs/ 说明');
+    })
+    .catch((e) => {
+      console.error(`[build] FAILED: ${e.message}`);
+      process.exit(1);
+    });
+}
+
+if (require.main === module) main();

package/scripts/marketing/data_snapshot.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+# data_snapshot.sh — ai-browser 推广数据每日快照
+# 用法：bash scripts/marketing/data_snapshot.sh [备注]
+# 输出：追加一行到 docs/marketing/DATA_LOG.md
+set -u
+REPO="/Users/Zhuanz/Documents/trae_projects/ai-browser"
+LOG="$REPO/docs/marketing/DATA_LOG.md"
+DATE=$(date +%Y-%m-%d)
+TIME=$(date +%H:%M)
+NOTE="${1:-}"
+
+jqf() { # jqf <gh-api-path> <jq-filter> <default>
+  local out
+  out=$(gh api "$1" --jq "$2" 2>/dev/null) || out=""
+  [ -z "$out" ] && out="$3"
+  echo "$out"
+}
+
+# --- GitHub ---
+STARS=$(jqf "repos/Glittering/ai-browser" '.stargazers_count' '?')
+FORKS=$(jqf "repos/Glittering/ai-browser" '.forks_count' '?')
+ISSUES=$(jqf "repos/Glittering/ai-browser" '.open_issues_count' '?')
+VIEWS14=$(jqf "repos/Glittering/ai-browser/traffic/views" '.count' '?')
+UNIQ14=$(jqf "repos/Glittering/ai-browser/traffic/views" '.uniques' '?')
+CLONES14=$(jqf "repos/Glittering/ai-browser/traffic/clones" '.count' '?')
+CLONEU14=$(jqf "repos/Glittering/ai-browser/traffic/clones" '.uniques' '?')
+
+# --- npm ---
+NPM_VER=$(curl -s --max-time 15 "https://registry.npmjs.org/@glittering0717%2Fai-browser" 2>/dev/null | python3 -c "import json,sys; print(json.load(sys.stdin)['dist-tags']['latest'])" 2>/dev/null || echo '?')
+NPM_DL=$(curl -s --max-time 15 "https://api.npmjs.org/downloads/point/last-week/@glittering0717/ai-browser" 2>/dev/null | python3 -c "import json,sys; d=json.load(sys.stdin); print(d.get('downloads','N/A'))" 2>/dev/null || echo 'N/A')
+
+# --- MCP Registry（取 isLatest 条目；API 偶发超时，带重试）---
+mcp_fetch() {
+  for i in 1 2 3; do
+    local out
+    out=$(curl -s --max-time 20 "https://registry.modelcontextprotocol.io/v0/servers?search=ai-browser" 2>/dev/null)
+    if [ -n "$out" ] && echo "$out" | python3 -c "import json,sys; json.load(sys.stdin)" 2>/dev/null; then
+      echo "$out"
+      return 0
+    fi
+    sleep 2
+  done
+  echo ""
+}
+MCP_INFO=$(mcp_fetch | python3 -c "
+import json,sys
+try:
+    d=json.load(sys.stdin)
+    for item in d.get('servers',[]):
+        s=item.get('server',{})
+        if s.get('name')=='io.github.Glittering/ai-browser':
+            m=item.get('_meta',{}).get('io.modelcontextprotocol.registry/official',{})
+            if m.get('isLatest'):
+                print(s.get('version','?'), m.get('status','?'))
+                break
+except Exception:
+    pass
+" 2>/dev/null)
+MCP_VER=$(echo "$MCP_INFO" | awk '{print $1}')
+MCP_STATUS=$(echo "$MCP_INFO" | awk '{print $2}')
+[ -z "$MCP_VER" ] && MCP_VER='?'
+[ -z "$MCP_STATUS" ] && MCP_STATUS='?'
+
+# --- 文章渠道状态（经 ai-browser 巡查时更新；此处留空由人工/agent 回填）---
+printf '| %s %s | %s | %s | %s | %s | %s | %s | %s | %s | %s | %s | %s |\n' \
+  "$DATE" "$TIME" "$STARS" "$FORKS" "$ISSUES" "$VIEWS14" "$UNIQ14" "$CLONES14/$CLONEU14" "$NPM_VER" "$NPM_DL" "$MCP_VER" "$MCP_STATUS" "${NOTE:-}" >> "$LOG"
+
+echo "快照已写入 $LOG"
+tail -1 "$LOG"

package/scripts/render_icon.cjs

@@ -0,0 +1,118 @@
+#!/usr/bin/env node
+// scripts/render_icon.cjs — 从 build/icon.svg 一键重建整条图标链：
+//   SVG → 2048×2048 PNG（icon@2x.png）→ 1024 PNG（icon.png）
+//       → icon.iconset/（10 个尺寸）→ icon.icns（packager 的输入）
+//
+// # 为什么不用 qlmanage / rsvg-convert / ImageMagick
+//   qlmanage 在受限沙箱里直接 "sandbox initialization failed: Operation not permitted"；
+//   rsvg-convert / convert / inkscape 本机都没装。为一个图标引入一串系统依赖不划算。
+//   而本项目**本来就自带一个完整的 Chromium**（electron 依赖），拿它渲染 SVG 是天经地义的事，
+//   零新增依赖，且渲染结果和图标最终运行的引擎完全一致。
+//
+// # 为什么 icns 要提交、中间 png 不提交
+//   build_dmg.cjs 的 icon 选项只读 build/icon.icns；icon.svg 是母版；
+//   其余 png/iconset 都是本脚本的再生产物，改了 SVG 重跑本脚本即可。
+//
+// # 用法（必须在 Electron 下运行，不是 node；本沙箱还要 --no-sandbox --disable-gpu）
+//   env -u ELECTRON_RUN_AS_NODE \
+//     node_modules/electron/dist/Electron.app/Contents/MacOS/Electron \
+//     --no-sandbox --disable-gpu scripts/render_icon.cjs
+'use strict';
+
+const fs = require('node:fs');
+const path = require('node:path');
+const { spawnSync } = require('node:child_process');
+
+const ROOT = path.resolve(__dirname, '..');
+const SVG = path.join(ROOT, 'build', 'icon.svg');
+const PNG_2X = path.join(ROOT, 'build', 'icon@2x.png'); // 2048×2048，母版位图
+const PNG = path.join(ROOT, 'build', 'icon.png'); //    1024×1024，预览用
+const ICONSET = path.join(ROOT, 'build', 'icon.iconset');
+const ICNS = path.join(ROOT, 'build', 'icon.icns');
+
+// icns 要求的全部尺寸（源图是 2048²，一律从它缩）
+const SIZES = [
+  [16, 'icon_16x16.png'],
+  [32, 'icon_16x16@2x.png'],
+  [32, 'icon_32x32.png'],
+  [64, 'icon_32x32@2x.png'],
+  [128, 'icon_128x128.png'],
+  [256, 'icon_128x128@2x.png'],
+  [256, 'icon_256x256.png'],
+  [512, 'icon_256x256@2x.png'],
+  [512, 'icon_512x512.png'],
+  [1024, 'icon_512x512@2x.png'],
+];
+
+// 在普通 node 下 require('electron') 拿到的是二进制路径字符串，提前拦掉给出提示
+let electron;
+try {
+  electron = require('electron');
+} catch (_) {
+  electron = null;
+}
+if (!electron || typeof electron.app === 'undefined') {
+  console.error('[icon] 本脚本必须在 Electron 下运行（见文件头用法），node 直接跑不了。');
+  process.exit(2);
+}
+
+const { app, BrowserWindow } = electron;
+
+app.commandLine.appendSwitch('disable-gpu'); // 无头环境没有 GL，别让 GPU 进程拖后腿
+
+function run(cmd, args) {
+  const r = spawnSync(cmd, args, { cwd: ROOT });
+  if (r.status !== 0) {
+    throw new Error(`${cmd} ${args.join(' ')} exited with code ${r.status}`);
+  }
+}
+
+app.whenReady().then(async () => {
+  // 窗口 1024，capturePage 在 Retina 下返回 2x（2048×2048）——这就是母版位图
+  const SIZE = 1024;
+  const win = new BrowserWindow({
+    width: SIZE,
+    height: SIZE,
+    show: false,
+    transparent: true,
+    backgroundColor: '#00000000',
+    useContentSize: true,
+    webPreferences: { offscreen: false },
+  });
+
+  try {
+    await win.loadFile(SVG);
+    // 等一帧，确保 SVG 已经完成布局与绘制（loadFile 只保证 DOM ready）
+    await new Promise((r) => setTimeout(r, 300));
+
+    const img = await win.webContents.capturePage();
+    if (img.isEmpty()) throw new Error('capturePage returned an empty image');
+
+    const png = img.toPNG();
+    fs.writeFileSync(PNG_2X, png);
+    const w = img.getSize().width;
+    const h = img.getSize().height;
+    console.log(`[icon] ${path.relative(ROOT, SVG)} -> ${path.relative(ROOT, PNG_2X)} (${w}x${h}, ${png.length} bytes)`);
+
+    // ---- 以下三步是 macOS 自带工具，不联网、不加依赖 ----
+    // 1) 1024 预览图
+    run('sips', ['-Z', '1024', PNG_2X, '-o', PNG]);
+    // 2) 10 个 icns 尺寸
+    fs.rmSync(ICONSET, { recursive: true, force: true });
+    fs.mkdirSync(ICONSET, { recursive: true });
+    for (const [size, name] of SIZES) {
+      run('sips', ['-Z', String(size), PNG_2X, '-o', path.join(ICONSET, name)]);
+    }
+    // 3) 打 icns
+    fs.rmSync(ICNS, { force: true });
+    run('iconutil', ['-c', 'icns', ICONSET, '-o', ICNS]);
+
+    const icnsSize = fs.statSync(ICNS).size;
+    console.log(`[icon] iconset: ${SIZES.length} sizes -> ${path.relative(ROOT, ICNS)} (${icnsSize} bytes)`);
+    console.log('[icon] done. build_dmg.cjs 会读取 build/icon.icns');
+    app.exit(0);
+  } catch (e) {
+    console.error(`[icon] FAILED: ${e.message}`);
+    app.exit(1);
+  }
+});

package/src/main/axExtractor.js

@@ -72,8 +72,23 @@ function statesFor(node) {
     if (!v || v.type !== 'boolean' || v.value !== true) continue;
     if (p.name === 'read-only') { states.push('readonly'); continue; }
     if (p.name === 'hidden') continue;
+    // required 在下面单独处理（要给出与 DOM 路径同一份语义）。这里跳过，
+    // 否则 states 里会出现两个 "required"。
+    if (p.name === 'required') continue;
+    if (p.name === 'invalid') continue; // 字符串属性，下面单独处理
     states.push(p.name); // focusable/disabled/focused/checked/selected/settable/multiline/visible...
   }
+  // 必填 / 无效（P2-2）。AX 把 aria-required 和原生 required 都折成 `required`，
+  // 把 aria-invalid 折成 `invalid`（字符串：false | true | grammar | spelling）。
+  // 这两个信号此前完全不在 states 里，于是"掘金红*必填"和"字段已判错"都只能靠
+  // 截图猜 —— 而红色星号在无样式/色盲场景下本来就不是可靠信号。
+  const req = prop(nodeStore, node.nodeId, 'required');
+  if (req && req.value === true) states.push('required');
+  const invalid = prop(nodeStore, node.nodeId, 'invalid');
+  if (invalid && typeof invalid.value === 'string' && invalid.value !== 'false') {
+    states.push('invalid');
+    if (invalid.value !== 'true') states.push('invalid=' + invalid.value); // grammar / spelling
+  }
   // raw `editable` stays available to callers that need the primitive signal
   const editable = nodeStore ? valueOf(prop(nodeStore, node.nodeId, 'editable')) : null;
   if (editable) states.push('editable=' + editable);
@@ -81,6 +96,27 @@ function statesFor(node) {
 }
 
 let nodeStore = null; // current normalize pass's node map (see normalizeAxTree)
+// Nodes already emitted in this pass. Needed because we walk *through* ignored
+// wrappers (§buildThroughIgnored); an AX node that a wrapper re-parents must not
+// be emitted twice.
+let seenNodes = null;
+
+// Descendants of an AX node that is `ignored: true`. AX marks presentational
+// wrappers (a `span` in a flex row, `<b>` inside a paragraph) as ignored, but
+// the text under them is real content — dropping the wrapper must not drop the
+// subtree. This is the P2-1 cause: a list row's title lives in such a span, so
+// the row came back as `[button] 编辑` and nothing else.
+function buildThroughIgnored(node, idFor) {
+  const out = [];
+  for (const cid of node.childIds || []) {
+    const c = nodeStore.get(cid);
+    if (!c || seenNodes.has(c.nodeId)) continue;
+    if (c.ignored) { out.push(...buildThroughIgnored(c, idFor)); continue; }
+    seenNodes.add(c.nodeId);
+    out.push(build(c, idFor));
+  }
+  return out;
+}
 
 function build(node, idFor) {
   const rawRole = (node.role && node.role.value) || 'generic';
@@ -130,7 +166,12 @@ function build(node, idFor) {
   const kids = [];
   for (const cid of node.childIds || []) {
     const c = nodeStore.get(cid);
-    if (c && !c.ignored) kids.push(build(c, idFor));
+    if (!c || seenNodes.has(c.nodeId)) continue;
+    // 被 AX 标为 ignored 的只是包裹层（见 buildThroughIgnored）；它的子节点
+    // 才是内容，必须被提升上来而不是连同子树一起丢掉。
+    if (c.ignored) { kids.push(...buildThroughIgnored(c, idFor)); continue; }
+    seenNodes.add(c.nodeId);
+    kids.push(build(c, idFor));
   }
   if (kids.length) tn.children = kids;
   return tn;
@@ -141,21 +182,41 @@ let readValue = null; // opts.readValue — per-node DOM read hook for textbox v
 // Public pure API.
 // opts: { idFor: (node)=>string, readValue: (node)=>string }
 export function normalizeAxTree(rawNodes, opts = {}) {
-  const live = (rawNodes || []).filter((n) => n && !n.ignored);
-  nodeStore = new Map(live.map((n) => [n.nodeId, n]));
+  // nodeStore keeps ignored nodes too: we never *emit* them, but we must walk
+  // through them (see buildThroughIgnored). Indexing only the live ones was the
+  // second half of the P2-1 bug — the wrapper was in the map lookup's blind spot
+  // and its children became unreachable.
+  const all = (rawNodes || []).filter(Boolean);
+  const live = all.filter((n) => !n.ignored);
+  nodeStore = new Map(all.map((n) => [n.nodeId, n]));
+  seenNodes = new Set();
   readValue = opts.readValue || null;
   const idFor = opts.idFor || ((n) => 'ax-' + n.nodeId);
 
-  const childIds = new Set();
-  for (const n of live) for (const c of n.childIds || []) if (c != null) childIds.add(c);
-  const roots = live.filter((n) => !childIds.has(n.nodeId));
+  // Parent map over ALL nodes, so "is this a root?" accounts for ignored
+  // ancestors: a live node under an ignored wrapper is not a root.
+  const parentOf = new Map();
+  for (const n of all) for (const c of n.childIds || []) if (c != null && !parentOf.has(c)) parentOf.set(c, n.nodeId);
+  const hasLiveAncestor = (n) => {
+    let p = parentOf.get(n.nodeId); let guard = 0;
+    while (p != null && guard++ < 64) {
+      const pn = nodeStore.get(p);
+      if (!pn) return false;
+      if (!pn.ignored) return true;
+      p = parentOf.get(p);
+    }
+    return false;
+  };
+  const roots = live.filter((n) => !hasLiveAncestor(n));
 
+  for (const r of roots) seenNodes.add(r.nodeId);
   const built = roots.map((n) => build(n, idFor));
   const tree = built.length === 1
     ? built[0]
     : { id: 'root', role: 'generic', label: '', states: ['visible'], actions: [], bounds: { x: 0, y: 0, width: 0, height: 0 }, children: built };
   tree._debug = { layer: 'ax', version: VERSION_TAG };
   nodeStore = null;
+  seenNodes = null;
   readValue = null;
   return tree;
 }
@@ -215,8 +276,11 @@ export function mergeFrameTrees(mainTree, frames = []) {
 // AX role=dialog|alertdialog that is visible, plus its descendant buttons — the
 // AX-native replacement for the class-keyword modal table (extractor's modalSelectors).
 export function modalsFromAx(rawNodes) {
-  const live = (rawNodes || []).filter((n) => n && !n.ignored);
-  nodeStore = new Map(live.map((n) => [n.nodeId, n]));
+  const all = (rawNodes || []).filter(Boolean);
+  const live = all.filter((n) => !n.ignored);
+  // 与 normalizeAxTree 同一条规则：ignored 只是包裹层，遍历要穿过去（否则
+  // ignored span 里的按钮永远数不到）。
+  nodeStore = new Map(all.map((n) => [n.nodeId, n]));
   const dialogs = live.filter((n) => {
     const r = n.role && n.role.value;
     if (r !== 'dialog' && r !== 'alertdialog') return false;
@@ -228,7 +292,8 @@ export function modalsFromAx(rawNodes) {
     const buttons = [];
     const walk = (id) => {
       const n = nodeStore.get(id);
-      if (!n || n.ignored) return;
+      if (!n) return;
+      if (n.ignored) { for (const cid of n.childIds || []) walk(cid); return; }
       const r = n.role && n.role.value;
       if (r === 'button') {
         const btn = {
@@ -279,13 +344,6 @@ async function axRaw(dbg) {
   return raw;
 }
 
-export function interactiveIdSet(raw) {
-  const byId = new Map(raw.filter((n) => !n.ignored).map((n) => [n.nodeId, n]));
-  const s = new Set();
-  for (const n of raw) if (!n.ignored && isInteractiveNode(n, byId)) s.add(n.nodeId);
-  return s;
-}
-
 // C: PURE READ. Same {tree, context} shape as the default getTree, but derived
 // from AX alone. No DOM mutation, ids = ax-{backendDOMNodeId} (stable).
 export async function axRead(dbg) {
@@ -330,24 +388,10 @@ export async function ensureHandles(dbg) {
   return out;
 }
 
-// A: PURE diff of two AX snapshots (pre/post a reveal) by nodeId. Returns only
-// interactive nodes that newly appeared (revealed) or disappeared (hidden).
-export function diffAx(beforeRaw, afterRaw) {
-  const bm = new Map((beforeRaw || []).map((n) => [n.nodeId, n]));
-  const am = new Map((afterRaw || []).map((n) => [n.nodeId, n]));
-  const bi = interactiveIdSet(beforeRaw || []);
-  const ai = interactiveIdSet(afterRaw || []);
-  const toLite = (n) => ({
-    id: axId(n),
-    role: (n.role && n.role.value) || 'generic',
-    label: (n.name && n.name.value) || '',
-    backendDOMNodeId: n.backendDOMNodeId != null ? n.backendDOMNodeId : undefined,
-  });
-  const revealed = [], hidden = [];
-  for (const id of ai) if (!bi.has(id)) { const n = am.get(id); if (n && !n.ignored) revealed.push(toLite(n)); }
-  for (const id of bi) if (!ai.has(id)) { const n = bm.get(id); if (n && !n.ignored) hidden.push(toLite(n)); }
-  return { revealed, hidden };
-}
+// 注意：这里原本有基于 AX 的 diffAx（ui.peek 用的差异比较）。它已删除，原因是
+// 自绘菜单在 AX 里是"无名的 generic"、进不了 isInteractiveNode 的判据，peek 因此
+// 对这类菜单一律报空；且它返回的 ax-* id 动作层解析不了，探到了也点不了。
+// ui.peek 现在改用 DOM 语义树做差异，实现在 src/shared/tree_diff.cjs。
 
 // C: read-only href resolution for actionable nodes. The AX read layer only knows
 // "this is clickable", not "where it goes" (AX has no href). We lazily decorate
@@ -386,6 +430,24 @@ export async function attachHrefs(dbg, tree) {
 // descendants); drops layout-only branches. Pure and generic (role/actions
 // based, no site heuristics) — the read-lowering mode for long feeds.
 function isInteractive(tree) { return !!tree.editor_type || (tree.actions && tree.actions.length > 0) || !!tree.url; }
+
+// 行容器（列表项 / 表格行 / 树项）在 prune 后常常只剩一个操作按钮：
+// 标题是被剪掉的纯文本，而**纯文本正是"这是哪一行"的唯一线索**。B站稿件
+// 管理列表因此每行只剩 `[button] 编辑`，无法定位目标条目（P2-1）。
+// 对这类角色，若剪完 label 为空，就把首个文本后代的文字提升成行 label。
+const ROW_ROLES = { listitem: 1, row: 1, treeitem: 1, cell: 1, gridcell: 1, article: 1 };
+const MAX_ROW_LABEL = 120;
+function firstTextOf(node) {
+  if (!node) return '';
+  const role = node.role || '';
+  if (role === 'StaticText' || role === 'InlineTextBox') return String(node.label || '').trim();
+  for (const c of node.children || []) {
+    const t = firstTextOf(c);
+    if (t) return t;
+  }
+  return '';
+}
+
 export function filterInteractive(tree) {
   if (!tree) return tree;
   const keep = (t) => {
@@ -393,7 +455,12 @@ export function filterInteractive(tree) {
     const kids = (t.children || []).map(keep).filter(Boolean);
     if (kids.length || isInteractive(t)) {
       if (!kids.length) return t;
-      return { ...t, children: kids };
+      const node = { ...t, children: kids };
+      if (ROW_ROLES[t.role] && !node.label) {
+        const txt = firstTextOf(t);
+        if (txt) node.label = txt.slice(0, MAX_ROW_LABEL);
+      }
+      return node;
     }
     return null;
   };
@@ -433,4 +500,4 @@ export function diffLite(prevLite, newLite) {
   return { revealed, hidden };
 }
 
-export default { normalizeAxTree, mergeFrameTrees, modalsFromAx, extractFromDebugger, axRead, axRaw, ensureHandles, diffAx, interactiveIdSet, attachHrefs, filterInteractive, liteSnapshot, diffLite, VERSION_TAG };
+export default { normalizeAxTree, mergeFrameTrees, modalsFromAx, extractFromDebugger, axRead, axRaw, ensureHandles, attachHrefs, filterInteractive, liteSnapshot, diffLite, VERSION_TAG };