Skip to content

fix: land #454 (omp native compaction disable) on master — it was merged into its already-merged base branch - #483

Merged
ranxianglei merged 3 commits into
masterfrom
2026-09-03_omp-compaction-land
Sep 3, 2026
Merged

ranxianglei merged 3 commits into
masterfrom
2026-09-03_omp-compaction-land

Conversation

@ranxianglei

Copy link
Copy Markdown
Owner

What happened

#454 was a stacked PR: its base was 2026-09-02_pi-disable-native-compaction (#448's branch), not master. The merge sequence was:

  1. fix: archive blocks across omp native compaction instead of silently deactivating them (#395) #421 → master (1000c12, 04:26:32Z) ✅
  2. fix: bili pi launcher disables pi's native auto-compaction (#447) #448 → master (cdbf2bc, 04:27:14Z) ✅
  3. fix: bili omp launcher disables omp's native auto-compaction (#449) #454 → merged 04:27:49Z into the pi branch (b36d418), which had already been merged 35s earlier — so the omp fix never reached master

Evidence:

This PR

Merges the pi-branch tip into master, bringing in exactly the missing #454 content (cdbf2bc..b36d4183 = 01212cc only). Clean merge, no conflicts.

Pre-flight

  • npm run typecheck ✅
  • Full suite: 956/958 — the 2 failures are the known permanent plugin-agent.test.ts ones (reproduce on clean master)
  • tests/launcher.test.ts + tests/launcher-plugin-mode.test.ts: 130/130 ✅

After merge

Human merges, as always.

ework-agent and others added 3 commits September 2, 2026 23:46
prepareOmpHttpRewrite now always builds the <ompHome>-bili overlay (when the real home exists) and writes a generated config.yml with compaction.enabled=false merged over the real config.yml/config.yaml/settings.json, so omp's native auto-compaction (shouldCompact, gated by compaction.enabled) can no longer fire alongside bili's ACP compression and lossily rewrite the context. config.yml joins the overlay generated-file set (neither symlinked nor merged back into the real home, #410); models.yml is still generated only when present. Real config files are never touched.

omp reads config.yml at runtime (settings.json is only a one-time migration source renamed to .bak), so this targets config.yml rather than settings.json as the issue first suggested. Stacked on the #447 pi fix (shared overlay machinery).
…e-compaction

fix: bili omp launcher disables omp's native auto-compaction (#449)
@github-actions

github-actions Bot commented Sep 3, 2026

Copy link
Copy Markdown
Contributor

📦 Built Package Artifact

Branch: 2026-09-03_omp-compaction-land (b28571b)

Option A — Install from npm PR tag (recommended)

npm install -g billion-context@pr-483

Each push to this PR publishes a new version under the pr-483 npm tag.

Option B — Download artifact

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

This comment is automatically updated on each push.

@ranxianglei

Copy link
Copy Markdown
Owner Author

🤖 ework agent · qwen3.8-27b

[bot] 🏷 Verified — every claim in the issue body checks out, and the PR contains exactly what it says. Ready for a human merge.

Git evidence (all reproduced)

PR content

  • Head b28571b is a plain merge of the pi-branch tip into master; GitHub reports mergeable_state: clean
  • Net diff vs master = src/launcher.ts (+177/−45 region) and tests/launcher.test.ts (+93) — byte-identical stat to 01212cc; nothing else sneaks in
  • Code check: master's prepareOmpHttpRewrite (src/launcher.ts:1205) is indeed the old models.yml-only version; the PR head rebuilds it around the shared <ompHome>-bili overlay with a generated config.yml carrying compaction.enabled=false merged over the real config.yml/config.yaml/settings.json. New tests assert the generated file contains the compaction block with enabled: false.

Pre-flight (run at PR head b28571b)

  • npm run typecheck ✅ clean
  • Full suite: 957/958. The single failure is resolveClientCommand: codex/claude resolve to themselves — environment-dependent (this sandbox has /usr/bin/codex on PATH so resolution returns the absolute path); it reproduces identically on clean master, so it's pre-existing, not caused by this PR. The two "known permanent plugin-agent.test.ts" failures mentioned in the issue did not reproduce here.
  • tests/launcher.test.ts + tests/launcher-plugin-mode.test.ts: 129/130, same single environmental failure

Triage verdict

After merge (human): close/re-comment #449 pointing here, and delete the now-fully-contained 2026-09-02_pi-disable-native-compaction branch.

I can't merge PRs — system rules forbid it. Please merge yourself: #483

@ranxianglei
ranxianglei merged commit 310e48f into master Sep 3, 2026
6 checks passed
antclt pushed a commit to antclt/billion-context that referenced this pull request Oct 2, 2026
…xianglei#1725)

- acp-kernel 0.0.99 → 0.0.100. Brings four kernel changes:
  * ak#484: matchToolPattern is case-insensitive — fixes ranxianglei#1725
    (opencode "read" vs Claude-style "Read" protectedTools entries
    silently never matched, so their history could be folded).
  * ak#496: ref capacity widened to 9,999,999, hybrid widths (ranxianglei#483) —
    long side-request sessions no longer burn out at m99999.
  * ak#495: language preservation prompt rule, kernel-side opt-in only
    (exposing a bc config knob is a follow-up decision).
  * ak#479: nudge cadence re-anchors when the live count drops below the
    shown reference (ranxianglei#478) — the kernel-side fix for the class bc#1595
    patched around.
- tests/protected-tools.test.ts: new regression — "Read" pattern protects
  opencode's lowercase "read" pair end-to-end (BLOCKED refs, fold carve-out,
  survival). Verified it FAILS on 0.0.99 and PASSES on 0.0.100.
- tests/issue1595-nudge-reanchor.test.ts: with ak#479 the kernel retires
  the phantom reference inside the nudge node before bc's usage-settle
  hook runs, so the bc log line legitimately disappears; the invariant
  under test is now the end state (phantom never survives a real usage
  report), log asserted only when bc is the retiring side.

Local: typecheck ✓ build ✓ full suite 3591/3571/1/19 pre-adaptation (the 1
failure was this test's outdated log expectation), 16/16 after.
ranxianglei pushed a commit that referenced this pull request Oct 3, 2026
…eady path (#1960)

The steady request path (client echoes the round back) silently dropped
redacted_thinking blocks because anthropicToCore had no case for them, so
every later request rebuilt the latest assistant message without the block
and Anthropic answered 400 "cannot be modified" forever — the half of #1960
that kept the session stuck after the compress turn.

- acp-kernel pin 0.0.99 → 0.0.101 (exact), which carries kernel PR #500
  (redacted_thinking sidecar round-trip). Also rides along from v0.0.100+:
  #483 ref capacity widened to 9,999,999, #484 case-insensitive protected
  tool matching, #478 nudge cadence re-anchor, #493 language-preservation
  behind an opt-in flag (default off), and #499 prune/recommend shared
  per-turn index (hundreds of ms saved on ordinary requests in large
  sessions — release-note material).
- tests/issue1960-steady-redacted.test.ts: client-echoed
  [thinking(sig), redacted(data), tool_use] must survive prepare→outbound
  byte-identical in order. Verified failing on 0.0.99, passing on 0.0.101.

Preflight: typecheck clean; targeted loop/thinking/reasoning suites 186/186
green incl. both new #1960 files; build OK.
@ranxianglei
ranxianglei deleted the 2026-09-03_omp-compaction-land branch October 15, 2026 05:32
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