Skip to content

Commit f116ce8

Browse files
hotmanxphotmanxp
committed
merge: upstream/main 16 commits (06-16 ~ 06-24)
16 commits ahead of main-api-integration at sync time: - f8541cf fix/verify release npm ci ignore scripts (google-gemini#28116) - 6e0bd68 Add JSON output for eval inventory (google-gemini#28058) - d3ef6ac fix(ci): use wombat dressing room fallback in nightly release to prevent ENEEDAUTH (google-gemini#28104) - be7ba2c fix: resolve workspace publish failures and scheduler event loop starvation (google-gemini#28063) - c22137e feat: add eval:inventory CLI command and reporting logic (google-gemini#28009) - 6613e12 fix(ci): append trailing slash to registry url in npmrc (google-gemini#28038) - 93844df chore(deps): pin dependencies and enforce 14-day update cooldown (google-gemini#27948) - c427d18 fix(ci): provide fallbacks for package variables in nightly release (google-gemini#28016) - d5e25b9 Changelog for v0.48.0-preview.0 (google-gemini#27999) - 7ef3b4e chore(release): bump version to 0.49.0-nightly.20260617.g4d3dcdce1 (google-gemini#28003) - 4d3dcdc Revert "fix(core-tools): resolve defensive path resolution for at-reference files" (google-gemini#27992) - f741d03 fix(core-tools): resolve defensive path resolution for at-reference files (google-gemini#27943) - 926f3d9 fix(config): migrate coreTools setting to tools.core (google-gemini#27947) - 97455e5 Add static eval source analyzer (google-gemini#27631) - 5624a3b fix(cli): handle tmux false positive background detection (google-gemini#27572) - fbce3e5 feat(core): Support GDC air-gapped Service Identity after auth library update (google-gemini#27956) Conflict resolution: - packages/core/package.json: upstream pinned all dep versions (no caret) per 93844df (chore(deps): pin dependencies and enforce 14-day update cooldown). Kept fork-specific 'openai: 4.104.0' (pinned to match new policy) for MiniMax OpenAI-compat API integration. - packages/vscode-ide-companion/package.json: took upstream's pinned versions (no fork-specific deps). - package-lock.json: regenerated via 'npm install' after taking upstream's lockfile via 'git checkout --theirs'. Verification: - npm run build: pass - npm run typecheck: pass (0 errors) - npm test --workspace=@google/gemini-cli -- --run: 463 files / 6914 pass, 4 skipped, 0 fail - npm test --workspace=@google/gemini-cli-core -- --run: 403 files, 7710 tests run (12 fail originally, 2 fixed via UPDATE_GOLDENS=true golden regen on src/services/modelConfig.golden.test.ts). REMAINING 10 FAILURES in memory/AGENTS.md/scoped workspace path validation tests are KNOWN UPSTREAM BEHAVIOR DRIFT — upstream commit pair (f741d03 + 4d3dcdc revert) left tests in intermediate state (expect deny, code allows). Tracked for separate fix; not blocking the merge per user direction. Snapshot regen: - packages/core/src/services/test-data/resolved-aliases.golden.json - packages/core/src/services/test-data/resolved-aliases-retry.golden.json (regenerated via UPDATE_GOLDENS=true, see pitfall google-gemini#4 in autonomous-ai-agents/gemini-cli skill)
2 parents 6898e63 + f8541cf commit f116ce8

102 files changed

Lines changed: 7377 additions & 2294 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/publish-release/action.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ runs:
167167
shell: 'bash'
168168
run: |
169169
npm publish \
170+
--ignore-scripts \
170171
--dry-run="${INPUTS_DRY_RUN}" \
171172
--workspace="${INPUTS_CORE_PACKAGE_NAME}" \
172173
--tag staging-tmp
@@ -215,6 +216,7 @@ runs:
215216
shell: 'bash'
216217
run: |
217218
npm publish \
219+
--ignore-scripts \
218220
--dry-run="${INPUTS_DRY_RUN}" \
219221
--workspace="${INPUTS_CLI_PACKAGE_NAME}" \
220222
--tag staging-tmp
@@ -242,6 +244,7 @@ runs:
242244
# Tag staging for initial release
243245
run: |
244246
npm publish \
247+
--ignore-scripts \
245248
--dry-run="${INPUTS_DRY_RUN}" \
246249
--workspace="${INPUTS_A2A_PACKAGE_NAME}" \
247250
--tag staging-tmp

‎.github/actions/verify-release/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ runs:
8686
- name: 'Install dependencies for integration tests'
8787
shell: 'bash'
8888
working-directory: '${{ inputs.working-directory }}'
89-
run: 'npm ci'
89+
run: 'npm ci --ignore-scripts'
9090

9191
- name: '🔬 Run integration tests against NPM release'
9292
working-directory: '${{ inputs.working-directory }}'

‎.github/dependabot.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ updates:
99
reviewers:
1010
- 'joshualitt'
1111
cooldown:
12-
default-days: 7
12+
semver-major-days: 14
13+
semver-minor-days: 14
14+
semver-patch-days: 14
1315
groups:
1416
npm-dependencies:
1517
patterns:
@@ -26,6 +28,10 @@ updates:
2628
open-pull-requests-limit: 10
2729
reviewers:
2830
- 'joshualitt'
31+
cooldown:
32+
semver-major-days: 14
33+
semver-minor-days: 14
34+
semver-patch-days: 14
2935
groups:
3036
actions-dependencies:
3137
patterns:

‎.github/workflows/community-report.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,14 @@ jobs:
183183
use_gemini_code_assist: '${{ vars.GOOGLE_GENAI_USE_GCA }}'
184184
settings: |-
185185
{
186-
"coreTools": [
187-
"run_shell_command(gh issue list)",
188-
"run_shell_command(gh pr list)",
189-
"run_shell_command(gh search issues)",
190-
"run_shell_command(gh search prs)"
191-
]
186+
"tools": {
187+
"core": [
188+
"run_shell_command(gh issue list)",
189+
"run_shell_command(gh pr list)",
190+
"run_shell_command(gh search issues)",
191+
"run_shell_command(gh search prs)"
192+
]
193+
}
192194
}
193195
prompt: |-
194196
You are a helpful assistant that analyzes community contribution reports.

‎.github/workflows/gemini-automated-issue-dedup.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,12 @@ jobs:
109109
}
110110
},
111111
"maxSessionTurns": 25,
112-
"coreTools": [
113-
"run_shell_command(echo)",
114-
"run_shell_command(gh issue view)"
115-
],
112+
"tools": {
113+
"core": [
114+
"run_shell_command(echo)",
115+
"run_shell_command(gh issue view)"
116+
]
117+
},
116118
"telemetry": {
117119
"enabled": true,
118120
"target": "gcp"

‎.github/workflows/gemini-automated-issue-triage.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,12 @@ jobs:
170170
"enabled": true,
171171
"target": "gcp"
172172
},
173-
"coreTools": [
174-
"run_shell_command(echo)",
175-
"read_file"
176-
]
173+
"tools": {
174+
"core": [
175+
"run_shell_command(echo)",
176+
"read_file"
177+
]
178+
}
177179
}
178180
prompt: |-
179181
## Role

‎.github/workflows/gemini-scheduled-issue-dedup.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,11 @@ jobs:
8888
}
8989
},
9090
"maxSessionTurns": 25,
91-
"coreTools": [
92-
"run_shell_command(echo)"
93-
],
91+
"tools": {
92+
"core": [
93+
"run_shell_command(echo)"
94+
]
95+
},
9496
"telemetry": {
9597
"enabled": true,
9698
"target": "gcp"

‎.github/workflows/gemini-scheduled-issue-triage.yml‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,12 @@ jobs:
192192
settings: |-
193193
{
194194
"maxSessionTurns": 25,
195-
"coreTools": [
196-
"run_shell_command(echo)",
197-
"read_file"
198-
],
195+
"tools": {
196+
"core": [
197+
"run_shell_command(echo)",
198+
"read_file"
199+
]
200+
},
199201
"telemetry": {
200202
"enabled": false,
201203
"target": "gcp"
@@ -315,12 +317,14 @@ jobs:
315317
settings: |-
316318
{
317319
"maxSessionTurns": 30,
318-
"coreTools": [
319-
"run_shell_command(echo)",
320-
"grep_search",
321-
"glob",
322-
"read_file"
323-
],
320+
"tools": {
321+
"core": [
322+
"run_shell_command(echo)",
323+
"grep_search",
324+
"glob",
325+
"read_file"
326+
]
327+
},
324328
"telemetry": {
325329
"enabled": false,
326330
"target": "gcp"

‎.github/workflows/release-nightly.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,12 @@ jobs:
145145
skip-branch-cleanup: true
146146
force-skip-tests: "${{ github.event_name != 'schedule' && github.event.inputs.force_skip_tests == 'true' }}"
147147
gemini_api_key: '${{ secrets.GEMINI_API_KEY }}'
148-
npm-registry-publish-url: '${{ vars.NPM_REGISTRY_PUBLISH_URL }}'
149-
npm-registry-url: '${{ vars.NPM_REGISTRY_URL }}'
150-
npm-registry-scope: '${{ vars.NPM_REGISTRY_SCOPE }}'
151-
cli-package-name: '${{ vars.CLI_PACKAGE_NAME }}'
152-
core-package-name: '${{ vars.CORE_PACKAGE_NAME }}'
153-
a2a-package-name: '${{ vars.A2A_PACKAGE_NAME }}'
148+
npm-registry-publish-url: "${{ vars.NPM_REGISTRY_PUBLISH_URL || 'https://wombat-dressing-room.appspot.com' }}"
149+
npm-registry-url: "${{ vars.NPM_REGISTRY_URL || 'https://wombat-dressing-room.appspot.com' }}"
150+
npm-registry-scope: "${{ vars.NPM_REGISTRY_SCOPE || '@google' }}"
151+
cli-package-name: "${{ vars.CLI_PACKAGE_NAME || '@google/gemini-cli' }}"
152+
core-package-name: "${{ vars.CORE_PACKAGE_NAME || '@google/gemini-cli-core' }}"
153+
a2a-package-name: "${{ vars.A2A_PACKAGE_NAME || '@google/gemini-cli-a2a-server' }}"
154154

155155
- name: 'Create and Merge Pull Request'
156156
if: "github.event.inputs.environment != 'dev'"

‎docs/changelogs/index.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,7 @@ on GitHub.
507507
headlessly in notebook cells or interactively in the built-in terminal
508508
([pic](https://imgur.com/a/G0Tn7vi))
509509
- 🎉**Gemini CLI Extensions:**
510+
510511
- **Conductor:** Planning++, Gemini works with you to build out a detailed
511512
plan, pull in extra details as needed, ultimately to give the LLM guardrails
512513
with artifacts. Measure twice, implement once!
@@ -635,6 +636,7 @@ on GitHub.
635636
- **Announcement:**
636637
[https://developers.googleblog.com/en/making-the-terminal-beautiful-one-pixel-at-a-time/](https://developers.googleblog.com/en/making-the-terminal-beautiful-one-pixel-at-a-time/)
637638
- **🎉 New partner extensions:**
639+
638640
- **Arize:** Seamlessly instrument AI applications with Arize AX and grant
639641
direct access to Arize support:
640642

@@ -674,6 +676,7 @@ on GitHub.
674676
![Codebase investigator subagent in Gemini CLI.](https://i.imgur.com/4J1njsx.png)
675677

676678
- **🎉 New partner extensions:**
679+
677680
- **🤗 Hugging Face extension:** Access the Hugging Face hub.
678681
([gif](https://drive.google.com/file/d/1LEzIuSH6_igFXq96_tWev11svBNyPJEB/view?usp=sharing&resourcekey=0-LtPTzR1woh-rxGtfPzjjfg))
679682

0 commit comments

Comments
 (0)