diff --git a/src/agents/pi-embedded-runner/model.test-harness.ts b/src/agents/pi-embedded-runner/model.test-harness.ts
index 21434557c79..b91ca8b8c5f 100644
--- a/src/agents/pi-embedded-runner/model.test-harness.ts
+++ b/src/agents/pi-embedded-runner/model.test-harness.ts
@@ -25,14 +25,18 @@ export const OPENAI_CODEX_TEMPLATE_MODEL = {
   maxTokens: 128000,
 };
 
-export function mockOpenAICodexTemplateModel(): void {
+function mockTemplateModel(provider: string, modelId: string, templateModel: unknown): void {
   mockDiscoveredModel({
-    provider: "openai-codex",
-    modelId: "gpt-5.2-codex",
-    templateModel: OPENAI_CODEX_TEMPLATE_MODEL,
+    provider,
+    modelId,
+    templateModel,
   });
 }
 
+export function mockOpenAICodexTemplateModel(): void {
+  mockTemplateModel("openai-codex", "gpt-5.2-codex", OPENAI_CODEX_TEMPLATE_MODEL);
+}
+
 export function buildOpenAICodexForwardCompatExpectation(
   id: string = "gpt-5.3-codex",
 ): Partial<ModelDefinitionConfig> & {
@@ -85,19 +89,19 @@ export const GOOGLE_GEMINI_CLI_FLASH_TEMPLATE_MODEL = {
 };
 
 export function mockGoogleGeminiCliProTemplateModel(): void {
-  mockDiscoveredModel({
-    provider: "google-gemini-cli",
-    modelId: "gemini-3-pro-preview",
-    templateModel: GOOGLE_GEMINI_CLI_PRO_TEMPLATE_MODEL,
-  });
+  mockTemplateModel(
+    "google-gemini-cli",
+    "gemini-3-pro-preview",
+    GOOGLE_GEMINI_CLI_PRO_TEMPLATE_MODEL,
+  );
 }
 
 export function mockGoogleGeminiCliFlashTemplateModel(): void {
-  mockDiscoveredModel({
-    provider: "google-gemini-cli",
-    modelId: "gemini-3-flash-preview",
-    templateModel: GOOGLE_GEMINI_CLI_FLASH_TEMPLATE_MODEL,
-  });
+  mockTemplateModel(
+    "google-gemini-cli",
+    "gemini-3-flash-preview",
+    GOOGLE_GEMINI_CLI_FLASH_TEMPLATE_MODEL,
+  );
 }
 
 export function resetMockDiscoverModels(): void {