mirror of
https://github.com/openclaw/openclaw.git
synced 2026-07-25 17:21:12 +00:00
efa7e1a85a
* fix(scripts): bound conflict-marker scan reads to prevent OOM on large files * test(scripts): add regression test for bounded conflict-marker scan on large files * fix(scripts): update conflict-marker declaration for bounded scan params * fix(scripts): bounded exact scan for conflict markers * fix(scripts): use git grep line-number output for conflict-marker scan * style(scripts): rename shadowed variable in conflict-marker parser * ci(scripts): retry build artifacts after plugin-sdk export check flake * fix(scripts): report tracked conflict-marker paths relative to cwd * test(scripts): type execFileSync error by stderr shape * fix(scripts): parse NUL-delimited path before record split in conflict-marker scan * refactor(scripts): remove obsolete conflict scan helper * fix(scripts): disable color in conflict marker scan Co-authored-by: 陈宪彪0668000387 <chen.xianbiao@xydigit.com> --------- Co-authored-by: Peter Steinberger <steipete@gmail.com> Co-authored-by: Peter Steinberger <peter@steipete.me>