From 13b09712917c13bf32113aac86c6fbdc31bce187 Mon Sep 17 00:00:00 2001
From: Abhi <43648792+abhipatel12@users.noreply.github.com>
Date: Fri, 25 Jul 2025 16:18:59 -0400
Subject: [PATCH] fix(ci): Fix failing release workflow by creating a
 self-contained bundle (#4888)

Co-authored-by: Jerop Kipruto <jerop@google.com>
---
 esbuild.config.js         | 23 +-------------
 package-lock.json         | 67 ++++++++++++++++++++++++++-------------
 packages/cli/package.json |  4 ++-
 3 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/esbuild.config.js b/esbuild.config.js
index 790f0758..0cb8e0fa 100644
--- a/esbuild.config.js
+++ b/esbuild.config.js
@@ -21,6 +21,7 @@ esbuild
     outfile: 'bundle/gemini.js',
     platform: 'node',
     format: 'esm',
+    external: [],
     alias: {
       'is-in-ci': path.resolve(
         __dirname,
@@ -33,27 +34,5 @@ esbuild
     banner: {
       js: `import { createRequire } from 'module'; const require = createRequire(import.meta.url); globalThis.__filename = require('url').fileURLToPath(import.meta.url); globalThis.__dirname = require('path').dirname(globalThis.__filename);`,
     },
-    external: [
-      'es-toolkit/compat',
-      'ansi-escapes',
-      'auto-bind',
-      'command-exists',
-      '@babel/code-frame',
-      'cli-truncate',
-      'cli-cursor',
-      '@alcalzone/ansi-tokenize',
-      'cli-boxes',
-      'code-excerpt',
-      'chalk',
-      'cli-spinners',
-      'configstore',
-      'gradient-string',
-      'devlop',
-      'escape-goat',
-      '@iarna/toml',
-      '@pnpm/npm-conf',
-      'deep-extend',
-      'ansi-align',
-    ],
   })
   .catch(() => process.exit(1));
diff --git a/package-lock.json b/package-lock.json
index 6771bb17..fd296927 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -918,27 +918,6 @@
       "resolved": "packages/core",
       "link": true
     },
-    "node_modules/@google/genai": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@google/genai/-/genai-1.9.0.tgz",
-      "integrity": "sha512-w9P93OXKPMs9H1mfAx9+p3zJqQGrWBGdvK/SVc7cLZEXNHr/3+vW2eif7ZShA6wU24rNLn9z9MK2vQFUvNRI2Q==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "google-auth-library": "^9.14.2",
-        "ws": "^8.18.0"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      },
-      "peerDependencies": {
-        "@modelcontextprotocol/sdk": "^1.11.0"
-      },
-      "peerDependenciesMeta": {
-        "@modelcontextprotocol/sdk": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@grpc/grpc-js": {
       "version": "1.13.4",
       "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.13.4.tgz",
@@ -11650,6 +11629,7 @@
       "version": "0.1.13",
       "dependencies": {
         "@google/gemini-cli-core": "file:../core",
+        "@google/genai": "1.9.0",
         "@iarna/toml": "^2.2.5",
         "@types/update-notifier": "^6.0.8",
         "command-exists": "^1.2.9",
@@ -11673,7 +11653,8 @@
         "strip-ansi": "^7.1.0",
         "strip-json-comments": "^3.1.1",
         "update-notifier": "^7.3.1",
-        "yargs": "^17.7.2"
+        "yargs": "^17.7.2",
+        "zod": "^3.23.8"
       },
       "bin": {
         "gemini": "dist/index.js"
@@ -11701,6 +11682,27 @@
         "node": ">=20"
       }
     },
+    "packages/cli/node_modules/@google/genai": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@google/genai/-/genai-1.9.0.tgz",
+      "integrity": "sha512-w9P93OXKPMs9H1mfAx9+p3zJqQGrWBGdvK/SVc7cLZEXNHr/3+vW2eif7ZShA6wU24rNLn9z9MK2vQFUvNRI2Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "google-auth-library": "^9.14.2",
+        "ws": "^8.18.0"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      },
+      "peerDependencies": {
+        "@modelcontextprotocol/sdk": "^1.11.0"
+      },
+      "peerDependenciesMeta": {
+        "@modelcontextprotocol/sdk": {
+          "optional": true
+        }
+      }
+    },
     "packages/cli/node_modules/@testing-library/dom": {
       "version": "10.4.0",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
@@ -11877,6 +11879,27 @@
         "node": ">=20"
       }
     },
+    "packages/core/node_modules/@google/genai": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@google/genai/-/genai-1.9.0.tgz",
+      "integrity": "sha512-w9P93OXKPMs9H1mfAx9+p3zJqQGrWBGdvK/SVc7cLZEXNHr/3+vW2eif7ZShA6wU24rNLn9z9MK2vQFUvNRI2Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "google-auth-library": "^9.14.2",
+        "ws": "^8.18.0"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      },
+      "peerDependencies": {
+        "@modelcontextprotocol/sdk": "^1.11.0"
+      },
+      "peerDependenciesMeta": {
+        "@modelcontextprotocol/sdk": {
+          "optional": true
+        }
+      }
+    },
     "packages/core/node_modules/ajv": {
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index faebfea3..ce672d22 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -29,6 +29,7 @@
   },
   "dependencies": {
     "@google/gemini-cli-core": "file:../core",
+    "@google/genai": "1.9.0",
     "@iarna/toml": "^2.2.5",
     "@types/update-notifier": "^6.0.8",
     "command-exists": "^1.2.9",
@@ -52,7 +53,8 @@
     "strip-ansi": "^7.1.0",
     "strip-json-comments": "^3.1.1",
     "update-notifier": "^7.3.1",
-    "yargs": "^17.7.2"
+    "yargs": "^17.7.2",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@babel/runtime": "^7.27.6",