惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

Hugging Face - Blog
Hugging Face - Blog
Vercel News
Vercel News
C
Check Point Blog
G
Google Developers Blog
博客园 - 司徒正美
量子位
Engineering at Meta
Engineering at Meta
S
SegmentFault 最新的问题
Google DeepMind News
Google DeepMind News
F
Fortinet All Blogs
A
About on SuperTechFans
美团技术团队
D
DataBreaches.Net
Stack Overflow Blog
Stack Overflow Blog
Jina AI
Jina AI
Y
Y Combinator Blog
奇客Solidot–传递最新科技情报
奇客Solidot–传递最新科技情报
Apple Machine Learning Research
Apple Machine Learning Research
J
Java Code Geeks
MongoDB | Blog
MongoDB | Blog
人人都是产品经理
人人都是产品经理
H
Hackread – Cybersecurity News, Data Breaches, AI and More
The Cloudflare Blog
U
Unit 42

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(scripts): prefilter conflict marker scans · openclaw/...
vincentkoc · 2026-05-25 · via Recent Commits to openclaw:main
Original file line numberDiff line numberDiff line change

@@ -8,6 +8,7 @@ Docs: https://docs.openclaw.ai

88
99

### Fixes

1010
11+

- Scripts: use `git grep` to prefilter tracked conflict-marker scans so changed checks avoid reading every repository file on clean runs.

1112

- Installer: install Node.js through `apk` on Alpine Linux instead of falling through to the NodeSource package-manager path.

1213

- Installer: detect musl Linux shells such as Alpine as Linux instead of rejecting them before npm install.

1314

- Control UI: split large build-time runtime dependencies into stable chunks so Linux/Docker install and package builds stay below the app chunk warning threshold.

Original file line numberDiff line numberDiff line change

@@ -1,10 +1,12 @@

11

#!/usr/bin/env node

22
3-

import { execFileSync } from "node:child_process";

3+

import { execFileSync, spawnSync } from "node:child_process";

44

import fs from "node:fs";

55

import path from "node:path";

66

import { fileURLToPath } from "node:url";

77
8+

const CONFLICT_MARKER_GREP_PATTERN = "^(<<<<<<< |\\|\\|\\|\\|\\|\\|\\| |=======$|>>>>>>> )";

9+
810

function isBinaryBuffer(buffer) {

911

return buffer.includes(0);

1012

}

@@ -62,9 +64,39 @@ export function findConflictMarkersInFiles(filePaths, readFile = fs.readFileSync

6264

return violations;

6365

}

6466
67+

export function listTrackedFilesWithConflictMarkerCandidates(

68+

cwd = process.cwd(),

69+

run = spawnSync,

70+

) {

71+

const result = run(

72+

"git",

73+

["grep", "-l", "-z", "-I", "-E", CONFLICT_MARKER_GREP_PATTERN, "--", "."],

74+

{

75+

cwd,

76+

encoding: "buffer",

77+

},

78+

);

79+

if (result.status === 1) {

80+

return [];

81+

}

82+

if (result.status !== 0) {

83+

const stderr = result.stderr?.toString("utf8").trim();

84+

throw new Error(stderr || `git grep failed with status ${result.status ?? "unknown"}`);

85+

}

86+

return result.stdout

87+

.toString("utf8")

88+

.split("\0")

89+

.filter(Boolean)

90+

.map((relativePath) => path.join(cwd, relativePath));

91+

}

92+
93+

export function findConflictMarkersInTrackedFiles(cwd = process.cwd()) {

94+

return findConflictMarkersInFiles(listTrackedFilesWithConflictMarkerCandidates(cwd));

95+

}

96+
6597

export async function main() {

6698

const cwd = process.cwd();

67-

const violations = findConflictMarkersInFiles(listTrackedFiles(cwd));

99+

const violations = findConflictMarkersInTrackedFiles(cwd);

68100

if (violations.length === 0) {

69101

return;

70102

}

Original file line numberDiff line numberDiff line change

@@ -5,6 +5,7 @@ import { describe, expect, it } from "vitest";

55

import {

66

findConflictMarkerLines,

77

findConflictMarkersInFiles,

8+

findConflictMarkersInTrackedFiles,

89

listTrackedFiles,

910

} from "../../scripts/check-no-conflict-markers.mjs";

1011

import { createScriptTestHarness } from "./test-helpers.js";

@@ -37,7 +38,9 @@ describe("check-no-conflict-markers", () => {

3738

it("ignores marker-like text when it is indented or inline", () => {

3839

expect(

3940

findConflictMarkerLines(

40-

["Example:", " <<<<<<< HEAD", "const text = '======= not a conflict';"].join("\n"),

41+

["Example:", " <<<<<<< HEAD", "const text = '======= not a conflict';", "========"].join(

42+

"\n",

43+

),

4144

),

4245

).toStrictEqual([]);

4346

});

@@ -79,7 +82,14 @@ describe("check-no-conflict-markers", () => {

7982

);

8083

git(rootDir, "add", "scripts/bundled-plugin-metadata-runtime.mjs");

8184
82-

const violations = findConflictMarkersInFiles(listTrackedFiles(rootDir));

85+

expect(findConflictMarkersInFiles(listTrackedFiles(rootDir))).toEqual([

86+

{

87+

filePath: scriptFile,

88+

lines: [1, 3, 5],

89+

},

90+

]);

91+
92+

const violations = findConflictMarkersInTrackedFiles(rootDir);

8393
8494

expect(violations).toEqual([

8595

{