fix(core): final formatting and logic fix

Author: cocosheng-g

docs/ide-integration/ide-companion-spec.md

@@ -56,6 +56,7 @@ creating a "discovery file."
     }
   }
   ```
+
   - `port` (number, required): The port of the MCP server.
   - `workspacePath` (string, required): A list of all open workspace root paths,
     delimited by the OS-specific path separator (`:` for Linux/macOS, `;` for

evals/auto_memory_modes.eval.ts

@@ -329,9 +329,8 @@ async function expectSeedSessionEligible(
   fixture: Fixture,
   sessionId: string,
 ): Promise<void> {
-  const { buildSessionIndex } = await import(
-    '../packages/core/src/services/memoryService.js'
-  );
+  const { buildSessionIndex } =
+    await import('../packages/core/src/services/memoryService.js');
   const { newSessionIds } = await buildSessionIndex(
     path.join(fixture.projectTempDir, 'chats'),
     { runs: [] },
@@ -386,9 +385,8 @@ describe('Auto Memory inbox routing', () => {
   autoMemoryEval(
     'every memory patch lands in .inbox/<kind>/ for review and active files stay untouched',
     async () => {
-      const { startMemoryService } = await import(
-        '../packages/core/src/services/memoryService.js'
-      );
+      const { startMemoryService } =
+        await import('../packages/core/src/services/memoryService.js');
       const fixture = await createFixture();
       evalState.sessionFilePath = await seedSession(
         fixture,

packages/cli/index.ts

@@ -141,9 +141,8 @@ async function run() {
     // --- Heavy Child Process ---
     // Now we can safely import everything.
     const { main } = await import('./src/gemini.js');
-    const { FatalError, writeToStderr } = await import(
-      '@google/gemini-cli-core'
-    );
+    const { FatalError, writeToStderr } =
+      await import('@google/gemini-cli-core');
     const { runExitCleanup } = await import('./src/utils/cleanup.js');
 
     main().catch(async (error: unknown) => {

packages/cli/src/acp/acpSession.test.ts

@@ -566,9 +566,8 @@ describe('Session', () => {
   });
 
   it('should send sessionUpdate when approval mode changes', async () => {
-    const { coreEvents, CoreEvent, ApprovalMode } = await import(
-      '@google/gemini-cli-core'
-    );
+    const { coreEvents, CoreEvent, ApprovalMode } =
+      await import('@google/gemini-cli-core');
 
     coreEvents.emit(CoreEvent.ApprovalModeChanged, {
       sessionId: 'session-1',

packages/cli/src/commands/extensions/link.test.ts

@@ -20,9 +20,8 @@ import { ExtensionManager } from '../../config/extension-manager.js';
 import { loadSettings, type LoadedSettings } from '../../config/settings.js';
 
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
-  const { mockCoreDebugLogger } = await import(
-    '../../test-utils/mockDebugLogger.js'
-  );
+  const { mockCoreDebugLogger } =
+    await import('../../test-utils/mockDebugLogger.js');
   const actual =
     await importOriginal<typeof import('@google/gemini-cli-core')>();
   const mocked = mockCoreDebugLogger(actual, { stripAnsi: true });

packages/cli/src/commands/extensions/list.test.ts

@@ -11,9 +11,8 @@ import { ExtensionManager } from '../../config/extension-manager.js';
 import { loadSettings, type LoadedSettings } from '../../config/settings.js';
 
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
-  const { mockCoreDebugLogger } = await import(
-    '../../test-utils/mockDebugLogger.js'
-  );
+  const { mockCoreDebugLogger } =
+    await import('../../test-utils/mockDebugLogger.js');
   const actual =
     await importOriginal<typeof import('@google/gemini-cli-core')>();
   const mocked = mockCoreDebugLogger(actual, { stripAnsi: false });

packages/cli/src/commands/gemma/logs.test.ts

@@ -16,9 +16,8 @@ import { getLogFilePath } from './constants.js';
 import { logsCommand, readLastLines } from './logs.js';
 
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
-  const { mockCoreDebugLogger } = await import(
-    '../../test-utils/mockDebugLogger.js'
-  );
+  const { mockCoreDebugLogger } =
+    await import('../../test-utils/mockDebugLogger.js');
   return mockCoreDebugLogger(
     await importOriginal<typeof import('@google/gemini-cli-core')>(),
     {

packages/cli/src/commands/gemma/stop.test.ts

@@ -16,9 +16,8 @@ const mockReadServerProcessInfo = vi.hoisted(() => vi.fn());
 const mockResolveGemmaConfig = vi.hoisted(() => vi.fn());
 
 vi.mock('@google/gemini-cli-core', async (importOriginal) => {
-  const { mockCoreDebugLogger } = await import(
-    '../../test-utils/mockDebugLogger.js'
-  );
+  const { mockCoreDebugLogger } =
+    await import('../../test-utils/mockDebugLogger.js');
   return mockCoreDebugLogger(
     await importOriginal<typeof import('@google/gemini-cli-core')>(),
     {

packages/cli/src/commands/skills/disable.test.ts

@@ -14,9 +14,8 @@ import {
 } from '../../config/settings.js';
 
 const { emitConsoleLog, debugLogger } = await vi.hoisted(async () => {
-  const { createMockDebugLogger } = await import(
-    '../../test-utils/mockDebugLogger.js'
-  );
+  const { createMockDebugLogger } =
+    await import('../../test-utils/mockDebugLogger.js');
   return createMockDebugLogger({ stripAnsi: true });
 });
 

packages/cli/src/commands/skills/enable.test.ts

@@ -13,9 +13,8 @@ import {
 } from '../../config/settings.js';
 
 const { emitConsoleLog, debugLogger } = await vi.hoisted(async () => {
-  const { createMockDebugLogger } = await import(
-    '../../test-utils/mockDebugLogger.js'
-  );
+  const { createMockDebugLogger } =
+    await import('../../test-utils/mockDebugLogger.js');
   return createMockDebugLogger({ stripAnsi: true });
 });