nyrn
/
openclaw
mirror of https://github.com/openclaw/openclaw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

config: fall back to jiti for channel config surfaces

This commit is contained in:
Jacob Tomlinson 2026-03-27 19:26:30 +00:00
parent 605c9306ab
commit 16ed9bf147
No known key found for this signature in database
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/load-channel-config-surface.ts
View File

@ -264,14 +264,25 @@ export async function loadChannelConfigSurfaceModule(
});
return jiti(resolvedPath) as Record<string, unknown>;
};
const loadFromPath = (
candidatePath: string,
): { schema: Record<string, unknown>; uiHints?: Record<string, unknown> } | null => {
try {
const bunLoaded = loadViaBun(candidatePath);
if (bunLoaded && isBuiltChannelConfigSchema(bunLoaded)) {
return bunLoaded;
}
} catch {
// Bun is the fastest happy path, but some plugin config modules only load
// correctly through the source-aware Jiti alias setup.
}
const imported = loadViaJiti(candidatePath);
return resolveConfigSchemaExport(imported);
};
try {
const bunLoaded = loadViaBun(modulePath);
if (bunLoaded && isBuiltChannelConfigSchema(bunLoaded)) {
return bunLoaded;
}
const imported = loadViaJiti(modulePath);
return resolveConfigSchemaExport(imported);
return loadFromPath(modulePath);
} catch (error) {
if (!shouldRetryViaIsolatedCopy(error)) {
throw error;
@ -279,12 +290,7 @@ export async function loadChannelConfigSurfaceModule(
const isolatedCopy = copyModuleImportGraphWithoutNodeModules({ modulePath, repoRoot });
try {
const bunLoaded = loadViaBun(isolatedCopy.copiedModulePath);
if (bunLoaded && isBuiltChannelConfigSchema(bunLoaded)) {
return bunLoaded;
}
const imported = loadViaJiti(isolatedCopy.copiedModulePath);
return resolveConfigSchemaExport(imported);
return loadFromPath(isolatedCopy.copiedModulePath);
} finally {
isolatedCopy.cleanup();
}