luna/oh-my-opencode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: unify agent display names and strip invisible sort prefixes

Browse Source 
- Replace getAgentRuntimeName with getAgentDisplayName for consistency
- Add stripAgentListSortPrefix helper to normalize agent names
- Strip sort prefixes in subagent-resolver and sync-executor
- Backfill canonical names for core agents when builtin configs omit name
- Update tests to match new behavior
This commit is contained in:
YeonGyu-Kim
2026-04-11 14:53:01 +09:00
parent c30b058b7e
commit 9f135af41c
9 changed files with 180 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugin-handlers/agent-config-handler.test.ts
+12 -3
View File
@@ -201,7 +201,10 @@ describe("applyAgentConfig builtin override protection", () => {
})
// then
expect(result[BUILTIN_SISYPHUS_DISPLAY_NAME]).toEqual(builtinSisyphusConfig)
expect(result[BUILTIN_SISYPHUS_DISPLAY_NAME]).toEqual({
...builtinSisyphusConfig,
name: getAgentDisplayName("sisyphus"),
})
})
test("filters user agents whose key differs from a builtin key only by case", async () => {
@@ -223,7 +226,10 @@ describe("applyAgentConfig builtin override protection", () => {
})
// then
expect(result[BUILTIN_SISYPHUS_DISPLAY_NAME]).toEqual(builtinSisyphusConfig)
expect(result[BUILTIN_SISYPHUS_DISPLAY_NAME]).toEqual({
...builtinSisyphusConfig,
name: getAgentDisplayName("sisyphus"),
})
expect(result.SiSyPhUs).toBeUndefined()
})
@@ -247,7 +253,10 @@ describe("applyAgentConfig builtin override protection", () => {
})
// then
expect(result[BUILTIN_SISYPHUS_DISPLAY_NAME]).toEqual(builtinSisyphusConfig)
expect(result[BUILTIN_SISYPHUS_DISPLAY_NAME]).toEqual({
...builtinSisyphusConfig,
name: getAgentDisplayName("sisyphus"),
})
})
describe("#given protected builtin agents use hyphenated names", () => {
src/plugin-handlers/agent-config-handler.ts
+3 -3
View File
@@ -2,7 +2,7 @@ import { createBuiltinAgents } from "../agents";
import { createSisyphusJuniorAgentWithOverrides } from "../agents/sisyphus-junior";
import type { OhMyOpenCodeConfig } from "../config";
import { isTaskSystemEnabled, log, migrateAgentConfig } from "../shared";
import { getAgentRuntimeName } from "../shared/agent-display-names";
import { getAgentDisplayName } from "../shared/agent-display-names";
import { AGENT_NAME_MAP } from "../shared/migration";
import { registerAgentName } from "../features/claude-code-session-state";
import {
@@ -159,10 +159,10 @@ export async function applyAgentConfig(params: {
if (isSisyphusEnabled && builtinAgents.sisyphus) {
if (configuredDefaultAgent) {
(params.config as { default_agent?: string }).default_agent =
getAgentRuntimeName(configuredDefaultAgent);
getAgentDisplayName(configuredDefaultAgent);
} else {
(params.config as { default_agent?: string }).default_agent =
getAgentRuntimeName("sisyphus");
getAgentDisplayName("sisyphus");
}
// Assembly order: Sisyphus -> Hephaestus -> Prometheus -> Atlas
src/plugin-handlers/agent-key-remapper.test.ts
+42 -7
View File
@@ -1,6 +1,6 @@
import { describe, it, expect } from "bun:test"
import { remapAgentKeysToDisplayNames } from "./agent-key-remapper"
import { getAgentDisplayName, getAgentRuntimeName } from "../shared/agent-display-names"
import { getAgentDisplayName } from "../shared/agent-display-names"
describe("remapAgentKeysToDisplayNames", () => {
it("remaps known agent keys to display names", () => {
@@ -106,7 +106,7 @@ describe("remapAgentKeysToDisplayNames", () => {
}
})
it("preserves clean keys but rewrites core agent name fields to list-display names for tab cycling", () => {
it("preserves clean keys and rewrites core agent name fields to canonical display names", () => {
// given agents with raw config-key names
const agents = {
sisyphus: { name: "sisyphus", prompt: "test", mode: "primary" },
@@ -119,7 +119,7 @@ describe("remapAgentKeysToDisplayNames", () => {
// when remapping
const result = remapAgentKeysToDisplayNames(agents)
// then keys stay HTTP-header-safe, but nested names carry stable list ordering
// then keys stay HTTP-header-safe, and nested names match the lookup-safe display names
expect(Object.keys(result).slice(0, 4)).toEqual([
getAgentDisplayName("sisyphus"),
getAgentDisplayName("hephaestus"),
@@ -127,25 +127,60 @@ describe("remapAgentKeysToDisplayNames", () => {
getAgentDisplayName("atlas"),
])
expect(result[getAgentDisplayName("sisyphus")]).toEqual({
name: getAgentRuntimeName("sisyphus"),
name: getAgentDisplayName("sisyphus"),
prompt: "test",
mode: "primary",
})
expect(result[getAgentDisplayName("hephaestus")]).toEqual({
name: getAgentRuntimeName("hephaestus"),
name: getAgentDisplayName("hephaestus"),
prompt: "test",
mode: "primary",
})
expect(result[getAgentDisplayName("prometheus")]).toEqual({
name: getAgentRuntimeName("prometheus"),
name: getAgentDisplayName("prometheus"),
prompt: "test",
mode: "all",
})
expect(result[getAgentDisplayName("atlas")]).toEqual({
name: getAgentRuntimeName("atlas"),
name: getAgentDisplayName("atlas"),
prompt: "test",
mode: "primary",
})
expect(result.oracle).toEqual({ name: "oracle", prompt: "test", mode: "subagent" })
})
it("backfills canonical display names for core agents when builtin configs omit name", () => {
// given builtin-style configs without name fields
const agents = {
sisyphus: { prompt: "test", mode: "primary" },
hephaestus: { prompt: "test", mode: "primary" },
prometheus: { prompt: "test", mode: "all" },
atlas: { prompt: "test", mode: "primary" },
}
// when remapping
const result = remapAgentKeysToDisplayNames(agents)
// then OpenCode receives lookup-safe display names and uses order for sorting
expect(result[getAgentDisplayName("sisyphus")]).toEqual({
name: getAgentDisplayName("sisyphus"),
prompt: "test",
mode: "primary",
})
expect(result[getAgentDisplayName("hephaestus")]).toEqual({
name: getAgentDisplayName("hephaestus"),
prompt: "test",
mode: "primary",
})
expect(result[getAgentDisplayName("prometheus")]).toEqual({
name: getAgentDisplayName("prometheus"),
prompt: "test",
mode: "all",
})
expect(result[getAgentDisplayName("atlas")]).toEqual({
name: getAgentDisplayName("atlas"),
prompt: "test",
mode: "primary",
})
})
})
src/plugin-handlers/agent-key-remapper.ts
+3 -7
View File
@@ -1,21 +1,17 @@
import { getAgentDisplayName, getAgentRuntimeName } from "../shared/agent-display-names"
import { getAgentDisplayName } from "../shared/agent-display-names"
function rewriteAgentNameForListDisplay(
key: string,
value: unknown,
): unknown {
if (typeof value !== "object" || value === null || !("name" in value)) {
if (typeof value !== "object" || value === null) {
return value
}
const agent = value as Record<string, unknown>
if (typeof agent.name !== "string") {
return value
}
return {
...agent,
name: getAgentRuntimeName(key),
name: getAgentDisplayName(key),
}
}
src/plugin-handlers/config-handler.test.ts
+64 -7
View File
@@ -315,6 +315,63 @@ describe("Plan agent demote behavior", () => {
])
})
test("backfills core agent runtime names when builtin configs omit name", async () => {
// #given
const createBuiltinAgentsMock = agents.createBuiltinAgents as unknown as {
mockResolvedValue: (value: Record<string, unknown>) => void
}
createBuiltinAgentsMock.mockResolvedValue({
sisyphus: { prompt: "test", mode: "primary" },
hephaestus: { prompt: "test", mode: "primary" },
oracle: { prompt: "test", mode: "subagent" },
atlas: { prompt: "test", mode: "primary" },
})
const pluginConfig = createPluginConfig({
sisyphus_agent: {
planner_enabled: true,
},
})
const config: Record<string, unknown> = {
model: "anthropic/claude-opus-4-6",
agent: {},
}
const handler = createConfigHandler({
ctx: { directory: "/tmp" },
pluginConfig,
modelCacheState: {
anthropicContext1MEnabled: false,
modelContextLimitsCache: new Map(),
},
})
// #when
await handler(config)
// #then
const emittedCoreEntries = Object.entries(
config.agent as Record<string, { name?: string }>,
).slice(0, 4)
expect(emittedCoreEntries).toEqual([
[
getAgentDisplayName("sisyphus"),
expect.objectContaining({ name: getAgentDisplayName("sisyphus") }),
],
[
getAgentDisplayName("hephaestus"),
expect.objectContaining({ name: getAgentDisplayName("hephaestus") }),
],
[
getAgentDisplayName("prometheus"),
expect.objectContaining({ name: getAgentDisplayName("prometheus") }),
],
[
getAgentDisplayName("atlas"),
expect.objectContaining({ name: getAgentDisplayName("atlas") }),
],
])
})
test("plan agent should be demoted to subagent without inheriting prometheus prompt", async () => {
// #given
const pluginConfig = createPluginConfig({
@@ -479,7 +536,7 @@ describe("default_agent behavior with Sisyphus orchestration", () => {
await handler(config)
// then
expect(config.default_agent).toBe(getAgentRuntimeName("hephaestus"))
expect(config.default_agent).toBe(getAgentDisplayName("hephaestus"))
})
test("canonicalizes configured default_agent when key uses mixed case", async () => {
@@ -503,7 +560,7 @@ describe("default_agent behavior with Sisyphus orchestration", () => {
await handler(config)
// then
expect(config.default_agent).toBe(getAgentRuntimeName("hephaestus"))
expect(config.default_agent).toBe(getAgentDisplayName("hephaestus"))
})
test("canonicalizes configured default_agent key to display name", async () => {
@@ -527,7 +584,7 @@ describe("default_agent behavior with Sisyphus orchestration", () => {
await handler(config)
// #then
expect(config.default_agent).toBe(getAgentRuntimeName("hephaestus"))
expect(config.default_agent).toBe(getAgentDisplayName("hephaestus"))
})
test("preserves existing display-name default_agent", async () => {
@@ -575,10 +632,10 @@ describe("default_agent behavior with Sisyphus orchestration", () => {
await handler(config)
// #then
expect(config.default_agent).toBe(getAgentRuntimeName("sisyphus"))
expect(config.default_agent).toBe(getAgentDisplayName("sisyphus"))
})
test("uses runtime default_agent name so OpenCode matches the emitted ordered agent names", async () => {
test("uses canonical default_agent display name so OpenCode lookups match emitted agent keys", async () => {
// given
const pluginConfig = createPluginConfig({})
const config: Record<string, unknown> = {
@@ -599,7 +656,7 @@ describe("default_agent behavior with Sisyphus orchestration", () => {
await handler(config)
// then
expect(config.default_agent).toBe(getAgentRuntimeName("hephaestus"))
expect(config.default_agent).toBe(getAgentDisplayName("hephaestus"))
})
test("sets default_agent to sisyphus when configured default_agent is empty after trim", async () => {
@@ -623,7 +680,7 @@ describe("default_agent behavior with Sisyphus orchestration", () => {
await handler(config)
// then
expect(config.default_agent).toBe(getAgentRuntimeName("sisyphus"))
expect(config.default_agent).toBe(getAgentDisplayName("sisyphus"))
})
test("preserves custom default_agent names while trimming whitespace", async () => {