From 4fa30b45b62664eee5e44b9659a623bbaef69550 Mon Sep 17 00:00:00 2001
From: Averi Kitsch <akitsch@google.com>
Date: Fri, 26 Sep 2025 14:37:03 -0700
Subject: [PATCH 1/2] docs: update readme getting started instructions

---
 README.md | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8bead90..22665c4 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,9 @@ Before you begin, ensure you have the following:
   * Cloud SQL Viewer (`roles/cloudsql.viewer`)
   * Cloud SQL Admin (`roles/cloudsql.admin`)
 
-## Installation
+## Getting Started
+
+### Installation
 
 To install the extension, use the command:
 
@@ -31,7 +33,7 @@ To install the extension, use the command:
 gemini extensions install https://github.com/gemini-cli-extensions/cloud-sql-sqlserver
 ```
 
-## Configuration
+### Configuration
 
 Set the following environment variables before starting the Gemini CLI.
 This configuration is not required if utilizing the [Admin toolset](#supported-tools).
@@ -50,6 +52,19 @@ Ensure [Application Default Credentials](https://cloud.google.com/docs/authentic
 > [!NOTE]
 > When using private IPs with Cloud SQL for SQL Server, you must use a 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 SQL Server using natural language:
@@ -85,4 +100,6 @@ Find additional extensions to support your entire software development lifecycle
 
 ## 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-sqlserver/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.
\ No newline at end of file

From a5925af4843639d17596feec7bc90c164ce43d2f Mon Sep 17 00:00:00 2001
From: Averi Kitsch <akitsch@google.com>
Date: Fri, 26 Sep 2025 15:17:49 -0700
Subject: [PATCH 2/2] feat: standardize mcp server names

---
 gemini-extension.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gemini-extension.json b/gemini-extension.json
index dd45855..85c846a 100644
--- a/gemini-extension.json
+++ b/gemini-extension.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "description": "Connect to Cloud SQL for SQL Server",
   "mcpServers": {
-    "Cloud SQL for SQL Server Admin": {
+    "cloud_sql_sqlserver_admin": {
       "command": "${extensionPath}${/}toolbox",
       "args": [
         "--prebuilt",
@@ -11,7 +11,7 @@
         "--stdio"
       ]
     },
-    "Cloud SQL for SQL Server": {
+    "cloud_sql_sqlserver": {
       "command": "${extensionPath}${/}toolbox",
       "args": [
         "--prebuilt",
@@ -29,4 +29,4 @@
     }
   },
   "contextFileName": "CLOUD-SQL-SQLSERVER.md"
-}
+}
\ No newline at end of file