diff --git a/src/shared/agent-display-names.test.ts b/src/shared/agent-display-names.test.ts
index 0fb52ec06..e4abea669 100644
--- a/src/shared/agent-display-names.test.ts
+++ b/src/shared/agent-display-names.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from "bun:test"
-import { AGENT_DISPLAY_NAMES, getAgentConfigKey, getAgentDisplayName, getAgentListDisplayName, normalizeAgentForPrompt, normalizeAgentForPromptKey } from "./agent-display-names"
+import { AGENT_DISPLAY_NAMES, getAgentConfigKey, getAgentDisplayName, getAgentListDisplayName, getAgentRuntimeName, normalizeAgentForPrompt, normalizeAgentForPromptKey } from "./agent-display-names"
 
 describe("getAgentDisplayName", () => {
   it("returns display name for lowercase config key (new format)", () => {
@@ -194,11 +194,11 @@ describe("getAgentConfigKey", () => {
 })
 
 describe("getAgentListDisplayName", () => {
-  it("applies leading-space stable-sort prefixes so OpenCode localeCompare yields canonical order", () => {
-    expect(getAgentListDisplayName("sisyphus")).toBe("    Sisyphus - Ultraworker")
-    expect(getAgentListDisplayName("hephaestus")).toBe("   Hephaestus - Deep Agent")
-    expect(getAgentListDisplayName("prometheus")).toBe("  Prometheus - Plan Builder")
-    expect(getAgentListDisplayName("atlas")).toBe(" Atlas - Plan Executor")
+  it("returns clean display names for object keys (no leading whitespace, RFC 7230 safe)", () => {
+    expect(getAgentListDisplayName("sisyphus")).toBe("Sisyphus - Ultraworker")
+    expect(getAgentListDisplayName("hephaestus")).toBe("Hephaestus - Deep Agent")
+    expect(getAgentListDisplayName("prometheus")).toBe("Prometheus - Plan Builder")
+    expect(getAgentListDisplayName("atlas")).toBe("Atlas - Plan Executor")
   })
 
   it("keeps non-core agents unprefixed for list display", () => {
@@ -206,6 +206,19 @@ describe("getAgentListDisplayName", () => {
   })
 })
 
+describe("getAgentRuntimeName", () => {
+  it("applies leading-space stable-sort prefixes so OpenCode localeCompare yields canonical order", () => {
+    expect(getAgentRuntimeName("sisyphus")).toBe("    Sisyphus - Ultraworker")
+    expect(getAgentRuntimeName("hephaestus")).toBe("   Hephaestus - Deep Agent")
+    expect(getAgentRuntimeName("prometheus")).toBe("  Prometheus - Plan Builder")
+    expect(getAgentRuntimeName("atlas")).toBe(" Atlas - Plan Executor")
+  })
+
+  it("keeps non-core agents unprefixed (no entry in AGENT_LIST_SORT_PREFIXES)", () => {
+    expect(getAgentRuntimeName("oracle")).toBe("oracle")
+  })
+})
+
 describe("normalizeAgentForPrompt", () => {
   it("strips core UI ordering prefixes back to canonical display names", () => {
     expect(normalizeAgentForPrompt(getAgentListDisplayName("sisyphus"))).toBe("Sisyphus - Ultraworker")
diff --git a/src/shared/agent-display-names.ts b/src/shared/agent-display-names.ts
index 081550d7c..10bf91845 100644
--- a/src/shared/agent-display-names.ts
+++ b/src/shared/agent-display-names.ts
@@ -50,31 +50,20 @@ export function getAgentRuntimeName(configKey: string): string {
   return prefix ? `${prefix}${displayName}` : displayName
 }
 
-/**
- * Get display name for an agent config key.
- * Uses case-insensitive lookup for backward compatibility.
- * Returns original key if not found.
- */
 export function getAgentDisplayName(configKey: string): string {
-  // Try exact match first
   const exactMatch = AGENT_DISPLAY_NAMES[configKey]
   if (exactMatch !== undefined) return exactMatch
-  
-  // Fall back to case-insensitive search
+
   const lowerKey = configKey.toLowerCase()
   for (const [k, v] of Object.entries(AGENT_DISPLAY_NAMES)) {
     if (k.toLowerCase() === lowerKey) return v
   }
-  
-  // Unknown agent: return original key
+
   return configKey
 }
 
-/**
- * Runtime-facing agent name used for OpenCode list ordering.
- */
 export function getAgentListDisplayName(configKey: string): string {
-  return getAgentRuntimeName(configKey)
+  return getAgentDisplayName(configKey)
 }
 
 const REVERSE_DISPLAY_NAMES: Record<string, string> = Object.fromEntries(