Revert "Move mockTool into test-utils (#7245)" (#7277)

packages/a2a-server/package.json

@@ -34,7 +34,6 @@
   },
   "devDependencies": {
     "@types/express": "^5.0.3",
-    "@google/gemini-cli-test-utils": "file:../test-utils",
     "@types/fs-extra": "^11.0.4",
     "@types/supertest": "^6.0.3",
     "@types/tar": "^6.1.13",

packages/a2a-server/src/agent.test.ts

@@ -33,7 +33,7 @@ import {
   assertTaskCreationAndWorkingStatus,
   createStreamMessageRequest,
 } from './testing_utils.js';
-import { MockTool } from '@google/gemini-cli-test-utils';
+import { MockTool } from '@google/gemini-cli-core';
 
 const mockToolConfirmationFn = async () =>
   ({}) as unknown as ToolCallConfirmationDetails;

packages/cli/src/ui/hooks/useToolScheduler.test.ts

@@ -25,10 +25,13 @@ import type {
   AnyDeclarativeTool,
   AnyToolInvocation,
 } from '@google/gemini-cli-core';
-import { ToolConfirmationOutcome, ApprovalMode } from '@google/gemini-cli-core';
+import {
+  ToolConfirmationOutcome,
+  ApprovalMode,
+  MockTool,
+} from '@google/gemini-cli-core';
 import type { HistoryItemWithoutId, HistoryItemToolGroup } from '../types.js';
 import { ToolCallStatus } from '../types.js';
-import { MockTool } from '@google/gemini-cli-test-utils';
 
 // Mocks
 vi.mock('@google/gemini-cli-core', async () => {

packages/core/src/index.ts

@@ -106,3 +106,6 @@ export * from './telemetry/index.js';
 export { sessionId } from './utils/session.js';
 export * from './utils/browser.js';
 export { Storage } from './config/storage.js';
+
+// Export test utils
+export * from './test-utils/index.js';

packages/core/src/test-utils/index.ts

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './mock-tool.js';

packages/core/src/test-utils/mock-tool.ts

@@ -9,12 +9,12 @@ import type {
   ToolCallConfirmationDetails,
   ToolInvocation,
   ToolResult,
-} from '@google/gemini-cli-core';
+} from '../tools/tools.js';
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   Kind,
-} from '@google/gemini-cli-core';
+} from '../tools/tools.js';
 
 type MockToolOptions = {
   name: string;

packages/test-utils/index.ts

@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './src/index.js';
+export * from './src/file-system-test-helpers.js';

packages/test-utils/package.json

@@ -10,9 +10,7 @@
     "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
-    "typescript": "^5.3.3",
-    "@google/gemini-cli-core": "file:../core",
-    "vitest": "^3.1.1"
+    "typescript": "^5.3.3"
   },
   "engines": {
     "node": ">=20"

packages/test-utils/src/index.ts

@@ -5,4 +5,3 @@
  */
 
 export * from './file-system-test-helpers.js';
-export * from './mock-tool.js';