diff --git a/src/agents/builtin-agents.ts b/src/agents/builtin-agents.ts
index 0175bcaa9..7bcac2223 100644
--- a/src/agents/builtin-agents.ts
+++ b/src/agents/builtin-agents.ts
@@ -29,7 +29,7 @@ import { maybeCreateAtlasConfig } from "./builtin-agents/atlas-agent"
 
 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 7d9d52979..61f6fa718 100644
--- a/src/agents/builtin-agents/general-agents.ts
+++ b/src/agents/builtin-agents/general-agents.ts
@@ -11,7 +11,7 @@ import { applyModelResolution, getFirstFallbackModel } from "./model-resolution"
 import { log } from "../../shared/logger"
 
 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 e5c03e006..1134151ba 100644
--- a/src/agents/types.ts
+++ b/src/agents/types.ts
@@ -124,7 +124,8 @@ export type BuiltinAgentName =
   | "metis"
   | "momus"
   | "atlas"
-  | "sisyphus-junior";
+  | "sisyphus-junior"
+  | "athena";
 
 export type OverridableAgentName = "build" | BuiltinAgentName;
 
diff --git a/src/config/schema/agent-names.ts b/src/config/schema/agent-names.ts
index e820e5746..3a32d8539 100644
--- a/src/config/schema/agent-names.ts
+++ b/src/config/schema/agent-names.ts
@@ -12,6 +12,7 @@ export const BuiltinAgentNameSchema = z.enum([
   "momus",
   "atlas",
   "sisyphus-junior",
+  "athena",
 ])
 
 export const BuiltinSkillNameSchema = z.enum([
@@ -39,6 +40,7 @@ export const OverridableAgentNameSchema = z.enum([
   "explore",
   "multimodal-looker",
   "atlas",
+  "athena",
 ])
 
 export const AgentNameSchema = BuiltinAgentNameSchema