fix(chore): resolve typescript errors resulting from cherry-picks

packages/cli/src/ui/AppContainer.tsx

@@ -4,14 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
+import { useMemo, useState, useCallback, useEffect, useRef } from 'react';
-  useMemo,
-  useState,
-  useCallback,
-  useEffect,
-  useRef,
-  useLayoutEffect,
-} from 'react';
 import {
   type DOMElement,
   ResizeObserver,

packages/core/src/agents/local-executor.test.ts

@@ -48,6 +48,7 @@ import { debugLogger } from '../utils/debugLogger.js';
 import { LocalAgentExecutor, type ActivityCallback } from './local-executor.js';
 import { makeFakeConfig } from '../test-utils/config.js';
 import { ToolRegistry } from '../tools/tool-registry.js';
+import type { MessageBus } from '../confirmation-bus/message-bus.js';
 import { PromptRegistry } from '../prompts/prompt-registry.js';
 import { ResourceRegistry } from '../resources/resource-registry.js';
 import { DiscoveredMCPTool } from '../tools/mcp-tool.js';