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

Preserve lexical bundle plugin roots

Browse Source
This commit is contained in:
Tak Hoffman 2026-03-19 01:06:05 -05:00
parent 080b574ad6
commit b2213f147e
No known key found for this signature in database
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/bundle-mcp.test.ts
View File

@ -46,8 +46,6 @@ describe("loadEnabledBundleMcpConfig", () => {
const loadedServer = loaded.config.mcpServers.bundleProbe;
const loadedArgs = getServerArgs(loadedServer);
const loadedServerPath = typeof loadedArgs?.[0] === "string" ? loadedArgs[0] : undefined;
const resolvedPluginRoot = await fs.realpath(pluginRoot);
expect(loaded.diagnostics).toEqual([]);
expect(isRecord(loadedServer) ? loadedServer.command : undefined).toBe("node");
expect(loadedArgs).toHaveLength(1);
@ -56,7 +54,7 @@ describe("loadEnabledBundleMcpConfig", () => {
throw new Error("expected bundled MCP args to include the server path");
}
expect(await fs.realpath(loadedServerPath)).toBe(resolvedServerPath);
expect(loadedServer.cwd).toBe(resolvedPluginRoot);
expect(loadedServer.cwd).toBe(pluginRoot);
} finally {
env.restore();
}
@ -178,18 +176,16 @@ describe("loadEnabledBundleMcpConfig", () => {
},
},
});
const resolvedPluginRoot = await fs.realpath(pluginRoot);
expect(loaded.diagnostics).toEqual([]);
expect(loaded.config.mcpServers.inlineProbe).toEqual({
command: path.join(resolvedPluginRoot, "bin", "server.sh"),
command: path.join(pluginRoot, "bin", "server.sh"),
args: [
path.join(resolvedPluginRoot, "servers", "probe.mjs"),
path.join(resolvedPluginRoot, "local-probe.mjs"),
path.join(pluginRoot, "servers", "probe.mjs"),
path.join(pluginRoot, "local-probe.mjs"),
],
cwd: resolvedPluginRoot,
cwd: pluginRoot,
env: {
PLUGIN_ROOT: resolvedPluginRoot,
PLUGIN_ROOT: pluginRoot,
},
});
} finally {

4
src/plugins/discovery.test.ts
View File

@ -299,9 +299,7 @@ describe("discoverOpenClawPlugins", () => {
expect(bundle?.format).toBe("bundle");
expect(bundle?.bundleFormat).toBe("codex");
expect(bundle?.source).toBe(bundleDir);
expect(normalizePathForAssertion(bundle?.rootDir)).toBe(
normalizePathForAssertion(fs.realpathSync(bundleDir)),
);
expect(normalizePathForAssertion(bundle?.rootDir)).toBe(normalizePathForAssertion(bundleDir));
});
it("auto-detects manifestless Claude bundles from the default layout", async () => {

5
src/plugins/discovery.ts
View File

@ -377,7 +377,8 @@ function addCandidate(params: {
if (params.seen.has(resolved)) {
return;
}
const resolvedRoot = safeRealpathSync(params.rootDir) ?? path.resolve(params.rootDir);
const lexicalRoot = path.resolve(params.rootDir);
const resolvedRoot = safeRealpathSync(params.rootDir) ?? lexicalRoot;
if (
isUnsafePluginCandidate({
source: resolved,
@ -395,7 +396,7 @@ function addCandidate(params: {
idHint: params.idHint,
source: resolved,
setupSource: params.setupSource,
rootDir: resolvedRoot,
rootDir: lexicalRoot,
origin: params.origin,
format: params.format ?? "openclaw",
bundleFormat: params.bundleFormat,