fix(config-handler): add timeout + error boundary around loadAllPluginComponents (#1559)

This commit is contained in:
YeonGyu-Kim
2026-02-07 13:32:57 +09:00
parent 1ae7d7d67e
commit 7ede8e04f0
2 changed files with 155 additions and 14 deletions
+35 -14
View File
@@ -25,7 +25,7 @@ import { loadMcpConfigs } from "../features/claude-code-mcp-loader";
import { loadAllPluginComponents } from "../features/claude-code-plugin-loader";
import { createBuiltinMcps } from "../mcp";
import type { OhMyOpenCodeConfig } from "../config";
import { log, fetchAvailableModels, readConnectedProvidersCache, resolveModelPipeline } from "../shared";
import { log, fetchAvailableModels, readConnectedProvidersCache, resolveModelPipeline, addConfigLoadError } from "../shared";
import { getOpenCodeConfigPaths } from "../shared/opencode-config-dir";
import { migrateAgentConfig } from "../shared/permission-compat";
import { AGENT_NAME_MAP } from "../shared/migration";
@@ -104,19 +104,40 @@ export function createConfigHandler(deps: ConfigHandlerDeps) {
}
}
const pluginComponents = (pluginConfig.claude_code?.plugins ?? true)
? await loadAllPluginComponents({
enabledPluginsOverride: pluginConfig.claude_code?.plugins_override,
})
: {
commands: {},
skills: {},
agents: {},
mcpServers: {},
hooksConfigs: [],
plugins: [],
errors: [],
};
const emptyPluginDefaults = {
commands: {},
skills: {},
agents: {},
mcpServers: {},
hooksConfigs: [] as { hooks?: Record<string, unknown> }[],
plugins: [] as { name: string; version: string }[],
errors: [] as { pluginKey: string; installPath: string; error: string }[],
};
let pluginComponents: typeof emptyPluginDefaults;
const pluginsEnabled = pluginConfig.claude_code?.plugins ?? true;
if (pluginsEnabled) {
const timeoutMs = pluginConfig.experimental?.plugin_load_timeout_ms ?? 10000;
try {
const timeoutPromise = new Promise<never>((_, reject) =>
setTimeout(() => reject(new Error(`Plugin loading timed out after ${timeoutMs}ms`)), timeoutMs)
);
pluginComponents = await Promise.race([
loadAllPluginComponents({
enabledPluginsOverride: pluginConfig.claude_code?.plugins_override,
}),
timeoutPromise,
]);
} catch (error) {
const errorMessage = error instanceof Error ? error.message : String(error);
log("[config-handler] Plugin loading failed", { error: errorMessage });
addConfigLoadError({ path: "plugin-loading", error: errorMessage });
pluginComponents = emptyPluginDefaults;
}
} else {
pluginComponents = emptyPluginDefaults;
}
if (pluginComponents.plugins.length > 0) {
log(`Loaded ${pluginComponents.plugins.length} Claude Code plugins`, {