diff --git a/src/agents/cli-runner.ts b/src/agents/cli-runner.ts
index f61e26630ec..75164ed43f8 100644
--- a/src/agents/cli-runner.ts
+++ b/src/agents/cli-runner.ts
@@ -1,12 +1,11 @@
 import { formatErrorMessage } from "../infra/errors.js";
-import { executePreparedCliRun } from "./cli-runner/execute.js";
-import { prepareCliRunContext } from "./cli-runner/prepare.js";
 import type { PreparedCliRunContext, RunCliAgentParams } from "./cli-runner/types.js";
 import { FailoverError, isFailoverError, resolveFailoverStatus } from "./failover-error.js";
 import { classifyFailoverReason, isFailoverErrorMessage } from "./pi-embedded-helpers.js";
 import type { EmbeddedPiRunResult } from "./pi-embedded-runner.js";
 
 export async function runCliAgent(params: RunCliAgentParams): Promise<EmbeddedPiRunResult> {
+  const { prepareCliRunContext } = await import("./cli-runner/prepare.runtime.js");
   const context = await prepareCliRunContext(params);
   return runPreparedCliAgent(context);
 }
@@ -14,6 +13,7 @@ export async function runCliAgent(params: RunCliAgentParams): Promise<EmbeddedPi
 export async function runPreparedCliAgent(
   context: PreparedCliRunContext,
 ): Promise<EmbeddedPiRunResult> {
+  const { executePreparedCliRun } = await import("./cli-runner/execute.runtime.js");
   const { params } = context;
   const buildCliRunResult = (resultParams: {
     output: Awaited<ReturnType<typeof executePreparedCliRun>>;
@@ -30,7 +30,7 @@ export async function runPreparedCliAgent(
         ...(resultParams.output.finalPromptText
           ? { finalPromptText: resultParams.output.finalPromptText }
           : {}),
-        ...((text || rawText)
+        ...(text || rawText
           ? {
               ...(text ? { finalAssistantVisibleText: text } : {}),
               ...(rawText ? { finalAssistantRawText: rawText } : {}),
diff --git a/src/agents/cli-runner/execute.runtime.ts b/src/agents/cli-runner/execute.runtime.ts
new file mode 100644
index 00000000000..990af6a2d30
--- /dev/null
+++ b/src/agents/cli-runner/execute.runtime.ts
@@ -0,0 +1 @@
+export { executePreparedCliRun } from "./execute.js";
diff --git a/src/agents/cli-runner/prepare.runtime.ts b/src/agents/cli-runner/prepare.runtime.ts
new file mode 100644
index 00000000000..de9cf02a96e
--- /dev/null
+++ b/src/agents/cli-runner/prepare.runtime.ts
@@ -0,0 +1 @@
+export { prepareCliRunContext } from "./prepare.js";