Merge branch 'master' into inlined.run-functions-exp

Author: inlined

.eslintrc.js

@@ -47,6 +47,7 @@ module.exports = {
 
         "@typescript-eslint/no-invalid-this": "error",
         "@typescript-eslint/no-unused-vars": "error", // Unused vars should not exist.
+        "@typescript-eslint/require-await": "off", // sometimes async functions don't do await stuff for valid reasons.
         "no-invalid-this": "off", // Turned off in favor of @typescript-eslint/no-invalid-this.
         "no-unused-vars": "off", // Off in favor of @typescript-eslint/no-unused-vars.
         eqeqeq: ["error", "always", { null: "ignore" }],
@@ -135,7 +136,6 @@ module.exports = {
   // TODO(jamesdaniels): add this to overrides instead
   ignorePatterns: [
     "src/dynamicImport.js",
-    "src/emulator/dataconnect/pg-gateway",
     "scripts/webframeworks-deploy-tests/nextjs/**",
     "scripts/webframeworks-deploy-tests/angular/**",
     "scripts/frameworks-tests/vite-project/**",

.github/ISSUE_TEMPLATE/mcp.md

@@ -0,0 +1,26 @@
+---
+name: "🤖 MCP Server"
+about: Report bugs or request features for the Firebase MCP Server.
+title: "[MCP]"
+labels: "api: mcp"
+assignees: ""
+---
+
+<!-- DO NOT DELETE
+validate_template=true
+template_path=.github/ISSUE_TEMPLATE/mcp.md
+-->
+
+## Summary
+
+<!-- what is your bug / feature request / feedback? -->
+
+## Bug Info <!-- please fill this out if you have a bug -->
+
+- **Affected Tool(s):** <!-- Which specific tool(s) were you using when you encountered the issue? -->
+- **MCP Client:** <!-- e.g. "Cursor v0.50.0" -->
+- **Operating System:** <!-- e.g. "Windows 11" or "macOS Sequoia" -->
+
+### Steps to Reproduce
+
+<!-- write a detailed description of how to reproduce>

CHANGELOG.md

@@ -1,4 +1,2 @@
-- Changed artifact registry cleanup policy error to warn for CI/CD workloads #8513
-- Enhance firebase init apphosting to support local source deploys. (#8479)
-- Fixed issue where `firebase init hosting:github` didn't correctly parse the repo input. (#8536)
-- Add GCP API client functions to support App Hosting deploy from source feature. (#8545)
+- Updated the Data Connect emulator to use pglite 0.3.x and Postgres 17, which fixes some crashes related to wire protocol inconsistencies. (#8679, #8658)
+- Fixed an issue where the IAM enablement for GenKit monitoring would try to change an invalid service account. (#8756)

firebase-vscode/.gitignore

@@ -5,4 +5,5 @@ resources/dist
 .vscode-test
 .wdio-vscode-service
 logs
-!*.tgz
+!*.tgz
+prebuilt-extensions

firebase-vscode/.vscodeignore

@@ -20,4 +20,5 @@ node_modules/
 dist/test/
 *.tgz
 package-lock.json
-.wdio-vscode-service/
+.wdio-vscode-service/
+prebuilt-extensions/

firebase-vscode/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## NEXT
 
+- [Changed] Graphql Syntax Highlighter is now an extension dependency
+
+## 1.4.1
+
+- Update internal `firebase-tools` dependency to 14.6.0
+- [Changed] Updated Gemini Tool name to @FirebaseDataConnect
+
+## 1.4.0
+
+- Update internal `firebase-tools` dependency to 14.4.0
+- [Added] @data-connect tool callable from the Gemini Code Assist extension.
+
 ## 1.3.1
 
 - Updated internal `firebase-tools` dependency to 14.2.1

firebase-vscode/common/messaging/protocol.ts

@@ -109,6 +109,8 @@ export interface WebviewToExtensionParamsMap {
   /** Clears data from a running data connect emulator */
   "fdc.clear-emulator-data": void;
 
+  "firebase.activate.gemini": void;
+
   // Initialize "result" tab.
   getDataConnectResults: void;
 

firebase-vscode/package-lock.json

@@ -4,12 +4,16 @@
   "publisher": "GoogleCloudTools",
   "icon": "./resources/firebase_dataconnect_logo.png",
   "description": "Firebase Data Connect for VSCode",
-  "version": "1.3.1",
+  "version": "1.4.1",
   "engines": {
     "vscode": "^1.69.0"
   },
   "repository": "https://github.com/firebase/firebase-tools",
   "sideEffects": false,
+  "extensionDependencies": [
+    "google.geminicodeassist",
+    "graphql.vscode-graphql-syntax"
+  ],
   "categories": [
     "Other"
   ],
@@ -213,6 +217,8 @@
     "test-compile": "npm run copyfiles && webpack --config src/test/webpack.test.js",
     "lint": "eslint src --ext ts",
     "test": "npm run test:unit && npm run test:e2e",
+    "install:extensions": "code-server --install-extension Google.geminicodeassist --extensions-dir ./prebuilt-extensions/ && code-server --install-extension graphql.vscode-graphql-syntax --extensions-dir ./prebuilt-extensions/",
+    "pretest:e2e": "curl -fsSL https://code-server.dev/install.sh | sh -s -- --edge && npm run install:extensions",
     "pretest:unit": "npm run test-compile && tsc -p src/test/tsconfig.test.json",
     "test:unit": "node ./dist/test/firebase-vscode/src/test/runTest.js",
     "test:e2e": "npm run test:e2e:empty && npm run test:e2e:fishfood",

firebase-vscode/package.json

@@ -32,8 +32,13 @@ export enum DATA_CONNECT_EVENT_NAME {
   START_EMULATORS = "start_emulators",
   AUTO_COMPLETE = "auto_complete",
   SESSION_CHAR_COUNT = "session_char_count",
-  EMULATOR_EXPORT ="emulator_export",
+  EMULATOR_EXPORT = "emulator_export",
   SETUP_FIREBASE_BINARY = "setup_firebase_binary",
+  GEMINI_ERROR = "gemini_error",
+  GEMINI_OPERATION_CALL = "gemini_operation_call",
+  GEMINI_SCHEMA_CALL = "gemini_schema_call",
+  GEMINI_SUCCESS = "gemini_success",
+  TRY_GEMINI_CLICKED = "try_gemini_clicked",
 }
 
 export class AnalyticsLogger {
@@ -42,9 +47,9 @@ export class AnalyticsLogger {
   private sessionCharCount = 0; // Track total chars for the session
 
   constructor(context: vscode.ExtensionContext) {
-    this.logger = monospaceEnv.value.isMonospace ? new IDXLogger(new GA4TelemetrySender(pluginLogger), context) : env.createTelemetryLogger(
-      new GA4TelemetrySender(pluginLogger),
-    );
+    this.logger = monospaceEnv.value.isMonospace
+      ? new IDXLogger(new GA4TelemetrySender(pluginLogger), context)
+      : env.createTelemetryLogger(new GA4TelemetrySender(pluginLogger));
 
     let subscriptions: vscode.Disposable[] = [
       vscode.workspace.onDidChangeTextDocument(
@@ -149,13 +154,15 @@ export class AnalyticsLogger {
 }
 
 export class IDXLogger {
-  constructor(private sender: GA4TelemetrySender, private context: vscode.ExtensionContext) {}
+  constructor(
+    private sender: GA4TelemetrySender,
+    private context: vscode.ExtensionContext,
+  ) {}
   public logUsage(eventName: string, data?: any) {
     const packageJson = this.context.extension.packageJSON;
     data = {
       ...data,
-      extversion: packageJson.version,
-      extname: "idx",
+      ...getAnalyticsContext(this.context),
       isidx: "true",
     };
     this.sender.sendEventData(eventName, data);
@@ -207,6 +214,15 @@ class GA4TelemetrySender implements TelemetrySender {
   }
 }
 
+export function getAnalyticsContext(context: vscode.ExtensionContext) {
+  const packageJson = context.extension.packageJSON;
+
+  return {
+    extversion: packageJson.version,
+    extname: monospaceEnv.value.isMonospace ? "idx" : "vscode",
+  };
+}
+
 function addFirebaseBinaryMetadata(data?: Record<string, any> | undefined) {
   const settings = getSettings();
   return { ...data, binary_kind: settings.firebaseBinaryKind };