Merge branch 'main' into context-setup

Author: averikitsch

.github/workflows/json-lint.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
 
       - name: Run JSON Lint
         run: jq . gemini-extension.json

.github/workflows/markdown-checks.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
 
       - name: Link Checker
         uses: lycheeverse/lychee-action@v2.0.2

.github/workflows/package-and-upload-assets.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
       - name: Checkout code at the new tag
-        uses: actions/checkout@v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           ref: ${{ github.event.release.tag_name }}
 
@@ -116,10 +116,10 @@ jobs:
       contents: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
 
       - name: Download all archives from workflow artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5
         with:
           path: release-archives
 

.github/workflows/presubmit-tests.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
 
       - name: Install Gemini CLI
         run: npm install @google/gemini-cli

README.md

@@ -24,15 +24,17 @@ Before you begin, ensure you have the following:
   * Cloud SQL Client (`roles/cloudsql.client`)
   * Cloud SQL Admin (`roles/cloudsql.admin`)
 
-## Installation
+## Getting Started
+
+### Installation
 
 To install the extension, use the command:
 
 ```bash
 gemini extensions install https://github.com/gemini-cli-extensions/cloud-sql-postgresql
 ```
 
-## Configuration
+### Configuration
 
 Set the following environment variables before starting the Gemini CLI.
 This configuration is not required if utilizing the [Admin toolset](#supported-tools).
@@ -48,13 +50,26 @@ This configuration is not required if utilizing the [Admin toolset](#supported-t
 Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
 
 > [!NOTE]
-> When using private IPs with Cloud SQL for PostgreSQL, you must use a Virtual Private Cloud (VPC) network.
+> If your Cloud SQL for PostgreSQL instance uses private IPs, you must run Gemini CLI in the same Virtual Private Cloud (VPC) network.
+
+### Start Gemini CLI
+
+To start the Gemini CLI, use the following command:
+
+```bash
+gemini
+```
+
+> [!WARNING]
+> **Changing Instance & Database Connections**
+> Currently, the database connection must be configured before starting the Gemini CLI and can not be changed during a session.
+> To save and resume conversation history use command: `/chat save <tag>` and `/chat resume <tag>`.
 
 ## Usage Examples
 
 Interact with Cloud SQL for PostgreSQL using natural language:
 
-*   **Provision Infrastructure:**
+* **Provision Infrastructure:**
     * "Create a new CLoud SQL for Postgres instance named 'e-commerce-prod' in the 'my-gcp-project' project."
     * "Create a new user named 'analyst' with read access to all tables."
 * **Explore Schemas and Data:**
@@ -69,10 +84,10 @@ Interact with Cloud SQL for PostgreSQL using natural language:
 *   **Admin:**
    	* `create_instance`: Use this tool to create an Postgres instance.
    	* `create_user`: Use this tool to create Postgres-BUILT-IN or IAM-based users.
+    * `create_database`: Creates a new database in a Cloud SQL instance.
    	* `get_instance`: Use this tool to get details about an Postgres instance.
-   	* `get_user`: Use this tool to get details about a user.
    	* `list_instances`: Use this tool to list instances in a given project and location.
-   	* `list_users`: Use this tool to list users in a given project and location.
+    * `list_databases`: Lists all databases for a Cloud SQL instance.
     * `wait_for_operation`: Use this tool to poll the operations API until the operation is done.
 
 *   **Data:**
@@ -90,8 +105,13 @@ Interact with Cloud SQL for PostgreSQL using natural language:
 
 ## Additional Extensions
 
-Find additional extensions to support your entire software development lifecycle at [github.com/gemini-cli-extensions](https://github.com/gemini-cli-extensions), including a generic [PostgreSQL extension](https://github.com/gemini-cli-extensions/postgres).
+Find additional extensions to support your entire software development lifecycle at [github.com/gemini-cli-extensions](https://github.com/gemini-cli-extensions), including:
+* [Generic PostgreSQL extension](https://github.com/gemini-cli-extensions/postgres)
+* [Cloud SQL for PostgreSQL Observability extension](https://github.com/gemini-cli-extensions/cloud-sql-postgresql-observability)
+* and more!
 
 ## Troubleshooting
 
-* "cannot execute binary file": Ensure the correct binary for your OS/Architecture has been downloaded. See [Installing the server](https://googleapis.github.io/genai-toolbox/getting-started/introduction/#installing-the-server) for more information.
+* "✖ Error during discovery for server: MCP error -32000: Connection closed": The database connection has not been established. Ensure your configuration is set via environment variables.
+* "✖ MCP ERROR: Error: spawn /Users/<USER>/.gemini/extensions/cloud-sql-postgresql/toolbox ENOENT": The Toolbox binary did not download correctly. Ensure you are using Gemini CLI v0.6.0+.
+* "cannot execute binary file": The Toolbox binary did not download correctly. Ensure the correct binary for your OS/Architecture has been downloaded. See [Installing the server](https://googleapis.github.io/genai-toolbox/getting-started/introduction/#installing-the-server) for more information.

gemini-extension.json

@@ -3,15 +3,15 @@
   "version": "0.1.0",
   "description": "Create, connect, and interact with a Cloud SQL for PostgreSQL database and data.",
   "mcpServers": {
-    "Cloud SQL for PostgreSQL Admin": {
+    "cloud_sql_postgresql_admin": {
       "command": "${extensionPath}${/}toolbox",
       "args": [
         "--prebuilt",
         "cloud-sql-postgres-admin",
         "--stdio"
       ]
     },
-    "Cloud SQL for PostgreSQL": {
+    "cloud_sql_postgresql": {
       "command": "${extensionPath}${/}toolbox",
       "args": [
         "--prebuilt",
@@ -27,4 +27,4 @@
     }
   },
   "contextFileName": "CLOUD-SQL-POSTGRESQL.md"
-}
+}