Ayuriel/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(plugins): share bundle path list helpers

Browse Source
This commit is contained in:
Peter Steinberger 2026-03-17 05:45:54 +00:00
parent c974adf10d
commit 45510084cd
2 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/bundle-manifest.ts
View File

@ -46,11 +46,11 @@ function normalizePathList(value: unknown): string[] {
return value.map((entry) => (typeof entry === "string" ? entry.trim() : "")).filter(Boolean);
}
function normalizeBundlePathList(value: unknown): string[] {
export function normalizeBundlePathList(value: unknown): string[] {
return Array.from(new Set(normalizePathList(value)));
}
function mergeBundlePathLists(...groups: string[][]): string[] {
export function mergeBundlePathLists(...groups: string[][]): string[] {
const merged: string[] = [];
const seen = new Set<string>();
for (const group of groups) {

34
src/plugins/bundle-mcp.ts
View File

@ -8,6 +8,8 @@ import {
CLAUDE_BUNDLE_MANIFEST_RELATIVE_PATH,
CODEX_BUNDLE_MANIFEST_RELATIVE_PATH,
CURSOR_BUNDLE_MANIFEST_RELATIVE_PATH,
mergeBundlePathLists,
normalizeBundlePathList,
} from "./bundle-manifest.js";
import { normalizePluginsConfig, resolveEffectiveEnableState } from "./config-state.js";
import { loadPluginManifestRegistry } from "./manifest-registry.js";
@ -41,32 +43,6 @@ const MANIFEST_PATH_BY_FORMAT: Record<PluginBundleFormat, string> = {
};
const CLAUDE_PLUGIN_ROOT_PLACEHOLDER = "${CLAUDE_PLUGIN_ROOT}";
function normalizePathList(value: unknown): string[] {
if (typeof value === "string") {
const trimmed = value.trim();
return trimmed ? [trimmed] : [];
}
if (!Array.isArray(value)) {
return [];
}
return value.map((entry) => (typeof entry === "string" ? entry.trim() : "")).filter(Boolean);
}
function mergeUniquePathLists(...groups: string[][]): string[] {
const merged: string[] = [];
const seen = new Set<string>();
for (const group of groups) {
for (const entry of group) {
if (seen.has(entry)) {
continue;
}
seen.add(entry);
merged.push(entry);
}
}
return merged;
}
function readPluginJsonObject(params: {
rootDir: string;
relativePath: string;
@ -103,12 +79,12 @@ function resolveBundleMcpConfigPaths(params: {
rootDir: string;
bundleFormat: PluginBundleFormat;
}): string[] {
const declared = normalizePathList(params.raw.mcpServers);
const declared = normalizeBundlePathList(params.raw.mcpServers);
const defaults = fs.existsSync(path.join(params.rootDir, ".mcp.json")) ? [".mcp.json"] : [];
if (params.bundleFormat === "claude") {
return mergeUniquePathLists(defaults, declared);
return mergeBundlePathLists(defaults, declared);
}
return mergeUniquePathLists(defaults, declared);
return mergeBundlePathLists(defaults, declared);
}
export function extractMcpServerMap(raw: unknown): Record<string, BundleMcpServerConfig> {