Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ updates:
reviewers:
- 'joshualitt'
cooldown:
default-days: 7
semver-major-days: 14
semver-minor-days: 14
semver-patch-days: 14
groups:
npm-dependencies:
patterns:
Expand All @@ -26,6 +28,10 @@ updates:
open-pull-requests-limit: 10
reviewers:
- 'joshualitt'
cooldown:
semver-major-days: 14
semver-minor-days: 14
semver-patch-days: 14
groups:
actions-dependencies:
patterns:
Expand Down
5,280 changes: 4,146 additions & 1,134 deletions package-lock.json

Large diffs are not rendered by default.

116 changes: 58 additions & 58 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@
"cliui": {
"wrap-ansi": "7.0.0"
},
"glob": "^12.0.0",
"glob": "12.0.0",
"node-domexception": "npm:empty@^0.10.1",
"prebuild-install": "npm:nop@1.0.0",
"cross-spawn": "^7.0.6"
"cross-spawn": "7.0.6"
},
"bin": {
"gemini": "bundle/gemini.js"
Expand All @@ -92,73 +92,73 @@
"LICENSE"
],
"devDependencies": {
"@agentclientprotocol/sdk": "^0.16.1",
"read-package-up": "^11.0.0",
"@octokit/rest": "^22.0.0",
"@types/marked": "^5.0.2",
"@types/mime-types": "^3.0.1",
"@types/minimatch": "^5.1.2",
"@types/mock-fs": "^4.13.4",
"@types/prompts": "^2.4.9",
"@types/proper-lockfile": "^4.1.4",
"@types/react": "^19.2.0",
"@types/react-dom": "^19.2.0",
"@types/shell-quote": "^1.7.5",
"@types/ws": "^8.18.1",
"@vitest/coverage-v8": "^3.1.1",
"@vitest/eslint-plugin": "^1.3.4",
"asciichart": "^1.5.25",
"cross-env": "^7.0.3",
"depcheck": "^1.4.7",
"domexception": "^4.0.0",
"esbuild": "^0.25.0",
"esbuild-plugin-wasm": "^1.1.0",
"eslint": "^9.24.0",
"eslint-config-prettier": "^10.1.2",
"eslint-plugin-headers": "^1.3.3",
"eslint-plugin-import": "^2.32.0",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^5.2.0",
"glob": "^12.0.0",
"globals": "^16.0.0",
"google-artifactregistry-auth": "^3.4.0",
"husky": "^9.1.7",
"json": "^11.0.0",
"lint-staged": "^16.1.6",
"memfs": "^4.42.0",
"mnemonist": "^0.40.3",
"mock-fs": "^5.5.0",
"msw": "^2.10.4",
"npm-run-all": "^4.1.5",
"prettier": "^3.5.3",
"react-devtools-core": "^6.1.2",
"react-dom": "^19.2.0",
"semver": "^7.7.2",
"strip-ansi": "^7.1.2",
"ts-prune": "^0.10.3",
"tsx": "^4.20.3",
"typescript": "^5.8.3",
"typescript-eslint": "^8.30.1",
"vitest": "^3.2.4",
"yargs": "^17.7.2"
"@agentclientprotocol/sdk": "0.16.1",
"read-package-up": "11.0.0",
"@octokit/rest": "22.0.0",
"@types/marked": "5.0.2",
"@types/mime-types": "3.0.1",
"@types/minimatch": "5.1.2",
"@types/mock-fs": "4.13.4",
"@types/prompts": "2.4.9",
"@types/proper-lockfile": "4.1.4",
"@types/react": "19.2.0",
"@types/react-dom": "19.2.0",
"@types/shell-quote": "1.7.5",
"@types/ws": "8.18.1",
"@vitest/coverage-v8": "3.2.4",
"@vitest/eslint-plugin": "1.3.4",
"asciichart": "1.5.25",
"cross-env": "7.0.3",
"depcheck": "1.4.7",
"domexception": "4.0.0",
"esbuild": "0.25.0",
"esbuild-plugin-wasm": "1.1.0",
"eslint": "9.24.0",
"eslint-config-prettier": "10.1.2",
"eslint-plugin-headers": "1.3.3",
"eslint-plugin-import": "2.32.0",
"eslint-plugin-react": "7.37.5",
"eslint-plugin-react-hooks": "5.2.0",
"glob": "12.0.0",
"globals": "16.0.0",
"google-artifactregistry-auth": "3.4.0",
"husky": "9.1.7",
"json": "11.0.0",
"lint-staged": "16.1.6",
"memfs": "4.42.0",
"mnemonist": "0.40.3",
"mock-fs": "5.5.0",
"msw": "2.10.4",
"npm-run-all": "4.1.5",
"prettier": "3.5.3",
"react-devtools-core": "6.1.2",
"react-dom": "19.2.4",
"semver": "7.7.2",
"strip-ansi": "7.1.2",
"ts-prune": "0.10.3",
"tsx": "4.20.3",
"typescript": "5.8.3",
"typescript-eslint": "8.30.1",
"vitest": "3.2.4",
"yargs": "17.7.2"
},
"dependencies": {
"ink": "npm:@jrichman/ink@6.6.9",
"latest-version": "^9.0.0",
"node-fetch-native": "^1.6.7",
"proper-lockfile": "^4.1.2",
"punycode": "^2.3.1",
"simple-git": "^3.28.0"
"latest-version": "9.0.0",
"node-fetch-native": "1.6.7",
"proper-lockfile": "4.1.2",
"punycode": "2.3.1",
"simple-git": "3.28.0"
},
"optionalDependencies": {
"@github/keytar": "^7.10.6",
"@github/keytar": "7.10.6",
"@lydell/node-pty": "1.1.0",
"@lydell/node-pty-darwin-arm64": "1.1.0",
"@lydell/node-pty-darwin-x64": "1.1.0",
"@lydell/node-pty-linux-x64": "1.1.0",
"@lydell/node-pty-win32-arm64": "1.1.0",
"@lydell/node-pty-win32-x64": "1.1.0",
"node-pty": "^1.0.0"
"node-pty": "1.0.0"
},
"lint-staged": {
"*.{js,jsx,ts,tsx}": [
Expand Down
30 changes: 15 additions & 15 deletions packages/a2a-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,25 @@
],
"dependencies": {
"@a2a-js/sdk": "0.3.11",
"@google-cloud/storage": "^7.19.0",
"@google-cloud/storage": "7.19.0",
"@google/gemini-cli-core": "file:../core",
"express": "^5.1.0",
"fs-extra": "^11.3.0",
"strip-json-comments": "^3.1.1",
"tar": "^7.5.8",
"uuid": "^13.0.0",
"winston": "^3.17.0"
"express": "5.1.0",
"fs-extra": "11.3.0",
"strip-json-comments": "3.1.1",
"tar": "7.5.8",
"uuid": "13.0.0",
"winston": "3.17.0"
},
"devDependencies": {
"@google/genai": "1.30.0",
"@types/express": "^5.0.3",
"@types/fs-extra": "^11.0.4",
"@types/supertest": "^6.0.3",
"@types/tar": "^6.1.13",
"dotenv": "^16.4.5",
"supertest": "^7.1.4",
"typescript": "^5.3.3",
"vitest": "^3.1.1"
"@types/express": "5.0.3",
"@types/fs-extra": "11.0.4",
"@types/supertest": "6.0.3",
"@types/tar": "6.1.13",
"dotenv": "16.4.5",
"supertest": "7.1.4",
"typescript": "5.8.3",
"vitest": "3.2.4"
},
"engines": {
"node": ">=20"
Expand Down
19 changes: 11 additions & 8 deletions packages/a2a-server/src/config/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,17 @@ export function loadSettings(

function resolveEnvVarsInString(value: string): string {
const envVarRegex = /\$(?:(\w+)|{([^}]+)})/g; // Find $VAR_NAME or ${VAR_NAME}
return value.replace(envVarRegex, (match, varName1, varName2) => {
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const varName = varName1 || varName2;
if (process && process.env && typeof process.env[varName] === 'string') {
return process.env[varName];
}
return match;
});
return value.replace(
envVarRegex,
(match: string, varName1: string, varName2: string) => {
const varName = varName1 || varName2;
const envValue = process?.env?.[varName];
if (typeof envValue === 'string') {
return envValue;
}
return match;
},
);
}

function resolveEnvVarsInObject<T>(obj: T): T {
Expand Down
96 changes: 48 additions & 48 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,60 +30,60 @@
"sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.49.0-nightly.20260617.g4d3dcdce1"
},
"dependencies": {
"@agentclientprotocol/sdk": "^0.16.1",
"@agentclientprotocol/sdk": "0.16.1",
"@google/gemini-cli-core": "file:../core",
"@google/genai": "1.30.0",
"@iarna/toml": "^2.2.5",
"@modelcontextprotocol/sdk": "^1.23.0",
"ansi-escapes": "^7.3.0",
"ansi-regex": "^6.2.2",
"chalk": "^4.1.2",
"cli-spinners": "^2.9.2",
"clipboardy": "~5.2.0",
"color-convert": "^2.0.1",
"command-exists": "^1.2.9",
"comment-json": "^4.2.5",
"diff": "^8.0.3",
"dotenv": "^17.1.0",
"extract-zip": "^2.0.1",
"fzf": "^0.5.2",
"glob": "^12.0.0",
"highlight.js": "^11.11.1",
"@iarna/toml": "2.2.5",
"@modelcontextprotocol/sdk": "1.23.0",
"ansi-escapes": "7.3.0",
"ansi-regex": "6.2.2",
"chalk": "4.1.2",
"cli-spinners": "2.9.2",
"clipboardy": "5.2.0",
"color-convert": "2.0.1",
"command-exists": "1.2.9",
"comment-json": "4.2.5",
"diff": "8.0.3",
"dotenv": "17.1.0",
"extract-zip": "2.0.1",
"fzf": "0.5.2",
"glob": "12.0.0",
"highlight.js": "11.11.1",
"ink": "npm:@jrichman/ink@6.6.9",
"ink-gradient": "^3.0.0",
"ink-spinner": "^5.0.0",
"latest-version": "^9.0.0",
"lowlight": "^3.3.0",
"mnemonist": "^0.40.3",
"open": "^10.1.2",
"prompts": "^2.4.2",
"proper-lockfile": "^4.1.2",
"react": "^19.2.0",
"shell-quote": "^1.8.3",
"simple-git": "^3.28.0",
"string-width": "^8.1.0",
"strip-ansi": "^7.1.0",
"strip-json-comments": "^3.1.1",
"tar": "^7.5.8",
"tinygradient": "^1.1.5",
"undici": "^7.10.0",
"ws": "^8.16.0",
"yargs": "^17.7.2",
"zod": "^3.23.8"
"ink-gradient": "3.0.0",
"ink-spinner": "5.0.0",
"latest-version": "9.0.0",
"lowlight": "3.3.0",
"mnemonist": "0.40.3",
"open": "10.1.2",
"prompts": "2.4.2",
"proper-lockfile": "4.1.2",
"react": "19.2.4",
"shell-quote": "1.8.3",
"simple-git": "3.28.0",
"string-width": "8.1.0",
"strip-ansi": "7.1.0",
"strip-json-comments": "3.1.1",
"tar": "7.5.8",
"tinygradient": "1.1.5",
"undici": "7.10.0",
"ws": "8.16.0",
"yargs": "17.7.2",
"zod": "3.25.76"
},
"devDependencies": {
"@google/gemini-cli-test-utils": "file:../test-utils",
"@types/command-exists": "^1.2.3",
"@types/hast": "^3.0.4",
"@types/node": "^20.11.24",
"@types/react": "^19.2.0",
"@types/semver": "^7.7.0",
"@types/shell-quote": "^1.7.5",
"@types/ws": "^8.5.10",
"@types/yargs": "^17.0.32",
"@xterm/headless": "^5.5.0",
"typescript": "^5.3.3",
"vitest": "^3.1.1"
"@types/command-exists": "1.2.3",
"@types/hast": "3.0.4",
"@types/node": "20.11.24",
"@types/react": "19.2.0",
"@types/semver": "7.7.0",
"@types/shell-quote": "1.7.5",
"@types/ws": "8.5.10",
"@types/yargs": "17.0.32",
"@xterm/headless": "5.5.0",
"typescript": "5.8.3",
"vitest": "3.2.4"
},
"engines": {
"node": ">=20"
Expand Down
9 changes: 6 additions & 3 deletions packages/cli/src/acp/acpSession.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,8 @@ describe('Session', () => {
void,
unknown
> {
yield* [];
// eslint-disable-next-line @typescript-eslint/no-explicit-any
yield* [] as any;
throw error;
}
return errorGen();
Expand All @@ -303,7 +304,8 @@ describe('Session', () => {
void,
unknown
> {
yield* [];
// eslint-disable-next-line @typescript-eslint/no-explicit-any
yield* [] as any;
throw error;
}
return errorGen();
Expand Down Expand Up @@ -473,7 +475,8 @@ describe('Session', () => {
void,
unknown
> {
yield* [];
// eslint-disable-next-line @typescript-eslint/no-explicit-any
yield* [] as any;
throw customError;
}
return errorGen();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "module",
"main": "example.js",
"dependencies": {
"@modelcontextprotocol/sdk": "^1.23.0",
"zod": "^3.22.4"
"@modelcontextprotocol/sdk": "1.23.0",
"zod": "3.22.4"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ describe('ExtensionEnablementManager', () => {
vi.spyOn(fs, 'writeFileSync').mockImplementation(
(
path: fs.PathOrFileDescriptor,
data: string | ArrayBufferView<ArrayBufferLike>,
data: string | NodeJS.ArrayBufferView,
) => {
inMemoryFs[path.toString()] = data.toString(); // Convert ArrayBufferView to string for inMemoryFs
},
Expand Down
Loading
Loading