diff --git a/package-lock.json b/package-lock.json index 0c6c449d32..e46abcfc57 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,6 +34,7 @@ "@types/react-dom": "^19.2.0", "@types/shell-quote": "^1.7.5", "@types/ws": "^8.18.1", + "@typescript/native-preview": "^7.0.0-dev.20260412.1", "@vitest/coverage-v8": "^3.1.1", "@vitest/eslint-plugin": "^1.3.4", "asciichart": "^1.5.25", @@ -4562,6 +4563,123 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@typescript/native-preview": { + "version": "7.0.0-dev.20260412.1", + "resolved": "https://registry.npmjs.org/@typescript/native-preview/-/native-preview-7.0.0-dev.20260412.1.tgz", + "integrity": "sha512-tDw3XZt2BkjAlt/MJmnFGmbe9lgKmc5wezmrMoBIEvJcqz+/KVpVBVvjbkZoaiABnJmuG3G3b6IUFrEveTw6UQ==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "tsgo": "bin/tsgo.js" + }, + "optionalDependencies": { + "@typescript/native-preview-darwin-arm64": "7.0.0-dev.20260412.1", + "@typescript/native-preview-darwin-x64": "7.0.0-dev.20260412.1", + "@typescript/native-preview-linux-arm": "7.0.0-dev.20260412.1", + "@typescript/native-preview-linux-arm64": "7.0.0-dev.20260412.1", + "@typescript/native-preview-linux-x64": "7.0.0-dev.20260412.1", + "@typescript/native-preview-win32-arm64": "7.0.0-dev.20260412.1", + "@typescript/native-preview-win32-x64": "7.0.0-dev.20260412.1" + } + }, + "node_modules/@typescript/native-preview-darwin-arm64": { + "version": "7.0.0-dev.20260412.1", + "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-arm64/-/native-preview-darwin-arm64-7.0.0-dev.20260412.1.tgz", + "integrity": "sha512-sSkFG+hjtRWffg6FddF3dEkk7N3TRMEqfiUpixwcWhXgyocMdPw8wutTvQRBxQdgxeL9y01M2SO8A8YPPiEgVg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@typescript/native-preview-darwin-x64": { + "version": "7.0.0-dev.20260412.1", + "resolved": "https://registry.npmjs.org/@typescript/native-preview-darwin-x64/-/native-preview-darwin-x64-7.0.0-dev.20260412.1.tgz", + "integrity": "sha512-m2BTeaLkrHEEDg0D9snigddy01qTY+wgx+W+GpXAfx36PPvW4xWuGXNVWfSaB8bqAC9C8NeLnT/C9/G/rJ5v2w==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@typescript/native-preview-linux-arm": { + "version": "7.0.0-dev.20260412.1", + "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm/-/native-preview-linux-arm-7.0.0-dev.20260412.1.tgz", + "integrity": "sha512-wDLekbfsfmKMWORg7CTnEnpKj8oXpU/6AEBrtVN9CEUCiQAe6yH878nZHhJNzWQXHtrtFf3lY49Yplqmdxja3w==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@typescript/native-preview-linux-arm64": { + "version": "7.0.0-dev.20260412.1", + "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-arm64/-/native-preview-linux-arm64-7.0.0-dev.20260412.1.tgz", + "integrity": "sha512-JAdsG6MlVV1hoAUKPy8zxAL7xLeNxz8JgCbLCJVqW8EyH29R9FD4cFTqr7CSIRTNUEDzDTrgnXUyoRtDe1gr+w==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@typescript/native-preview-linux-x64": { + "version": "7.0.0-dev.20260412.1", + "resolved": "https://registry.npmjs.org/@typescript/native-preview-linux-x64/-/native-preview-linux-x64-7.0.0-dev.20260412.1.tgz", + "integrity": "sha512-gYgppiQIqid3jZ7D8THh4k3Q+4bwidrQH6SL9Xgbk1qfP6/jwv8twuPqDOfZ+cK2OD55lQHp15fOh2lMNAC40Q==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@typescript/native-preview-win32-arm64": { + "version": "7.0.0-dev.20260412.1", + "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-arm64/-/native-preview-win32-arm64-7.0.0-dev.20260412.1.tgz", + "integrity": "sha512-TOh7rH5H3jisHJqRXJSjmUGMzcbNBocS/hufhXPQIv+g3pdG5IKZoSnv3SV62I5d12FFDSS5KQon5MQPnOKAHg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@typescript/native-preview-win32-x64": { + "version": "7.0.0-dev.20260412.1", + "resolved": "https://registry.npmjs.org/@typescript/native-preview-win32-x64/-/native-preview-win32-x64-7.0.0-dev.20260412.1.tgz", + "integrity": "sha512-u+70wL89wspN1wKoX6FVNUATRGCG3BpleByP3H/UqOZvlwuMm8N7Gy8hEbM0U8bDyAuyP/daUfTBVkqXjjv9mA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@typespec/ts-http-runtime": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@typespec/ts-http-runtime/-/ts-http-runtime-0.3.0.tgz", @@ -16383,6 +16501,7 @@ "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==", "devOptional": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -17873,9 +17992,9 @@ "@types/fs-extra": "^11.0.4", "@types/supertest": "^6.0.3", "@types/tar": "^6.1.13", + "@typescript/native-preview": "^7.0.0-dev.20260412.1", "dotenv": "^16.4.5", "supertest": "^7.1.4", - "typescript": "^5.3.3", "vitest": "^3.1.1" }, "engines": { @@ -18024,8 +18143,8 @@ "@types/shell-quote": "^1.7.5", "@types/ws": "^8.5.10", "@types/yargs": "^17.0.32", + "@typescript/native-preview": "^7.0.0-dev.20260412.1", "@xterm/headless": "^5.5.0", - "typescript": "^5.3.3", "vitest": "^3.1.1" }, "engines": { @@ -18215,9 +18334,9 @@ "@types/js-yaml": "^4.0.9", "@types/json-stable-stringify": "^1.1.0", "@types/picomatch": "^4.0.1", + "@typescript/native-preview": "^7.0.0-dev.20260412.1", "chrome-devtools-mcp": "^0.19.0", "msw": "^2.3.4", - "typescript": "^5.3.3", "vitest": "^3.1.1" }, "engines": { @@ -18411,6 +18530,7 @@ "ws": "^8.16.0" }, "devDependencies": { + "@typescript/native-preview": "^7.0.0-dev.20260412.1", "react": "^19.2.0", "react-dom": "^19.2.0" }, @@ -18428,7 +18548,7 @@ "zod-to-json-schema": "^3.23.1" }, "devDependencies": { - "typescript": "^5.3.3", + "@typescript/native-preview": "^7.0.0-dev.20260412.1", "vitest": "^3.1.1" }, "engines": { @@ -18447,7 +18567,7 @@ "vitest": "^3.2.4" }, "devDependencies": { - "typescript": "^5.3.3" + "@typescript/native-preview": "^7.0.0-dev.20260412.1" }, "engines": { "node": ">=20" @@ -18470,11 +18590,11 @@ "@types/vscode": "^1.99.0", "@typescript-eslint/eslint-plugin": "^8.31.1", "@typescript-eslint/parser": "^8.31.1", + "@typescript/native-preview": "^7.0.0-dev.20260412.1", "@vscode/vsce": "^3.6.0", "esbuild": "^0.25.3", "eslint": "^9.25.1", "npm-run-all2": "^8.0.2", - "typescript": "^5.8.3", "vitest": "^3.2.4" }, "engines": { diff --git a/package.json b/package.json index 150abcf3c3..c233e120ec 100644 --- a/package.json +++ b/package.json @@ -105,6 +105,7 @@ "@types/react-dom": "^19.2.0", "@types/shell-quote": "^1.7.5", "@types/ws": "^8.18.1", + "@typescript/native-preview": "^7.0.0-dev.20260412.1", "@vitest/coverage-v8": "^3.1.1", "@vitest/eslint-plugin": "^1.3.4", "asciichart": "^1.5.25", diff --git a/packages/a2a-server/package.json b/packages/a2a-server/package.json index 51e0450c97..b933a8fcd0 100644 --- a/packages/a2a-server/package.json +++ b/packages/a2a-server/package.json @@ -19,7 +19,7 @@ "format": "prettier --write .", "test": "vitest run", "test:ci": "vitest run --coverage", - "typecheck": "tsc --noEmit" + "typecheck": "tsgo --noEmit" }, "files": [ "dist" @@ -41,9 +41,9 @@ "@types/fs-extra": "^11.0.4", "@types/supertest": "^6.0.3", "@types/tar": "^6.1.13", + "@typescript/native-preview": "^7.0.0-dev.20260412.1", "dotenv": "^16.4.5", "supertest": "^7.1.4", - "typescript": "^5.3.3", "vitest": "^3.1.1" }, "engines": { diff --git a/packages/a2a-server/src/agent/task.test.ts b/packages/a2a-server/src/agent/task.test.ts index 26039ae3aa..8a7cb416bb 100644 --- a/packages/a2a-server/src/agent/task.test.ts +++ b/packages/a2a-server/src/agent/task.test.ts @@ -12,6 +12,7 @@ import { type ToolCallRequestInfo, type GitService, type CompletedToolCall, + type ServerGeminiStreamEvent, } from '@google/gemini-cli-core'; import { createMockConfig } from '../utils/testing_utils.js'; import type { ExecutionEventBus, RequestContext } from '@a2a-js/sdk/server'; @@ -231,10 +232,10 @@ describe('Task', () => { ); const event = { - type: 'content', + type: GeminiEventType.Content, value: 'test', traceId: 'test-trace-id', - }; + } as const; await task.acceptAgentMessage(event); @@ -270,7 +271,7 @@ describe('Task', () => { const citationEvent = { type: GeminiEventType.Citation, value: citationText, - }; + } as const; await task.acceptAgentMessage(citationEvent); @@ -313,7 +314,7 @@ describe('Task', () => { const modelInfoEvent = { type: GeminiEventType.ModelInfo, value: 'new-model-name', - }; + } as const; await task.acceptAgentMessage(modelInfoEvent); @@ -368,7 +369,7 @@ describe('Task', () => { const event = { type: eventType, - }; + } as unknown as ServerGeminiStreamEvent; await task.acceptAgentMessage(event); diff --git a/packages/cli/package.json b/packages/cli/package.json index cd3b2ec135..f507eed041 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -21,7 +21,7 @@ "test": "vitest run", "test:ci": "vitest run", "posttest": "npm run build", - "typecheck": "tsc --noEmit" + "typecheck": "tsgo --noEmit" }, "files": [ "dist" @@ -81,8 +81,8 @@ "@types/shell-quote": "^1.7.5", "@types/ws": "^8.5.10", "@types/yargs": "^17.0.32", + "@typescript/native-preview": "^7.0.0-dev.20260412.1", "@xterm/headless": "^5.5.0", - "typescript": "^5.3.3", "vitest": "^3.1.1" }, "engines": { diff --git a/packages/core/package.json b/packages/core/package.json index 90010084f7..0aac56b28f 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -17,7 +17,7 @@ "test": "vitest run", "test:ci": "vitest run", "posttest": "npm run build", - "typecheck": "tsc --noEmit" + "typecheck": "tsgo --noEmit" }, "files": [ "dist" @@ -106,9 +106,9 @@ "@types/js-yaml": "^4.0.9", "@types/json-stable-stringify": "^1.1.0", "@types/picomatch": "^4.0.1", + "@typescript/native-preview": "^7.0.0-dev.20260412.1", "chrome-devtools-mcp": "^0.19.0", "msw": "^2.3.4", - "typescript": "^5.3.3", "vitest": "^3.1.1" }, "engines": { diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index 7526c37932..0dc19b82ad 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -5,8 +5,8 @@ "lib": ["DOM", "DOM.Iterable", "ES2023"], "composite": true, "types": ["node", "vitest/globals"], - "baseUrl": ".", "paths": { + "*": ["./*"], "@google/gemini-cli-core": ["./index.ts"] } }, diff --git a/packages/devtools/package.json b/packages/devtools/package.json index 60eba8c1a6..e05893fbe4 100644 --- a/packages/devtools/package.json +++ b/packages/devtools/package.json @@ -12,7 +12,7 @@ } }, "scripts": { - "build": "npm run build:client && tsc -p tsconfig.build.json", + "build": "npm run build:client && tsgo -p tsconfig.build.json", "build:client": "node esbuild.client.js" }, "files": [ @@ -23,6 +23,7 @@ "node": ">=20" }, "devDependencies": { + "@typescript/native-preview": "^7.0.0-dev.20260412.1", "react": "^19.2.0", "react-dom": "^19.2.0" }, diff --git a/packages/devtools/tsconfig.build.json b/packages/devtools/tsconfig.build.json index f90fcb9cac..b8778fdcc4 100644 --- a/packages/devtools/tsconfig.build.json +++ b/packages/devtools/tsconfig.build.json @@ -1,6 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { + "rootDir": "src", "outDir": "dist/src", "declaration": true, "sourceMap": true, diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 225b60ce2d..dcff365bbf 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -16,7 +16,7 @@ "format": "prettier --write .", "test": "vitest run", "test:ci": "vitest run", - "typecheck": "tsc --noEmit" + "typecheck": "tsgo --noEmit" }, "files": [ "dist" @@ -27,7 +27,7 @@ "zod-to-json-schema": "^3.23.1" }, "devDependencies": { - "typescript": "^5.3.3", + "@typescript/native-preview": "^7.0.0-dev.20260412.1", "vitest": "^3.1.1" }, "engines": { diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 8a1d11000f..613890f54a 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -7,7 +7,7 @@ "type": "module", "scripts": { "build": "node ../../scripts/build_package.js", - "typecheck": "tsc --noEmit" + "typecheck": "tsgo --noEmit" }, "dependencies": { "@google/gemini-cli-core": "file:../core", @@ -16,10 +16,10 @@ "strip-ansi": "^7.1.2", "vitest": "^3.2.4" }, - "devDependencies": { - "typescript": "^5.3.3" - }, "engines": { "node": ">=20" + }, + "devDependencies": { + "@typescript/native-preview": "^7.0.0-dev.20260412.1" } } diff --git a/packages/vscode-ide-companion/package.json b/packages/vscode-ide-companion/package.json index da5931edd3..62f40323de 100644 --- a/packages/vscode-ide-companion/package.json +++ b/packages/vscode-ide-companion/package.json @@ -129,11 +129,11 @@ "@types/vscode": "^1.99.0", "@typescript-eslint/eslint-plugin": "^8.31.1", "@typescript-eslint/parser": "^8.31.1", + "@typescript/native-preview": "^7.0.0-dev.20260412.1", "@vscode/vsce": "^3.6.0", "esbuild": "^0.25.3", "eslint": "^9.25.1", "npm-run-all2": "^8.0.2", - "typescript": "^5.8.3", "vitest": "^3.2.4" }, "dependencies": { diff --git a/scripts/build_package.js b/scripts/build_package.js index 279e46fa94..6f97f3500a 100644 --- a/scripts/build_package.js +++ b/scripts/build_package.js @@ -29,7 +29,7 @@ if (!process.cwd().includes('packages')) { const packageName = basename(process.cwd()); // build typescript files -execSync('tsc --build', { stdio: 'inherit' }); +execSync('tsgo --build', { stdio: 'inherit' }); // Run package-specific bundling if the script exists const bundleScript = join(process.cwd(), 'scripts', 'bundle-browser-mcp.mjs');