diff --git a/packages/cli/src/test-utils/render.tsx b/packages/cli/src/test-utils/render.tsx
index ea889181c6..a655088e79 100644
--- a/packages/cli/src/test-utils/render.tsx
+++ b/packages/cli/src/test-utils/render.tsx
@@ -376,6 +376,14 @@ export type RenderInstance = {
   capturedOverflowActions: OverflowActions | undefined;
 };
 
+export type RenderWithProvidersInstance = RenderInstance & {
+  simulateClick: (
+    col: number,
+    row: number,
+    button?: 0 | 1 | 2,
+  ) => Promise<void>;
+};
+
 const instances: InkInstance[] = [];
 
 export const render = async (
@@ -618,15 +626,7 @@ export const renderWithProviders = async (
     };
     appState?: AppState;
   } = {},
-): Promise<
-  RenderInstance & {
-    simulateClick: (
-      col: number,
-      row: number,
-      button?: 0 | 1 | 2,
-    ) => Promise<void>;
-  }
-> => {
+): Promise<RenderWithProvidersInstance> => {
   const baseState: UIState = new Proxy(
     { ...baseMockUiState, ...providedUiState },
     {
@@ -861,13 +861,7 @@ export async function renderHookWithProviders<Result, Props>(
 
   const Wrapper = options.wrapper || (({ children }) => <>{children}</>);
 
-  let renderResult: RenderInstance & {
-    simulateClick: (
-      col: number,
-      row: number,
-      button?: 0 | 1 | 2,
-    ) => Promise<void>;
-  };
+  let renderResult: RenderWithProvidersInstance;
 
   await act(async () => {
     renderResult = await renderWithProviders(
diff --git a/packages/cli/src/ui/hooks/useGeminiStream.test.tsx b/packages/cli/src/ui/hooks/useGeminiStream.test.tsx
index 3ff11292e3..b912dbe4f8 100644
--- a/packages/cli/src/ui/hooks/useGeminiStream.test.tsx
+++ b/packages/cli/src/ui/hooks/useGeminiStream.test.tsx
@@ -3249,8 +3249,9 @@ describe('useGeminiStream', () => {
         ),
       );
 
-      // Reset start time after hook render, because renderHook (async)
-      // advances fake timers by 50ms during its internal waitUntilReady() check.
+      // Reset fake timers to startTime because the asynchronous render lifecycle
+      // (via waitUntilReady) advances the mock clock while waiting for initial
+      // components to settle.
       vi.setSystemTime(startTime);
 
       // Submit query
diff --git a/packages/cli/src/ui/hooks/useGitBranchName.test.tsx b/packages/cli/src/ui/hooks/useGitBranchName.test.tsx
index 5a55b57607..45c861b521 100644
--- a/packages/cli/src/ui/hooks/useGitBranchName.test.tsx
+++ b/packages/cli/src/ui/hooks/useGitBranchName.test.tsx
@@ -43,10 +43,11 @@ const CWD = '/test/project';
 const GIT_LOGS_HEAD_PATH = path.join(CWD, '.git', 'logs', 'HEAD');
 
 describe('useGitBranchName', () => {
-  let deferredSpawn: {
+  let deferredSpawn: Array<{
     resolve: (val: { stdout: string; stderr: string }) => void;
     reject: (err: Error) => void;
-  } | null = null;
+    args: string[];
+  }> = [];
 
   beforeEach(() => {
     vol.reset(); // Reset in-memory filesystem
@@ -54,11 +55,11 @@ describe('useGitBranchName', () => {
       [GIT_LOGS_HEAD_PATH]: 'ref: refs/heads/main',
     });
 
-    deferredSpawn = null;
+    deferredSpawn = [];
     vi.mocked(mockSpawnAsync).mockImplementation(
-      () =>
+      (_command: string, args: string[]) =>
         new Promise((resolve, reject) => {
-          deferredSpawn = { resolve, reject };
+          deferredSpawn.push({ resolve, reject, args });
         }),
     );
   });
@@ -91,7 +92,9 @@ describe('useGitBranchName', () => {
     expect(result.current).toBeUndefined();
 
     await act(async () => {
-      deferredSpawn?.resolve({ stdout: 'main\n', stderr: '' });
+      const spawn = deferredSpawn.shift()!;
+      expect(spawn.args).toContain('--abbrev-ref');
+      spawn.resolve({ stdout: 'main\n', stderr: '' });
     });
 
     expect(result.current).toBe('main');
@@ -101,7 +104,9 @@ describe('useGitBranchName', () => {
     const { result } = await renderGitBranchNameHook(CWD);
 
     await act(async () => {
-      deferredSpawn?.reject(new Error('Git error'));
+      const spawn = deferredSpawn.shift()!;
+      expect(spawn.args).toContain('--abbrev-ref');
+      spawn.reject(new Error('Git error'));
     });
 
     expect(result.current).toBeUndefined();
@@ -111,12 +116,16 @@ describe('useGitBranchName', () => {
     const { result } = await renderGitBranchNameHook(CWD);
 
     await act(async () => {
-      deferredSpawn?.resolve({ stdout: 'HEAD\n', stderr: '' });
+      const spawn = deferredSpawn.shift()!;
+      expect(spawn.args).toContain('--abbrev-ref');
+      spawn.resolve({ stdout: 'HEAD\n', stderr: '' });
     });
 
     // It should now call spawnAsync again for the short hash
     await act(async () => {
-      deferredSpawn?.resolve({ stdout: 'a1b2c3d\n', stderr: '' });
+      const spawn = deferredSpawn.shift()!;
+      expect(spawn.args).toContain('--short');
+      spawn.resolve({ stdout: 'a1b2c3d\n', stderr: '' });
     });
 
     expect(result.current).toBe('a1b2c3d');
@@ -126,11 +135,15 @@ describe('useGitBranchName', () => {
     const { result } = await renderGitBranchNameHook(CWD);
 
     await act(async () => {
-      deferredSpawn?.resolve({ stdout: 'HEAD\n', stderr: '' });
+      const spawn = deferredSpawn.shift()!;
+      expect(spawn.args).toContain('--abbrev-ref');
+      spawn.resolve({ stdout: 'HEAD\n', stderr: '' });
     });
 
     await act(async () => {
-      deferredSpawn?.reject(new Error('Git error'));
+      const spawn = deferredSpawn.shift()!;
+      expect(spawn.args).toContain('--short');
+      spawn.reject(new Error('Git error'));
     });
 
     expect(result.current).toBeUndefined();
@@ -143,7 +156,9 @@ describe('useGitBranchName', () => {
     const { result } = await renderGitBranchNameHook(CWD);
 
     await act(async () => {
-      deferredSpawn?.resolve({ stdout: 'main\n', stderr: '' });
+      const spawn = deferredSpawn.shift()!;
+      expect(spawn.args).toContain('--abbrev-ref');
+      spawn.resolve({ stdout: 'main\n', stderr: '' });
     });
 
     expect(result.current).toBe('main');
@@ -160,7 +175,9 @@ describe('useGitBranchName', () => {
 
     // Resolving the new branch name fetch
     await act(async () => {
-      deferredSpawn?.resolve({ stdout: 'develop\n', stderr: '' });
+      const spawn = deferredSpawn.shift()!;
+      expect(spawn.args).toContain('--abbrev-ref');
+      spawn.resolve({ stdout: 'develop\n', stderr: '' });
     });
 
     expect(result.current).toBe('develop');
@@ -173,7 +190,9 @@ describe('useGitBranchName', () => {
     const { result } = await renderGitBranchNameHook(CWD);
 
     await act(async () => {
-      deferredSpawn?.resolve({ stdout: 'main\n', stderr: '' });
+      const spawn = deferredSpawn.shift()!;
+      expect(spawn.args).toContain('--abbrev-ref');
+      spawn.resolve({ stdout: 'main\n', stderr: '' });
     });
 
     expect(result.current).toBe('main');
@@ -188,8 +207,8 @@ describe('useGitBranchName', () => {
       fs.writeFileSync(GIT_LOGS_HEAD_PATH, 'ref: refs/heads/develop');
     });
 
-    // spawnAsync should NOT have been called again
-    expect(vi.mocked(mockSpawnAsync)).toHaveBeenCalledTimes(1);
+    // spawnAsync should NOT have been called again for updating
+    expect(deferredSpawn.length).toBe(0);
     expect(result.current).toBe('main');
   });
 
@@ -203,7 +222,9 @@ describe('useGitBranchName', () => {
     const { unmount } = await renderGitBranchNameHook(CWD);
 
     await act(async () => {
-      deferredSpawn?.resolve({ stdout: 'main\n', stderr: '' });
+      const spawn = deferredSpawn.shift()!;
+      expect(spawn.args).toContain('--abbrev-ref');
+      spawn.resolve({ stdout: 'main\n', stderr: '' });
     });
 
     // Wait for watcher to be set up BEFORE unmounting
diff --git a/packages/core/src/ide/ide-connection-utils.test.ts b/packages/core/src/ide/ide-connection-utils.test.ts
index 99e62951be..a2d554b7a6 100644
--- a/packages/core/src/ide/ide-connection-utils.test.ts
+++ b/packages/core/src/ide/ide-connection-utils.test.ts
@@ -696,4 +696,14 @@ describe('ide-connection-utils', () => {
       ); // Short-circuiting
     });
   });
+
+  describe('createProxyAwareFetch', () => {
+    it('should return a proxy-aware fetcher function', async () => {
+      const { createProxyAwareFetch } = await import(
+        './ide-connection-utils.js'
+      );
+      const fetcher = await createProxyAwareFetch('127.0.0.1');
+      expect(typeof fetcher).toBe('function');
+    });
+  });
 });
diff --git a/packages/core/src/ide/ide-connection-utils.ts b/packages/core/src/ide/ide-connection-utils.ts
index c9776e1509..4ccc2913d6 100644
--- a/packages/core/src/ide/ide-connection-utils.ts
+++ b/packages/core/src/ide/ide-connection-utils.ts
@@ -7,7 +7,7 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as os from 'node:os';
-import { EnvHttpProxyAgent } from 'undici';
+import { EnvHttpProxyAgent, fetch as undiciFetch } from 'undici';
 import { debugLogger } from '../utils/debugLogger.js';
 import { isSubpath, resolveToRealPath } from '../utils/paths.js';
 import { isNodeError } from '../utils/errors.js';
@@ -286,12 +286,7 @@ export async function createProxyAwareFetch(ideServerHost: string) {
   const agent = new EnvHttpProxyAgent({
     noProxy: [existingNoProxy, ideServerHost].filter(Boolean).join(','),
   });
-  const undiciPromise = import('undici');
-  // Suppress unhandled rejection if the promise is not awaited immediately.
-  // If the import fails, the error will be thrown when awaiting undiciPromise below.
-  undiciPromise.catch(() => {});
   return async (url: string | URL, init?: RequestInit): Promise<Response> => {
-    const { fetch: fetchFn } = await undiciPromise;
     const fetchOptions: RequestInit & { dispatcher?: unknown } = {
       ...init,
       dispatcher: agent,
@@ -299,7 +294,7 @@ export async function createProxyAwareFetch(ideServerHost: string) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     const options = fetchOptions as unknown as import('undici').RequestInit;
     try {
-      const response = await fetchFn(url, options);
+      const response = await undiciFetch(url, options);
       // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       return new Response(response.body as ReadableStream<unknown> | null, {
         status: response.status,