From 511cbc54c9c2b787d2eeac20a6ab93a9ab052983 Mon Sep 17 00:00:00 2001
From: Keith Guerin <keithguerin@gmail.com>
Date: Fri, 20 Mar 2026 19:04:03 -0700
Subject: [PATCH] fix(cli): resolve merge conflicts and align with async test
 helpers

---
 packages/cli/src/ui/commands/compressCommand.test.ts | 2 +-
 packages/cli/src/ui/commands/compressCommand.ts      | 6 ++++--
 packages/cli/src/ui/hooks/useGeminiStream.ts         | 5 +++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/ui/commands/compressCommand.test.ts b/packages/cli/src/ui/commands/compressCommand.test.ts
index 7be1d83336..9c89adf016 100644
--- a/packages/cli/src/ui/commands/compressCommand.test.ts
+++ b/packages/cli/src/ui/commands/compressCommand.test.ts
@@ -11,7 +11,7 @@ import { createMockCommandContext } from '../../test-utils/mockCommandContext.js
 import { MessageType } from '../types.js';
 
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
-  const actual = (await importOriginal()) as any;
+  const actual = (await importOriginal()) as Record<string, unknown>;
   return {
     ...actual,
     tokenLimit: vi.fn(),
diff --git a/packages/cli/src/ui/commands/compressCommand.ts b/packages/cli/src/ui/commands/compressCommand.ts
index 4728ae44b1..d3b780f6c1 100644
--- a/packages/cli/src/ui/commands/compressCommand.ts
+++ b/packages/cli/src/ui/commands/compressCommand.ts
@@ -6,7 +6,7 @@
 
 import { MessageType, type HistoryItemCompression } from '../types.js';
 import { CommandKind, type SlashCommand } from './types.js';
-import { tokenLimit, CompressionStatus } from '@google/gemini-cli-core';
+import { tokenLimit, type CompressionStatus } from '@google/gemini-cli-core';
 
 export const compressCommand: SlashCommand = {
   name: 'compress',
@@ -76,7 +76,9 @@ export const compressCommand: SlashCommand = {
               isPending: false,
               beforePercentage,
               afterPercentage,
-              compressionStatus: (Number(compressed.compressionStatus) as unknown) as CompressionStatus,
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+              compressionStatus:
+                Number(compressed.compressionStatus) as unknown as CompressionStatus,
               isManual: true,
               thresholdPercentage: Math.round(threshold * 100),
             },
diff --git a/packages/cli/src/ui/hooks/useGeminiStream.ts b/packages/cli/src/ui/hooks/useGeminiStream.ts
index 4dc9c6e601..c05b3c0800 100644
--- a/packages/cli/src/ui/hooks/useGeminiStream.ts
+++ b/packages/cli/src/ui/hooks/useGeminiStream.ts
@@ -39,6 +39,10 @@ import {
   getPlanModeExitMessage,
   isBackgroundExecutionData,
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+  type CompressionStatus,
+>>>>>>> 12bc9cace (fix(cli): resolve merge conflicts and align with async test helpers)
   Kind,
   ACTIVATE_SKILL_TOOL_NAME,
 =======
@@ -1173,6 +1177,7 @@ export const useGeminiStream = (
             isPending: false,
             beforePercentage,
             afterPercentage,
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
             compressionStatus: eventValue ? ((Number(eventValue.compressionStatus) as unknown) as CompressionStatus) : null,
             isManual: false,
             thresholdPercentage: Math.round(threshold * 100),