fix: remove duplicate declarations from v2026.7.1 merge (#134) - #151
Conversation
SE workflow step-3/4 QA deliverable for run openclaw#488. Documents the 25 test cases (TC-01..TC-25) designed by Gem covering build success, regression detection for the 3 affected files (model-pricing-cache.ts, session-store-runtime.ts, embedded-gateway-stub.ts), CI cascade verification, and upstream v2026.7.1 cross-check for the duplicate-identifier build break introduced by merge 980a96f.
The v2026.7.1 upstream merge kept both sides of 3 import hunks during conflict resolution, producing duplicate top-level identifiers that broke tsdown/rolldown builds (PARSE_ERROR). Removed the duplicate import line in each of the 3 affected files: - src/agents/tools/embedded-gateway-stub.ts - src/gateway/model-pricing-cache.ts - src/plugin-sdk/session-store-runtime.ts In model-pricing-cache.ts, the surviving import is ../infra/http-body.js rather than @openclaw/media-core/read-response-with-limit, since the latter package path does not resolve. Closes #134
|
CI gate status: 45 previously-red jobs on main now green on this branch (fix verified effective). Remaining 13 typecheck-blocked failures trace to a newly-discovered sibling defect from the same 980a96f merge — filed as #152. Merge is held until #152 is fixed and CI re-run comes back green. 2 other failures are pre-existing/unrelated (pnpm audit advisory, docs_map staleness). |
…ce to attemptAssistant (#152) One-line rename fixing a TS2304 compile error — stale identifier left over from the v2026.7.1 upstream merge (980a96f), sibling defect to #134. Zero behavioral change. Admin-merge override: all 62 CI failures triaged and confirmed pre-existing (58 from #134's unrelated duplicate-declaration cascade; check-docs/security-fast/check-shrinkwrap independently confirmed failing on main/PR #151 baseline too). Full triage in PR comment. Closes #152.
CI Triage — Merge Rationale (Gidget, Version Control)Branch updated from Confirmed fixed by the branch update: all previously-blocked jobs tied to #152 now pass, including Remaining 12 failures — all triaged as pre-existing on
None of the 12 failures reference any of the 3 files this PR fixes. Merging with admin override; will file a follow-up issue for the newly-identified |
Summary
Fixes the v2026.7.1 upstream merge (980a96f) build break caused by 3 duplicate import declarations left behind during conflict resolution (both sides of the hunk were kept instead of one).
Removes one duplicate/dead import line in each of the 3 affected files:
src/agents/tools/embedded-gateway-stub.ts— removed duplicateimport { normalizeFastMode, type FastMode } from "@openclaw/normalization-core/string-coerce"(kept the surviving copy at line 4; unchanged).src/gateway/model-pricing-cache.ts— removed the dead, unresolvable@openclaw/media-core/read-response-with-limitimport; kept the correct/working../infra/http-body.jsimport that the call site actually resolves against.src/plugin-sdk/session-store-runtime.ts— removed duplicateimport { resolveStorePath as resolveSessionStorePath } from "../config/sessions/paths.js".No logic changes, no new behavior, no public API/SDK export-surface changes — this restores the pre-merge-breakage state. All new functionality introduced by the v2026.7.1 merge in these 3 files (ambient-transcript-watermark exports, new embedded-gateway-stub pagination helpers, etc.) is preserved untouched.
Closes #134
Verification
66dafac2) on the production-pinned Node v22.23.1 —pnpm install,pnpm build:docker,pnpm buildall exit 0 with zero PARSE_ERROR. Gateway boots and restarts cleanly (active (running), clean journalctl boot log).openclaw --versionconfirms the running binary is built from66dafac. Full report:se-runs/se488-step7-staging-results.md.se-runs/se488-step8-qa-validation.md.CHANGELOG.mdis release-generation-only per repo convention (not edited here). Full report:se-runs/se488-step9-doc-report.md.CI note: TC-11–TC-20 (contract shards, types, lint, boundary checks, docs, install-smoke, plugin-npm-release, scheduled-live) were deliberately deferred to this PR's CI run as part of the test plan. Merge is gated on all checks going green here.
Test/Reference Artifacts
tests/TEST-CASES-134.md(test design, committed on this branch)se-runs/se488-step7-staging-results.mdse-runs/se488-step8-qa-validation.mdse-runs/se488-step9-doc-report.md