Skip to content

[PR] fix(#4688): recognize antigravity UA on the conflict surfaces - #4758

Open
ranxianglei wants to merge 8 commits into
masterfrom
2026-10-25_antigravity-client-attribution
Open

ranxianglei wants to merge 8 commits into
masterfrom
2026-10-25_antigravity-client-attribution

Conversation

@ranxianglei

Copy link
Copy Markdown
Owner

Part of #4688 — the attribution facet (root re-slice handling is a separate owner decision).

What

Antigravity is a known bili lane (bili antigravity launcher, #3129/#2115), but its wire identity was never resolved server-side: sessions carrying conflict events showed clients: (none resolved) and only the generic remediation hint. This adds evidence-backed recognition mirroring the existing codex pattern:

  • isAntigravityClient() (src/thirdparty-scan.ts): prefix-anchored, case-insensitive match on the observed UA shape antigravity/hub/<ver> (…). Deliberately NOT a bare-token match — a UA merely mentioning antigravity elsewhere must not inherit the lane identity.
  • sniffScanClient: recognizes it but returns undefined — closed Go binary (扫描市面上主流agent,看哪些没有提供bili 启动器和native模式 #1043), no scannable plugin registry; same contract as codex.
  • conflictClientOf (src/conflict-watch.ts): normalizes recorded UA hints back to "antigravity".
  • Dedicated one-line remediation for the acp_status / web banner / launcher surfaces + en/zh i18n keys mirroring the server map.

Evidence

Observed from a real session store via #4688 (bili v0.1.207, Windows x64):
antigravity/hub/2.26.0 (aidev_client; os_type=windows; arch=amd64; cl=1005016104)

Behavior change (old → new)

Display-only — no wire or compression semantics change:

  • OLD: antigravity sessions with conflict events → client unresolved → generic hint ("disable the client's own auto-compaction…") — misleading, since this lane has no user-configurable auto-compaction.
  • NEW: resolves as antigravity; the hint states the lane's periodic window re-slicing is expected behavior (not double compression), that folded content stays offline-recoverable (export --full), and when to start a new task/session.

Tests

  • Positive: real UA + case variant resolve to antigravity; predicate true on the antigravity/hub/ prefix.
  • Negative: vendor/antigravity-wrapper/1.0, Mozilla/5.0 antigravity-fan-club, missing/empty UA stay unresolved/false.
  • sniffScanClient contract line (recognized but undefined, same as codex).
  • i18n parity lists extended (en + zh).

Targeted local: tests/conflict-remediation.test.ts + tests/issue1206-thirdparty-scan.test.ts = 59/59 green; full suite verdict = CI.

Antigravity is a known bili lane (launcher, #3129/#2115) but its wire
identity was never resolved server-side: sessions carrying conflict
events showed clients: (none resolved) and only the generic remediation
hint. Add the evidence-backed UA predicate (antigravity/hub/<ver>,
observed shape v2.26.0 Windows via #4688) mirroring the codex pattern:
sniffScanClient recognizes it with no scannable registry (closed binary,
#1043), conflictClientOf normalizes recorded UA hints back to
"antigravity", and the conflict surfaces (acp_status / web banner /
launcher) get a dedicated one-line remediation instead of the generic
fallback. Display-only: no wire or compression semantics change.
@github-actions

github-actions Bot commented Oct 25, 2026 •

Copy link
Copy Markdown
Contributor

📦 Built Package Artifact

Branch: 2026-10-25_antigravity-client-attribution (ecf3ef2)

Latest build — install this exact version

npm install -g billion-context@0.0.10196-pr.4758.366a406

This exact version is immutable and reproducible. The rolling pr tag tracks the newest test build across all PRs.

Recent builds (commit → version)

commit version build
ecf3ef2 billion-context@0.0.10196-pr.4758.366a406 build
1319b6e billion-context@0.0.9434-pr.4758.fc3eb3e build
ff3b72c billion-context@0.0.9421-pr.4758.be11ba2 build
3f6790f billion-context@0.0.6149-pr.4758.18dd26e build
09b4ac0 billion-context@0.0.6064-pr.4758.5df2918 build
de251c8 billion-context@0.0.5953-pr.4758.fffa3fa build
b53c2d0 billion-context@0.0.5905-pr.4758.2de077f build
6b8113e billion-context@0.0.5832-pr.4758.156c594 build

Download artifact

  1. Download the artifact from the Actions run
  2. Extract the tarball and install:
tar xzf billion-context-pr4758.tgz
npm install -g package

Install instructions are refreshed on each push.

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

(ai: vllm-qwen/qwen3.8-27b)

查重:不重复。 检索 open+closed 的 antigravity 相关条目:

开始独立审核:拉分支读 diff → 既有行为清点 → 定向测试 + CI 状态 → 八问结论。

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

(ai: vllm-qwen/qwen3.8-27b)

PR #4758 review 结论(结构化八问)

  1. 是什么问题:Antigravity 是已知 bili 车道(bili antigravity),但服务端从未解析过它的 wire 身份——带冲突事件的会话在 banner/acp_status 里显示 clients: (none resolved),只能给通用提示「去关客户端的 auto-compaction」——对这条车道是误导(它没有用户可配置的 auto-compaction)。
  2. 什么原因导致的:功能缺位而非代码 bug:sniffScanClient 只认 claude/codex/opencode,antigravity(封闭 Go 二进制)落进「无识别 → 裸 UA hint」路径;conflictClientOf 没有把它归一化到已知客户端名的规则,于是永远 unresolved。
  3. 影响范围与严重程度:纯展示面。所有带冲突事件的 antigravity 会话拿到错误提示;wire/压缩语义零影响。严重度 = 误导性展示/体验瑕疵,非功能失效。触发条件:antigravity 车道 + 发生压缩冲突事件。
  4. 怎么修复的:镜像 codex 既有模式做证据化识别——isAntigravityClient(前缀锚定 ^antigravity/、大小写不敏感,刻意不用裸 token,UA 里别处提到 antigravity 不继承车道身份);sniffScanClient 识别但返回 undefined(封闭二进制无可扫描 registry,与 codex 同契约);conflictClientOf 把已存 UA hint 归一化回 "antigravity";acp_status/web banner/launcher 各面加专用一行 remediation + en/zh i18n 键。
  5. 是否有回归问题:逐项审过,无回归——
    • 证据链端到端验证:src/server/handle.ts:1528-1532 first-hit-wins 写 clientHint(截断 UA 保留前缀),存量已存 hint 的旧会话同样被新谓词解析;
    • 所有 remediation 表面(acp-status / web banner / launcher / sessions-data)都路由到同一对函数,server map 与 web switch 两侧同步加了 antigravity,parity 成立;
    • 提示里承诺的 export --full 真实存在(src/cli.ts);
    • sniffScanClient 改动前 antigravity 请求本来就落 undefined(无其他 marker),行为未变,只是从隐式变显式确定;唯一理论差异(antigravity UA + opencode affinity 并存)实际不存在;
    • pluginAgent 优先级顺序未动。高危模式(语义漂移/吞错/阈值时序漂移)逐项过,均不涉及。
    • 行为变更披露(旧→新,display-only):旧 = antigravity 冲突会话 → 未解析 + 通用「disable auto-compaction」提示;新 = 解析为 antigravity,提示改为「周期性重切是该车道预期行为、非双重压缩;折叠内容 export --full 可离线找回;需要被裁剪上下文时开新任务/新会话」。原因:旧提示对该车道不可执行且误导。
  6. 是否破坏缓存:不涉及——不触碰 cache/retry/增量游标/去重键任何路径。
  7. 是否改了设计方向:没有。纯增量:既有「evidence-permitlist」识别模式加一条车道,无新机制。root re-slice 处理明确不在本 PR(Decision request: Antigravity periodic full-window re-segmentation — how should bili handle this (#4688) | decision request: Antigravity 周期性整窗重切,bili 该怎么处理(#4688) #4759 待 owner 拍板)。
  8. 是否引入了新的配置:无。

测试有效性:断言有牙——正例(真实 UA antigravity/hub/2.26.0 … + 大小写变体)+ 反例(vendor/antigravity-wrapper/1.0、Mozilla/5.0 antigravity-fan-club、空 UA 保持 unresolved/false)双向齐全;sniffScanClient 契约行与 codex 对齐;i18n parity 列表 en+zh 双扩。本地定向实测:conflict-remediation + issue1206-thirdparty-scan = 59/59 绿,web-i18n = 10/10 绿。

一处小 nit(不阻塞):PR 描述说谓词匹配「observed shape antigravity/hub/<ver>」,实现是 ^antigravity/(接受任意 antigravity/* product segment)。与 codex 前缀风格一致、测试全过,建议保持现状(车道归属宁宽勿漏);若想收紧到 hub 再说。

CI 分账:旧 head 6b8113e95 红在 u22s3/u24s3/w22s3/w22s4/w22s5 = master bb7c24972 在册红簇同签名(继承性失败,非本 PR 引入;本 diff 与失败路径零交集)。已按 #4599 政策把 origin/ci-fixes(1fa9373)merge 进分支,零冲突、本地 typecheck 绿,新 head b53c2d0f6,等 CI 重跑。

判定:代码 ready-to-merge(展示面修复、模式对齐、证据充分、测试双向齐全);合入等 ci-fixes 合并后 CI 转绿即可,合并权在你。

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

[bot] 🏷 (ai: vllm-qwen/qwen3.8-27b)

CI 状态说明(自动修复车道 attempt 1/2)

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

[bot] 🏷 (ai: vllm-qwen/qwen3.8-27b)

进度更新(23:40Z):新 head b53c2d0f6 的 12 个 workflow 里 11 个已绿(e2e 全家 + build artifact + codex overlay),只剩主 CI(含原红分片 u22s3/u24s3/w22s3/w22s4/w22s5)自 20:57Z 起一直在 queued,排队近 3 小时未开跑。这是全仓 runner 池停摆/饱和——同期其他 PR 的排队 run 只被取消、不被执行(#4599 floor 227 已有舰队级观察记录),非本 PR 代码问题。无需任何代码改动;run 一旦开跑我会立刻回帖结果(全绿=确认合入就绪;在册簇内签名=归口 #4599;簇外新签名=按车道修)。

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

[bot] 🏷 (ai: vllm-qwen/qwen3.8-27b)

车道结论(自动修复 attempt 1/2,七问体例)

  1. 是什么问题:PR 旧 head 6b8113e95 的 CI 在 5 个分片红(u22s3/u24s3/w22s3/w22s4/w22s5)。
  2. 什么原因:继承性失败——与 master bb7c24972 在册红簇同签名(storage-render golden ×4、engine-proofs full-mode restart×4+rollback+corrupt index.db、plugin-fork「HTTP fork revision」等);本 PR 自身只改 6 个文件,与失败路径零交集。非本 PR 引入。
  3. 影响范围与严重程度:信号级(CI 检查矩阵失去信号),无用户侧影响;同期所有在途 PR 同受该簇影响(CI Control Center: Centralized CI Failure Handling & Status Sync (Comment all CI issues here; do not open new issues) | CI 总控: CI 失败集中处理与状态同步(所有 CI 问题在此评论, 勿开新 issue) #4599 逐条在册)。
  4. 怎么修复的:按 CI Control Center: Centralized CI Failure Handling & Status Sync (Comment all CI issues here; do not open new issues) | CI 总控: CI 失败集中处理与状态同步(所有 CI 问题在此评论, 勿开新 issue) #4599 政策把 origin/ci-fixes(tip 1fa93735d)merge 进分支(零冲突、本地 typecheck 绿),新 head b53c2d0f6;ci-fixes 带入的正是该红簇的修复(persist ledger-aligned remap、storage proofs re-pin、plugin-fork 测试、blog CRLF)。我已独立复核:新旧 head 之间仅这一个 merge commit。
  5. 回归风险:无——分支相对 master 的全部增量 = ci-fixes 测试基建修复(哨兵维护)+ 本 PR 原 6 文件改动(floor 6 已单独审完,display-only)。
  6. 缓存:不涉及。
  7. 设计方向/新配置:均无;不需要 owner 决策,故未开 decision-request issue。

当前状态(00:20Z):新 head 上 12 个 workflow 已 11 绿(e2e 全家+build artifact+codex overlay);主 CI(含原红分片)自 20:57Z 起排队约 3.5 小时未开跑——全仓 runner 池停摆/饱和(近 15 分钟全仓零完成,其他 PR 的排队 run 只被取消不被执行;舰队级观察已记录于 #4599 floor 227),属基础设施问题,代码侧无事可做。

结束主动盯守:本车道可修部分已完成并验证。主 CI 若开跑后失败,系统会自动重新转发到本车道(attempt 2/2),届时按签名处置(在册簇内→归口 #4599;簇外新签名→分支上修);若全绿,检查矩阵直接转 ready-to-merge,无需再动作。

…4758 base conflict

Rebase-free conflict resolution: master (259cd87) merged into the PR
branch. One content conflict in tests/issue1206-thirdparty-scan.test.ts
(the thirdparty-scan import line): the PR added isAntigravityClient,
master added isDshLiveCompactEntry — resolved as the union of both.
All other PR files (conflict-watch, thirdparty-scan, web/client,
web/i18n, conflict-remediation) auto-merged clean.

Net PR diff vs master stays exactly the 6-file antigravity UA change
(53+/9-); no other file differs.
@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

[bot] 🏷
(ai: vllm-qwen/qwen3.8-27b)

Conflict resolved and pushed — PR #4758 is now mergeable: true.

What I did this run (CI conflict lane, attempt 1/3):

  • Merged current master (259cd876) into the PR branch 2026-10-25_antigravity-client-attribution. Chose merge, not rebase — the branch carries ci-fixes merge history that a rebase would flatten, and merge allows a non-force fast-forward push.
  • Exactly one textual conflict: tests/issue1206-thirdparty-scan.test.ts line 11 (the thirdparty-scan import). The PR added isAntigravityClient, master added isDshLiveCompactEntry, both inserted on the same import line. Resolved as the union of both symbols. The other 5 PR files auto-merged clean.
  • Committed ff3b72c1; remote head was still 3f6790f7 (an ancestor), so the push was a fast-forward, no force-push.
  • Verified: net PR diff is exactly the 6 antigravity files (53+/9-); targeted tests conflict-remediation + issue1206-thirdparty-scan = 62/62 green; full tsc --noEmit clean; PR mergeable: true.

八问:

  1. 是什么问题: PR [PR] fix(#4688): recognize antigravity UA on the conflict surfaces #4758 与 master 基线冲突(merge state dirty),无法合并。
  2. 什么原因导致的: master 自 PR 分叉点(merge-base dfadc21b)前进到 259cd876,PR 改的 6 个文件里 5 个也被 master 动过;唯一文本冲突在 tests/issue1206-thirdparty-scan.test.ts 的 import 行——PR 插 isAntigravityClient、master 插 isDshLiveCompactEntry,两边在同一行各加一个符号。
  3. 影响范围与严重程度: 仅阻塞本 PR 合并;不影响任何用户/运行时行为。
  4. 怎么修复的: 把 master 合进 PR 分支(保留分支既有 ci-fixes 合并历史,不做 rebase 压平),唯一冲突按「两个新符号取并集」解决,fast-forward 推送(未 force)。
  5. 是否有回归问题: 无。除 import 行手工合并外,其余文件全部自动合并;净 diff 仍是 PR 原本的 6 文件 antigravity 变更(display-only),未引入任何额外改动。
  6. 是否破坏缓存: 不涉及。
  7. 是否改了设计方向: 不涉及。
  8. 是否引入了新的配置: 不涉及。

判定:冲突已解,PR 现可合并(mergeable=true);CI 检查将在新 head ff3b72c1 上重跑。

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

[ework] CI fix verified green ✓

clientFamilyOf (client-ua-registry.ts) is documented as mirroring conflictClientOf's resolution ladder, but only handled the codex UA shape. Now that conflictClientOf recognizes antigravity (#4758), the mirror was out of sync: antigravity UAs stayed bucketed under "other" in the diagnostics "observed client user-agents" section.

Add the antigravity arm (mirroring the codex line) plus a positive+negative test row. Display-only — no wire or compression semantics change; the observed-ua line is strictly more accurate (family label "other" -> "antigravity").

@ranxianglei ranxianglei left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(ai: vllm-qwen/qwen3.8-27b)

Note: I authored this PR (posting as ranxianglei), so GitHub forbids a formal APPROVE review on my own PR — this is posted as a COMMENT review carrying my full assessment. Verdict below is APPROVE-worthy; the owner should merge (the branch is currently behind master).

APPROVE — display-only antigravity attribution on the conflict surfaces. Correct, well-tested, no regression, no kernel changes.

Verification (independent review)

Direction (①): Fixes a real gap — antigravity is a known bili lane (bili antigravity, #3129/#2115) but its wire identity was never resolved server-side, so conflict sessions showed clients: (none resolved) + a generic "disable auto-compaction" hint that is misleading for this lane (it has no user-configurable auto-compaction). The fix mirrors the existing codex evidence-permitlist pattern. Root cause (missing recognition), not a symptom mask.

Correctness (③):

  • isAntigravityClient (src/thirdparty-scan.ts:135): prefix-anchored ^antigravity/, case-insensitive, deliberately NOT bare-token — a UA merely mentioning antigravity elsewhere must not inherit the lane identity. Conservative; matches the observed shape antigravity/hub/<ver>.
  • sniffScanClient (src/thirdparty-scan.ts:156): recognizes antigravity, returns undefined (closed Go binary, no scannable registry) — same contract as codex.
  • conflictClientOf (src/conflict-watch.ts:119): normalizes recorded UA hints to "antigravity". Traced end-to-end: clientHint is recorded at request time (src/server/handle.ts:1875) as sniffScanClient(...) ?? ua.slice(0,120); for antigravity that is the truncated UA (prefix preserved) → resolved. Existing sessions with already-recorded hints are also resolved by the new predicate.
  • conflictRemediation (src/conflict-watch.ts:143): new antigravity case — accurate (periodic window re-slicing is expected lane behavior, not double compression; folded content stays offline-recoverable via export --full; start a new task/session when the pruned context is needed).
  • Web switch (src/web/client.ts:386) + i18n (src/web/i18n.ts:258 zh, :1014 en): both locales carry the key; the web switch mirrors the server map. Parity holds.

Regression (②): Inventoried every client-identity surface:

  • acp_status (src/acp-status.ts:362,501), web banner (src/web/client.ts:386), launcher (src/launcher.ts:6841), sessions-data (src/web/sessions-data.ts:1410), diagnostics clients: field (src/web/diagnostics.ts:207) — all route through conflictClientOf + conflictRemediation, all now resolve antigravity. ✓
  • One gap found + fixed on the spot: clientFamilyOf (src/client-ua-registry.ts:49) is documented as "mirrors conflictClientOf's resolution ladder" but only handled codex — antigravity UAs stayed bucketed "other" in the diagnostics "observed client user-agents" section. Added the antigravity arm (mirroring the codex line) + a positive+negative test row. Display-only, strictly more accurate (family label "other" → "antigravity"). Commit 1319b6e.
  • sniffScanClient ordering (antigravity after codex, before opencode): the only theoretical behavior delta (antigravity UA + opencode header) does not exist in practice (closed binary, no opencode headers); even if it did, the antigravity UA is the stronger identity signal. No regression.
  • High-risk patterns (semantic drift, fail-fast→swallow, threshold/timing/output-format drift): none. Purely additive display logic.

Tests (④): Assertions have teeth — positive (real UA antigravity/hub/2.26.0 … + case variant) + negative (vendor/antigravity-wrapper/1.0, Mozilla/5.0 antigravity-fan-club, empty UA all stay unresolved/false); sniffScanClient contract line aligned with codex; i18n parity lists extended (en+zh). My added clientFamilyOf row is also positive+negative. Targeted local: conflict-remediation + issue1206-thirdparty-scan + issue4649-conflict-report-client-coverage = 69/69 green; tsc --noEmit clean. Full-suite verdict = CI on the pushed head.

Behavior change (old → new, display-only):

  • OLD: antigravity conflict sessions → client unresolved → generic "disable the client's own auto-compaction…" hint (misleading — this lane has no user-configurable auto-compaction).
  • NEW: resolves as antigravity; the hint states the lane's periodic window re-slicing is expected (not double compression), folded content stays offline-recoverable (export --full), and when to start a new task/session.
  • Reason: the old hint was not actionable and misleading for this lane. No wire or compression semantics change.

No kernel changes — all 6 files under src/ + tests/. The kernel-authorization HARD RULE does not apply; this merge does not wait on the human kernel tier.

八问(中文)

  1. 是什么问题:Antigravity 是已知 bili 车道,但服务端从未解析其 wire 身份——带冲突事件的会话在 banner/acp_status 里显示 clients: (none resolved),只能给通用提示「去关客户端的 auto-compaction」,对这条车道是误导(它没有用户可配置的 auto-compaction)。
  2. 什么原因导致的:功能缺位而非代码 bug——sniffScanClient 只认 claude/codex/opencode,antigravity(封闭 Go 二进制)落进「无识别」路径;conflictClientOf 没有把它归一化到已知客户端名,于是永远 unresolved。
  3. 影响范围与严重程度:纯展示面。所有带冲突事件的 antigravity 会话拿到错误提示;wire/压缩语义零影响。严重度 = 误导性展示/体验瑕疵,非功能失效。
  4. 怎么修复的:镜像 codex 既有「evidence-permitlist」模式做证据化识别——isAntigravityClient(前缀锚定 ^antigravity/、大小写不敏感、刻意不用裸 token);sniffScanClient 识别但返回 undefined(封闭二进制无可扫描 registry,与 codex 同契约);conflictClientOf 把已存 UA hint 归一化回 "antigravity";acp_status/web banner/launcher 各面加专用一行 remediation + en/zh i18n 键。
  5. 是否有回归问题:逐项审过全部客户端身份解析面,无回归。唯一缺口(clientFamilyOf 镜像漏了 antigravity,诊断「observed client user-agents」段把 antigravity UA 归到 "other")已顺手修掉(commit 1319b6e,display-only,严格更准确)。高危模式(语义漂移/吞错/阈值时序/输出格式漂移)逐项过,均不涉及。
  6. 是否破坏缓存:不涉及——不触碰 cache/retry/增量游标/去重键任何路径。
  7. 是否改了设计方向:没有。纯增量:既有识别模式加一条车道,无新机制。root re-slice 处理明确不在本 PR(#4759 待 owner 拍板)。
  8. 是否引入了新的配置:无。

已顺手修:clientFamilyOf(src/client-ua-registry.ts)镜像 ladder 漏了 antigravity——诊断「observed client user-agents」段会把 antigravity UA 归到 "other" 而非 "antigravity"。已加 antigravity 分支(镜像 codex 行)+ 正反测试行,display-only。commit 1319b6e。

判定:APPROVE。 展示面修复、模式对齐、证据充分、测试双向齐全、无内核改动、无回归。合入权在 owner。

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

[bot] 🏷 (ai: vllm-qwen/qwen3.8-27b)

Review complete for PR #4758 (antigravity UA conflict-surface recognition).

Verdict: APPROVE-worthy — display-only, no regression, no kernel changes.

What I did:

  • Reviewed all 6 files end-to-end (direction, correctness, regression, tests, house conventions).
  • Found one small gap: clientFamilyOf (src/client-ua-registry.ts) is documented as "mirrors conflictClientOf's resolution ladder" but only handled codex — antigravity UAs stayed bucketed "other" in the diagnostics "observed client user-agents" section. Fixed on the spot (added the antigravity arm mirroring the codex line + a positive/negative test row). Commit 1319b6e4, pushed to the PR branch (new head 1319b6e4ea).
  • Verified: targeted local tests 69/69 green (conflict-remediation + issue1206-thirdparty-scan + issue4649-conflict-report-client-coverage); tsc --noEmit clean. Full-suite verdict rides on CI for the new head.
  • Posted the full review (English justification + 八问 in Chinese) as a COMMENT review: [PR] fix(#4688): recognize antigravity UA on the conflict surfaces #4758 (review)

Note: I authored this PR (posting as ranxianglei), so GitHub forbids a formal APPROVE on my own PR — the review is posted as COMMENT carrying my assessment. The branch is currently behind master; the owner should merge.

已顺手修:clientFamilyOf 镜像 ladder 漏了 antigravity(诊断「observed client user-agents」段把 antigravity UA 归到 "other" 而非 "antigravity")——已加 antigravity 分支(镜像 codex 行)+ 正反测试行,display-only。commit 1319b6e。

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

[ework] CI fix verified green ✓

# Conflicts:
#	src/client-ua-registry.ts
@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

[bot] 🏷
(ai: vllm-qwen/qwen3.8-27b)

Conflict resolved and pushed — PR #4758 is now mergeable: true (attempt 1/6, done on the first pass).

What I did this run (CI conflict lane):

  • Verified live state first: master had moved again (259cd876 → 2e3cfc97) and the branch head had grown to 1319b6e4 (concurrent work added src/client-ua-registry.ts + tests/issue4649-conflict-report-client-coverage.test.ts, expanding the PR from 6 to 8 files). PR was mergeable: False.
  • Merged current master (2e3cfc97) into the branch head (1319b6e4). Chose merge, not rebase — the branch carries concurrent-work + ci-fixes merge history a rebase would flatten, and merge allows a non-force fast-forward push.
  • Exactly one textual conflict: src/client-ua-registry.ts import block. The PR added isAntigravityClient to the thirdparty-scan import; master added a new safePrefix import from text-safe.js. Resolved as the union of both (all three symbols are used in the file). The other 7 files auto-merged clean.
  • Committed ecf3ef250f; remote head was still 1319b6e4 (an ancestor), so the push was a fast-forward, no force-push.
  • Verified: net PR diff is exactly the 8 expected files (60+/13-); targeted tests (conflict-remediation + issue1206-thirdparty-scan + issue4649-conflict-report-client-coverage) = 69/69 green; full tsc --noEmit clean; PR mergeable: true.

八问:

  1. 是什么问题: PR [PR] fix(#4688): recognize antigravity UA on the conflict surfaces #4758 再次与 master 基线冲突(merge state dirty),无法合并。
  2. 什么原因导致的: master 自上次合并点(259cd876)前进到 2e3cfc97;PR 现含 8 个文件(并发工作新增了 client-ua-registry.ts 与 issue4649 覆盖测试),其中 3 个(client-ua-registry.ts/thirdparty-scan.ts/web/i18n.ts)也被 master 动过;唯一文本冲突在 src/client-ua-registry.ts 的 import 块——PR 往 thirdparty-scan import 里加了 isAntigravityClient,master 新增了一行 safePrefix(来自 text-safe.js)import。
  3. 影响范围与严重程度: 仅阻塞本 PR 合并;不影响任何用户/运行时行为。
  4. 怎么修复的: 把 master 合进分支头(保留分支既有并发工作 + ci-fixes 合并历史,不做 rebase 压平),唯一冲突按「两个 import 取并集」解决,fast-forward 推送(未 force)。
  5. 是否有回归问题: 无。除 import 块手工合并外,其余 7 文件全部自动合并;净 diff 仍是分支原本的 8 文件范围(display-only 的 antigravity/coverage 变更),未引入任何额外改动。
  6. 是否破坏缓存: 不涉及。
  7. 是否改了设计方向: 不涉及。
  8. 是否引入了新的配置: 不涉及。

判定:冲突已解,PR 现可合并(mergeable=true);CI 检查将在新 head ecf3ef250f 上重跑。

@ranxianglei ranxianglei left a comment

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(ai: vllm-qwen/qwen3.8-27b)

Re-review on new head ecf3ef250f (master merged in) — clean.

The PR branch was updated to merge current master (head moved 1319b6e4ea → ecf3ef250f). I re-verified against the new head:

  • PR diff unchanged. The merge only brought the branch up to date; the PR's own changes are the same 8 files (antigravity recognition on the conflict surfaces + the clientFamilyOf mirror fix from my earlier review). No new code, no behavior drift.
  • Targeted tests green on the new head: conflict-remediation + issue1206-thirdparty-scan + issue4649-conflict-report-client-coverage = 69/69 pass.
  • Typecheck clean (tsc --noEmit exit 0).
  • CI green on ecf3ef250f (mirror cache).

The full analysis (direction / correctness / regression / tests / behavior-change) is in my earlier review on this PR — it still applies verbatim since the diff is unchanged.

Note: I'm the PR author (token identity = ranxianglei), so GitHub blocks a self-APPROVE; this is a COMMENT review carrying the APPROVE verdict. The merge decision stays with the owner.

八问(中文)

  1. 是什么问题:Antigravity 是已知 bili 车道,但服务端从未解析其 wire 身份——带冲突事件的会话显示 clients: (none resolved) + 误导性通用提示("去关客户端 auto-compaction",该车道并无此开关)。
  2. 什么原因导致的:功能缺位——sniffScanClient/conflictClientOf 没有 antigravity 的识别规则,UA 落进"无识别"路径。
  3. 影响范围与严重程度:纯展示面;误导性提示/体验瑕疵,非功能失效,wire/压缩语义零影响。
  4. 怎么修复的:镜像 codex 既有 evidence-permitlist 模式做证据化识别(前缀锚定 ^antigravity/、大小写不敏感、刻意非裸 token)+ acp_status/web banner/launcher 各面专用一行 remediation + en/zh i18n 键。
  5. 是否有回归问题:无。逐项审过全部客户端身份解析面(acp_status / web banner / launcher / sessions-data / diagnostics);唯一缺口(clientFamilyOf 镜像漏 antigravity)已在前一轮顺手修掉(commit 1319b6e,已包含在本 head 中)。高危模式(语义漂移/吞错/阈值时序/输出格式漂移)逐项过,均不涉及。
  6. 是否破坏缓存:不涉及——不触碰 cache/retry/增量游标/去重键任何路径。
  7. 是否改了设计方向:没有,纯增量(既有识别模式加一条车道)。root re-slice 处理明确不在本 PR(#4759 待 owner 拍板)。
  8. 是否引入了新的配置:无。

判定:APPROVE(diff 未变、定向测试 69/69 绿、类型检查干净、CI 绿)。合入权在 owner。

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

[bot] 🏷 (ai: vllm-qwen/qwen3.8-27b)

Re-review on new head ecf3ef250f (master merged in) — clean, verdict unchanged: APPROVE.

The PR branch was updated to merge current master (head 1319b6e4ea → ecf3ef250f). Re-verified against the new head:

  • PR diff unchanged — the merge only brought the branch up to date; same 8 files, no new code, no behavior drift.
  • Targeted tests 69/69 green on the new head; typecheck clean (tsc --noEmit exit 0); CI green (mirror cache).

My earlier review's analysis (direction / correctness / regression / tests / behavior-change) still applies verbatim since the diff is unchanged. The clientFamilyOf mirror fix (commit 1319b6e4) is included in this head.

Note: I'm the PR author (token identity = ranxianglei), so GitHub blocks a self-APPROVE — the review is posted as a COMMENT carrying the APPROVE verdict. The merge decision stays with the owner.

Re-review: #4758 (review)

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 Powered by ework · qwen3.8-27b

[ework] CI fix verified green ✓

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant