fix(core): parse callCommand with shell-quote matching discoveryCommand#19935
fix(core): parse callCommand with shell-quote matching discoveryCommand#19935SUNDRAM07 wants to merge 2 commits intogoogle-gemini:mainfrom
Conversation
|
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
Summary of ChangesHello @SUNDRAM07, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request addresses a critical issue where callCommand in DiscoveredToolInvocation.execute() failed to correctly handle commands containing arguments, leading to execution errors. The solution involves integrating shell-quote parsing for callCommand, mirroring the existing robust implementation for discoveryCommand, thereby ensuring consistent and reliable command execution. This change prevents ENOENT errors and improves the stability of tool invocations. Highlights
Changelog
Activity
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
There was a problem hiding this comment.
Code Review
This pull request correctly fixes a bug where callCommand with arguments would fail. The approach of using shell-quote to parse the command is sound and consistent with how discoveryCommand is handled. The new tests are a great addition, covering both the bug fix and backward compatibility. I've added one critical suggestion to improve the robustness of the command parsing by validating the output from shell-quote to prevent potential runtime errors with complex shell commands.
When tools.callCommand contains arguments (e.g. 'python3 script.py --call'), spawn() received the entire string as a single executable, causing ENOENT. discoveryCommand already correctly used shell-quote parse() to split the command string. This fix applies the same parsing to callCommand. The parsed output is now validated to ensure all parts are strings, rejecting commands with unsupported shell operators (e.g. pipes, &&). Fixes google-gemini#19783
618420a to
4100cf4
Compare
|
Hi there! Thank you for your interest in contributing to Gemini CLI. To ensure we maintain high code quality and focus on our prioritized roadmap, we have updated our contribution policy (see Discussion #17383). We only guarantee review and consideration of pull requests for issues that are explicitly labeled as 'help wanted'. All other community pull requests are subject to closure after 14 days if they do not align with our current focus areas. For this reason, we strongly recommend that contributors only submit pull requests against issues explicitly labeled as 'help-wanted'. This pull request is being closed as it has been open for 14 days without a 'help wanted' designation. We encourage you to find and contribute to existing 'help wanted' issues in our backlog! Thank you for your understanding and for being part of our community! |
Summary
When
tools.callCommandcontains arguments (e.g.,python3 script.py --call),spawn()received the entire string as a single executable path, causing anENOENTerror. In contrast,tools.discoveryCommandalready correctly usedshell-quote'sparse()to split the command string into an executable and its arguments.This fix applies the same
shell-quoteparsing tocallCommandinDiscoveredToolInvocation.execute(), making both commands consistent.Root Cause
In
packages/core/src/tools/tool-registry.ts, theDiscoveredToolInvocation.execute()method was passing the rawcallCommandstring directly tospawn()as the executable:When
callCommandwas"python3 script.py --call", Node.js tried to find an executable literally namedpython3 script.py --call, resulting inENOENT.Fix
Applied the same
shell-quoteparse()pattern already used bydiscoveryCommand:Tests
Added two new test cases in
tool-registry.test.ts:callCommandwith arguments (python3 script.py --call): Verifies thatspawn()receives the executable (python3) and split arguments separately.callCommandwithout arguments (my-call-command): Verifies backward compatibility.All 23 tests pass with zero regressions.
Fixes #19783