diff --git a/src/agents/builtin-agents.ts b/src/agents/builtin-agents.ts
index 57e859c7..fa2cf838 100644
--- a/src/agents/builtin-agents.ts
+++ b/src/agents/builtin-agents.ts
@@ -29,7 +29,7 @@ import { buildCustomAgentMetadata, parseRegisteredAgentSummaries } from "./custo
 
 type AgentSource = AgentFactory | AgentConfig
 
-const agentSources: Record<BuiltinAgentName, AgentSource> = {
+const agentSources: Partial<Record<BuiltinAgentName, AgentSource>> = {
   sisyphus: createSisyphusAgent,
   hephaestus: createHephaestusAgent,
   oracle: createOracleAgent,
diff --git a/src/agents/builtin-agents/general-agents.ts b/src/agents/builtin-agents/general-agents.ts
index 54f2ae3f..b82318ad 100644
--- a/src/agents/builtin-agents/general-agents.ts
+++ b/src/agents/builtin-agents/general-agents.ts
@@ -10,7 +10,7 @@ import { applyEnvironmentContext } from "./environment-context"
 import { applyModelResolution } from "./model-resolution"
 
 export function collectPendingBuiltinAgents(input: {
-  agentSources: Record<BuiltinAgentName, import("../agent-builder").AgentSource>
+  agentSources: Partial<Record<BuiltinAgentName, import("../agent-builder").AgentSource>>
   agentMetadata: Partial<Record<BuiltinAgentName, AgentPromptMetadata>>
   disabledAgents: string[]
   agentOverrides: AgentOverrides
diff --git a/src/agents/types.ts b/src/agents/types.ts
index 2d4f6c0c..029bbbc6 100644
--- a/src/agents/types.ts
+++ b/src/agents/types.ts
@@ -103,6 +103,7 @@ export type BuiltinAgentName =
   | "metis"
   | "momus"
   | "atlas"
+  | "athena"
 
 export type OverridableAgentName =
   | "build"
diff --git a/src/config/schema/agent-names.ts b/src/config/schema/agent-names.ts
index 814077d8..b167e5bb 100644
--- a/src/config/schema/agent-names.ts
+++ b/src/config/schema/agent-names.ts
@@ -11,6 +11,7 @@ export const BuiltinAgentNameSchema = z.enum([
   "metis",
   "momus",
   "atlas",
+  "athena",
 ])
 
 export const BuiltinSkillNameSchema = z.enum([
@@ -36,6 +37,7 @@ export const OverridableAgentNameSchema = z.enum([
   "explore",
   "multimodal-looker",
   "atlas",
+  "athena",
 ])
 
 export const AgentNameSchema = BuiltinAgentNameSchema