diff --git a/packages/cli/src/acp-integration/acpAgent.ts b/packages/cli/src/acp-integration/acpAgent.ts
index 37eb96ab2..91efc75ec 100644
--- a/packages/cli/src/acp-integration/acpAgent.ts
+++ b/packages/cli/src/acp-integration/acpAgent.ts
@@ -466,13 +466,13 @@ class GeminiAgent {
     const currentApprovalMode = config.getApprovalMode();
 
     const availableModes = APPROVAL_MODES.map((mode) => ({
-      id: mode as ApprovalModeValue,
+      id: mode as acp.ApprovalModeValue,
       name: APPROVAL_MODE_INFO[mode].name,
       description: APPROVAL_MODE_INFO[mode].description,
     }));
 
     return {
-      currentModeId: currentApprovalMode as ApprovalModeValue,
+      currentModeId: currentApprovalMode as acp.ApprovalModeValue,
       availableModes,
     };
   }
diff --git a/packages/cli/src/ui/components/arena/ArenaStatusDialog.tsx b/packages/cli/src/ui/components/arena/ArenaStatusDialog.tsx
index 09325a603..0786cbac0 100644
--- a/packages/cli/src/ui/components/arena/ArenaStatusDialog.tsx
+++ b/packages/cli/src/ui/components/arena/ArenaStatusDialog.tsx
@@ -268,17 +268,15 @@ export function ArenaStatusDialog({
                 )}
               </Box>
             </Box>
-            {/* In-process mode: show extra detail row with cost + thought tokens */}
-            {live && (live.estimatedCost > 0 || live.thoughtTokens > 0) && (
+            {/* In-process mode: show extra detail row with thought/cached tokens */}
+            {live && (live.thoughtTokens > 0 || live.cachedTokens > 0) && (
               <Box marginLeft={2}>
                 <Text color={theme.text.secondary}>
-                  {live.estimatedCost > 0 &&
-                    `Cost: $${live.estimatedCost.toFixed(4)}`}
-                  {live.estimatedCost > 0 && live.thoughtTokens > 0 && '  ·  '}
                   {live.thoughtTokens > 0 &&
                     `Thinking: ${live.thoughtTokens.toLocaleString()} tok`}
+                  {live.thoughtTokens > 0 && live.cachedTokens > 0 && '  ·  '}
                   {live.cachedTokens > 0 &&
-                    `  ·  Cached: ${live.cachedTokens.toLocaleString()} tok`}
+                    `Cached: ${live.cachedTokens.toLocaleString()} tok`}
                 </Text>
               </Box>
             )}
diff --git a/packages/core/src/agents/runtime/agent-headless.test.ts b/packages/core/src/agents/runtime/agent-headless.test.ts
index 43ed2caa9..7271eb094 100644
--- a/packages/core/src/agents/runtime/agent-headless.test.ts
+++ b/packages/core/src/agents/runtime/agent-headless.test.ts
@@ -473,7 +473,7 @@ describe('subagent.ts', () => {
 
         mockSendMessageStream.mockImplementation(createMockStream(['stop']));
 
-        const scope = await SubAgentScope.create(
+        const scope = await AgentHeadless.create(
           'test-agent',
           config,
           promptConfig,
@@ -481,7 +481,7 @@ describe('subagent.ts', () => {
           defaultRunConfig,
         );
 
-        await scope.runNonInteractive(context);
+        await scope.execute(context);
 
         const generationConfig = getGenerationConfigFromMock();
         expect(generationConfig.systemInstruction).toContain(
@@ -511,7 +511,7 @@ describe('subagent.ts', () => {
 
         mockSendMessageStream.mockImplementation(createMockStream(['stop']));
 
-        const scope = await SubAgentScope.create(
+        const scope = await AgentHeadless.create(
           'test-agent',
           config,
           promptConfig,
@@ -519,7 +519,7 @@ describe('subagent.ts', () => {
           defaultRunConfig,
         );
 
-        await scope.runNonInteractive(context);
+        await scope.execute(context);
 
         const generationConfig = getGenerationConfigFromMock();
         const sysPrompt = generationConfig.systemInstruction as string;
@@ -540,7 +540,7 @@ describe('subagent.ts', () => {
 
         mockSendMessageStream.mockImplementation(createMockStream(['stop']));
 
-        const scope = await SubAgentScope.create(
+        const scope = await AgentHeadless.create(
           'test-agent',
           config,
           promptConfig,
@@ -548,7 +548,7 @@ describe('subagent.ts', () => {
           defaultRunConfig,
         );
 
-        await scope.runNonInteractive(context);
+        await scope.execute(context);
 
         const generationConfig = getGenerationConfigFromMock();
         const sysPrompt = generationConfig.systemInstruction as string;