Merge branch 'google-gemini:main' into main

Author: akabarki76

.gcp/release-docker.yaml

@@ -5,19 +5,19 @@ steps:
     entrypoint: 'npm'
     args: ['install']
 
-  # Step 4: Authenticate for Docker (so we can push images to the artifact registry)
+  # Step 2: Authenticate for Docker (so we can push images to the artifact registry)
   - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
     id: 'Authenticate docker'
     entrypoint: 'npm'
     args: ['run', 'auth']
 
-  # Step 5: Build workspace packages
+  # Step 3: Build workspace packages
   - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
     id: 'Build packages'
     entrypoint: 'npm'
     args: ['run', 'build:packages']
 
-  # Step 6: Determine Docker Image Tag
+  # Step 4: Determine Docker Image Tag
   - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
     id: 'Determine Docker Image Tag'
     entrypoint: 'bash'
@@ -39,7 +39,7 @@ steps:
         echo "Determined image tag: $$FINAL_TAG"
         echo "$$FINAL_TAG" > /workspace/image_tag.txt
 
-  # Step 7: Build sandbox container image
+  # Step 5: Build sandbox container image
   - name: 'us-west1-docker.pkg.dev/gemini-code-dev/gemini-code-containers/gemini-code-builder'
     id: 'Build sandbox Docker image'
     entrypoint: 'bash'
@@ -48,7 +48,7 @@ steps:
       - |
         export GEMINI_SANDBOX_IMAGE_TAG=$$(cat /workspace/image_tag.txt)
         echo "Using Docker image tag for build: $$GEMINI_SANDBOX_IMAGE_TAG"
-        npm run build:sandbox
+        npm run build:sandbox -- --output-file /workspace/final_image_uri.txt
     env:
       - 'GEMINI_SANDBOX=$_CONTAINER_TOOL'
 

.gitignore

@@ -38,3 +38,4 @@ packages/*/coverage/
 # Generated files
 packages/cli/src/generated/
 .integration-tests/
+packages/vscode-ide-companion/*.vsix

docs/cli/configuration.md

@@ -363,13 +363,16 @@ Arguments passed directly when running the CLI can override other configurations
 - **`--telemetry-log-prompts`**:
   - Enables logging of prompts for telemetry. See [telemetry](../telemetry.md) for more information.
 - **`--checkpointing`**:
-  - Enables [checkpointing](./commands.md#checkpointing-commands).
+  - Enables [checkpointing](../checkpointing.md).
 - **`--extensions <extension_name ...>`** (**`-e <extension_name ...>`**):
   - Specifies a list of extensions to use for the session. If not provided, all available extensions are used.
   - Use the special term `gemini -e none` to disable all extensions.
   - Example: `gemini -e my-extension -e my-other-extension`
 - **`--list-extensions`** (**`-l`**):
   - Lists all available extensions and exits.
+- **`--proxy`**:
+  - Sets the proxy for the CLI.
+  - Example: `--proxy http://localhost:7890`.
 - **`--version`**:
   - Displays the version of the CLI.
 

integration-tests/simple-mcp-server.test.js

@@ -54,7 +54,7 @@ describe('simple-mcp-server', () => {
       console.error(`stderr: ${data}`);
     });
     // Wait for the server to be ready
-    return new Promise((resolve) => setTimeout(resolve, 500));
+    return new Promise((resolve) => setTimeout(resolve, 2000));
   });
 
   after(() => {