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

推荐订阅源

Y
Y Combinator Blog
B
Blog
S
SegmentFault 最新的问题
Vercel News
Vercel News
博客园 - 聂微东
宝玉的分享
宝玉的分享
C
Check Point Blog
有赞技术团队
有赞技术团队
IT之家
IT之家
V
V2EX
爱范儿
爱范儿
GbyAI
GbyAI
Cyber Security Advisories - MS-ISAC
Cyber Security Advisories - MS-ISAC
Microsoft Azure Blog
Microsoft Azure Blog
P
Proofpoint News Feed
博客园 - 司徒正美
博客园_首页
Last Week in AI
Last Week in AI
博客园 - 叶小钗
量子位
奇客Solidot–传递最新科技情报
奇客Solidot–传递最新科技情报
F
Fortinet All Blogs
腾讯CDC
J
Java Code Geeks

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(skills): bound grouped skill directory scans · opencl...
vincentkoc · 2026-04-30 · via Recent Commits to openclaw:main

@@ -1,4 +1,4 @@

1-

import fs from "node:fs";

1+

import fs, { type Dirent } from "node:fs";

22

import os from "node:os";

33

import path from "node:path";

44

import type { OpenClawConfig } from "../../config/types.openclaw.js";

@@ -146,6 +146,12 @@ type CandidateSkillDir = {

146146

skillMdRealPath: string;

147147

};

148148149+

type ChildDirectoryScan = {

150+

dirs: string[];

151+

scannedEntryCount: number;

152+

truncated: boolean;

153+

};

154+149155

function resolveSkillsLimits(config?: OpenClawConfig, agentId?: string): ResolvedSkillsLimits {

150156

const limits = config?.skills?.limits;

151157

const agentSkillsLimits = resolveEffectiveAgentSkillsLimits(config, agentId);

@@ -162,31 +168,53 @@ function resolveSkillsLimits(config?: OpenClawConfig, agentId?: string): Resolve

162168

};

163169

}

164170165-

function listChildDirectories(dir: string): string[] {

171+

function listChildDirectories(

172+

dir: string,

173+

opts?: {

174+

maxEntriesToScan?: number;

175+

},

176+

): ChildDirectoryScan {

177+

const maxEntriesToScan =

178+

opts?.maxEntriesToScan === undefined

179+

? Number.POSITIVE_INFINITY

180+

: Math.max(0, opts.maxEntriesToScan);

166181

try {

167-

const entries = fs.readdirSync(dir, { withFileTypes: true });

168182

const dirs: string[] = [];

169-

for (const entry of entries) {

170-

if (entry.name.startsWith(".")) continue;

171-

if (entry.name === "node_modules") continue;

172-

const fullPath = path.join(dir, entry.name);

173-

if (entry.isDirectory()) {

174-

dirs.push(entry.name);

175-

continue;

176-

}

177-

if (entry.isSymbolicLink()) {

178-

try {

179-

if (fs.statSync(fullPath).isDirectory()) {

180-

dirs.push(entry.name);

183+

let scannedEntryCount = 0;

184+

let truncated = false;

185+

const handle = fs.opendirSync(dir);

186+

try {

187+

let entry: Dirent | null;

188+

while ((entry = handle.readSync()) !== null) {

189+

if (scannedEntryCount >= maxEntriesToScan) {

190+

truncated = true;

191+

break;

192+

}

193+

scannedEntryCount += 1;

194+195+

if (entry.name.startsWith(".")) continue;

196+

if (entry.name === "node_modules") continue;

197+

const fullPath = path.join(dir, entry.name);

198+

if (entry.isDirectory()) {

199+

dirs.push(entry.name);

200+

continue;

201+

}

202+

if (entry.isSymbolicLink()) {

203+

try {

204+

if (fs.statSync(fullPath).isDirectory()) {

205+

dirs.push(entry.name);

206+

}

207+

} catch {

208+

// ignore broken symlinks

181209

}

182-

} catch {

183-

// ignore broken symlinks

184210

}

185211

}

212+

} finally {

213+

handle.closeSync();

186214

}

187-

return dirs;

215+

return { dirs, scannedEntryCount, truncated };

188216

} catch {

189-

return [];

217+

return { dirs: [], scannedEntryCount: 0, truncated: false };

190218

}

191219

}

192220

@@ -311,11 +339,10 @@ function resolveNestedSkillsRoot(

311339312340

// Heuristic: if `dir/skills/*/SKILL.md` exists for any entry, treat `dir/skills` as the real root.

313341

// Note: don't stop at 25, but keep a cap to avoid pathological scans.

314-

const nestedDirs = listChildDirectories(nested);

315342

const scanLimit = Math.max(0, opts?.maxEntriesToScan ?? 100);

316-

const toScan = scanLimit === 0 ? [] : nestedDirs.slice(0, Math.min(nestedDirs.length, scanLimit));

343+

const nestedDirs = listChildDirectories(nested, { maxEntriesToScan: scanLimit }).dirs;

317344318-

for (const name of toScan) {

345+

for (const name of nestedDirs) {

319346

const skillMd = path.join(nested, name, "SKILL.md");

320347

if (fs.existsSync(skillMd)) {

321348

return { baseDir: nested, note: `Detected nested skills root at ${nested}` };

@@ -426,19 +453,23 @@ function loadSkillEntries(

426453

});

427454

}

428455429-

const childDirs = listChildDirectories(baseDir);

430456

const maxCandidatesPerRoot = Math.max(0, limits.maxCandidatesPerRoot);

431457

const maxSkillsLoadedPerSource = Math.max(0, limits.maxSkillsLoadedPerSource);

432-

const suspicious = childDirs.length > maxCandidatesPerRoot;

433-434458

const maxCandidates = Math.min(maxCandidatesPerRoot, maxSkillsLoadedPerSource);

459+

const childDirScan = listChildDirectories(baseDir, {

460+

maxEntriesToScan: maxCandidatesPerRoot,

461+

});

462+

const childDirs = childDirScan.dirs;

463+

const suspicious = childDirScan.truncated;

435464

const limitedChildren = childDirs.toSorted().slice(0, maxCandidates);

436465437466

if (suspicious) {

438467

skillsLogger.warn("Skills root looks suspiciously large, truncating discovery.", {

439468

dir: params.dir,

440469

baseDir,

441470

childDirCount: childDirs.length,

471+

scannedEntryCount: childDirScan.scannedEntryCount,

472+

maxEntriesToScan: maxCandidatesPerRoot,

442473

maxCandidatesPerRoot: limits.maxCandidatesPerRoot,

443474

maxSkillsLoadedPerSource: limits.maxSkillsLoadedPerSource,

444475

});

@@ -482,8 +513,11 @@ function loadSkillEntries(

482513

} else {

483514

// No SKILL.md here — check one level deeper for grouped skill directories.

484515

// Apply the same per-root cap as the outer scan to avoid scanning huge nested trees.

485-

const nestedChildren = listChildDirectories(skillDir);

486-

const nestedSuspicious = nestedChildren.length > maxCandidatesPerRoot;

516+

const nestedChildScan = listChildDirectories(skillDir, {

517+

maxEntriesToScan: maxCandidatesPerRoot,

518+

});

519+

const nestedChildren = nestedChildScan.dirs;

520+

const nestedSuspicious = nestedChildScan.truncated;

487521

if (nestedSuspicious) {

488522

skillsLogger.warn(

489523

"Nested skills directory looks suspiciously large, truncating discovery.",

@@ -492,12 +526,14 @@ function loadSkillEntries(

492526

baseDir,

493527

nestedDir: skillDir,

494528

nestedChildDirCount: nestedChildren.length,

529+

scannedEntryCount: nestedChildScan.scannedEntryCount,

530+

maxEntriesToScan: maxCandidatesPerRoot,

495531

maxCandidatesPerRoot: limits.maxCandidatesPerRoot,

496532

maxSkillsLoadedPerSource: limits.maxSkillsLoadedPerSource,

497533

},

498534

);

499535

}

500-

const limitedNested = nestedChildren.toSorted().slice(0, maxCandidatesPerRoot);

536+

const limitedNested = nestedChildren.toSorted();

501537

for (const nestedName of limitedNested) {

502538

const nestedDir = path.join(skillDir, nestedName);

503539

const nestedSkillMd = path.join(nestedDir, "SKILL.md");