cb601ddd77
Category-based delegation (task(category='quick')) was broken because
SISYPHUS_JUNIOR_AGENT sent 'sisyphus-junior' to session.prompt but
config.agent keys are now display names ('Sisyphus-Junior').
- Use getAgentDisplayName() for SISYPHUS_JUNIOR_AGENT constant
- Replace hardcoded 'sisyphus-junior' strings in tools.ts with constant
- Update background-output local constants to use display names
- Add remapCommandAgentFields() to translate command agent fields
- Add raw-key fallback in tool-config-handler agentByKey()
83 lines
2.8 KiB
TypeScript
83 lines
2.8 KiB
TypeScript
import type { OhMyOpenCodeConfig } from "../config";
|
|
import { getAgentDisplayName } from "../shared/agent-display-names";
|
|
import {
|
|
loadUserCommands,
|
|
loadProjectCommands,
|
|
loadOpencodeGlobalCommands,
|
|
loadOpencodeProjectCommands,
|
|
} from "../features/claude-code-command-loader";
|
|
import { loadBuiltinCommands } from "../features/builtin-commands";
|
|
import {
|
|
discoverConfigSourceSkills,
|
|
loadUserSkills,
|
|
loadProjectSkills,
|
|
loadOpencodeGlobalSkills,
|
|
loadOpencodeProjectSkills,
|
|
skillsToCommandDefinitionRecord,
|
|
} from "../features/opencode-skill-loader";
|
|
import type { PluginComponents } from "./plugin-components-loader";
|
|
|
|
export async function applyCommandConfig(params: {
|
|
config: Record<string, unknown>;
|
|
pluginConfig: OhMyOpenCodeConfig;
|
|
ctx: { directory: string };
|
|
pluginComponents: PluginComponents;
|
|
}): Promise<void> {
|
|
const builtinCommands = loadBuiltinCommands(params.pluginConfig.disabled_commands);
|
|
const systemCommands = (params.config.command as Record<string, unknown>) ?? {};
|
|
|
|
const includeClaudeCommands = params.pluginConfig.claude_code?.commands ?? true;
|
|
const includeClaudeSkills = params.pluginConfig.claude_code?.skills ?? true;
|
|
|
|
const [
|
|
configSourceSkills,
|
|
userCommands,
|
|
projectCommands,
|
|
opencodeGlobalCommands,
|
|
opencodeProjectCommands,
|
|
userSkills,
|
|
projectSkills,
|
|
opencodeGlobalSkills,
|
|
opencodeProjectSkills,
|
|
] = await Promise.all([
|
|
discoverConfigSourceSkills({
|
|
config: params.pluginConfig.skills,
|
|
configDir: params.ctx.directory,
|
|
}),
|
|
includeClaudeCommands ? loadUserCommands() : Promise.resolve({}),
|
|
includeClaudeCommands ? loadProjectCommands(params.ctx.directory) : Promise.resolve({}),
|
|
loadOpencodeGlobalCommands(),
|
|
loadOpencodeProjectCommands(params.ctx.directory),
|
|
includeClaudeSkills ? loadUserSkills() : Promise.resolve({}),
|
|
includeClaudeSkills ? loadProjectSkills(params.ctx.directory) : Promise.resolve({}),
|
|
loadOpencodeGlobalSkills(),
|
|
loadOpencodeProjectSkills(params.ctx.directory),
|
|
]);
|
|
|
|
params.config.command = {
|
|
...builtinCommands,
|
|
...skillsToCommandDefinitionRecord(configSourceSkills),
|
|
...userCommands,
|
|
...userSkills,
|
|
...opencodeGlobalCommands,
|
|
...opencodeGlobalSkills,
|
|
...systemCommands,
|
|
...projectCommands,
|
|
...projectSkills,
|
|
...opencodeProjectCommands,
|
|
...opencodeProjectSkills,
|
|
...params.pluginComponents.commands,
|
|
...params.pluginComponents.skills,
|
|
};
|
|
|
|
remapCommandAgentFields(params.config.command as Record<string, Record<string, unknown>>);
|
|
}
|
|
|
|
function remapCommandAgentFields(commands: Record<string, Record<string, unknown>>): void {
|
|
for (const cmd of Object.values(commands)) {
|
|
if (cmd?.agent && typeof cmd.agent === "string") {
|
|
cmd.agent = getAgentDisplayName(cmd.agent);
|
|
}
|
|
}
|
|
}
|