chore(#387): pin acp-kernel 0.0.64 - #384
Conversation
|
解决冲突 |
dab8ca9 to
a955eeb
Compare
📦 Built Extension ArtifactBranch: Option A — Install from npm PR tag (recommended)pi install npm:billion-context-pi@pr-384Each push to this PR publishes a new version under the Option B — Download artifact
tar xzf billion-context-pi-pr384.tgz
pi install ./packageThis comment is automatically updated on each push. |
[bot] 🏷 冲突已解决,分支已 rebase 到当前 master( 冲突的本质(不只是文本重叠):master 上的 #377 用适配器端 解决方式(按 #376 floor 5 的原定路线:acp-kernel 落地后以内核为跨度唯一来源,本 PR 方案胜出):
与 #377 的行为差异(内核格式化器的固有取舍,提请注意):不再有 本地验证(rebase 后,针对已发布的 acp-kernel 0.0.64,已确认其在 npm 上存在,满足"内核先发"规则):
查重说明:本 PR 与已合并的 #377 同属 #376,但非重复——#377 是过渡性的适配器端实现,本 PR 是按原计划用内核 CI:pr-validation 已过,test matrix(ubuntu/windows × 22/24 + e2e)运行中,全绿后即可合并。 中文摘要:解决了本分支与 master(#377)在 compress 结果面板上的冲突——两边各实现了一遍块跨度输出,直接合并会重复列块;已按本 PR 的内核方案统一为第二行 |
Enables the nudge-side half of the #375 fix: active block map ('Active blocks (N): b1=m00001–m00009 · …') and per-range user-msg counts in efficiency/emergency nudges. Nudge text is rendered by the kernel (renderNudgeText), so no adapter code changes are needed. The compress-result block spans (#376) already shipped via #377.
a955eeb to
b91d5c7
Compare
[bot] 🏷 跟进:我上一条回复后,本 PR 的 head 被替换了——处理 #387 的会话在 06:53Z 把分支重建为 pin-only( CI 失败已查证,与 pin 无关。 4 个 test job 挂掉的原因完全一致: 一个值得注意的细节:我之前的冲突解决 head 当前状态与建议合并顺序:
另外:两个 daemon 会话共用同一 bot 身份、在同一分支上静默互相覆盖这件事本身是个流程隐患(本次内容上无害,但不可复现安全),已单独提了流程 issue:ranxianglei/ework-daemon#2 。 我之前的冲突解决版本仍保留在本地(SHA 中文摘要:查证了新 head |
Version bump only: acp-kernel 0.0.63 → 0.0.64 (+ lockfile), 2 files / 5 lines.
History: this PR originally implemented #376 locally (compress result
blocks:line via the kernel's newformatCreatedBlocks). While it was open, #377 — opened a day earlier, merged 8 minutes before this PR was created — landed the same feature with a richer local implementation (blockSpanLabelwith*hole markers + Tn suffixes). The overlap caused the merge conflict reported on #375. This branch has been rebuilt on current master keeping only what #377 did not ship: the kernel pin bump, which activates the nudge-side half of the #375 fix:Active blocks (N): b1=m00001–m00009 · …line in gentle/emergency nudges (exact block → ref-span ledger);· N user msgscount on compressible ranges.Verified against published 0.0.64: typecheck clean, build OK. Full suite needs #386 first (master currently carries 7 pre-existing export-cmd failures unrelated to this bump — verified failing identically on 0.0.63); with #386 applied the suite is fully green (725 tests, 0 fail).
Fixes #387