Integrate FAH Local Builds with Universal Maker by falahat · Pull Request #10382 · firebase/firebase-tools

falahat · 2026-04-17T17:55:32Z

Description

This takes the existing local builds solution and uses the Universal Maker binary (which runs all relevant buildpacks) instead of hackily running the apphosting adapter manually.

The Universal Maker is a more well-supported tool and behaves more similar to Cloud Builds so we can have more confidence about framework support and fidelity.

Major changes

Automatically downloads the universal maker when it's needed, verifying its hash
Calls the universal maker, correctly handling the .apphosting folder.
For now, this relies on the apphosting generated bundle.yaml file rather than UM's output.json, but that will be fixed later

Scenarios Tested

Created a local build with the

Sample Commands

firebase experiments:enable apphostinglocalbuilds
firebase experiments:enable universalMaker

firebase deploy

* Enable secret resolution during local App Hosting builds * fix build error * Handle env vars (especially secrets) with a Promise.all so it can be parallelized

…al builds (#10337) * Enable secret resolution during local App Hosting builds * fix build error * Handle env vars (especially secrets) with a Promise.all so it can be parallelized * Add a warning so that we do not use build-available secrets unless the user confirms * fix undefined boolean flag behavior * fix tests, address some review comments * fix test mocking

…#10352) * Consolidate the ABIU prompts in the CLI so it matches the UI more closely * Address linter errors

* feat: add SSE mode support for MCP server ### Description Adds support for running the MCP server in SSE (HTTP) mode, in addition to the default Stdio transport. This allows clients to connect over network or via tools that support SSE. ### Scenarios Tested - Started server in SSE mode and verified log output. * fix: add progressToken to McpContext interface to fix build error ### Description Fixes a type error where progressToken was not defined on McpContext. ### Scenarios Tested - Verified build succeeds. * refactor: address PR comments on SSE support ### Description Addresses PR comments by: - Moving inline require calls to top-level imports. - Replacing any types with specific interfaces or unknown. ### Scenarios Tested - Verified build succeeds. * fix: address remaining review comments on SSE support ### Description - Reverts accidental GA4 tracking change in mcpListResources. - Replaces console.error with this.logger calls for better logging. - Changes default server binding from 0.0.0.0 to 127.0.0.1 for security. ### Scenarios Tested - Verified build succeeds. * style: lint and format fixes for SSE support ### Description - Applied auto-formatting fixes from npm run format. ### Scenarios Tested - Verified build succeeds. * feat: add infrastructure for MCP Apps (#10259) * feat: add infrastructure for MCP Apps ### Description Adds support for returning structured content from tools, which is used by MCP Apps to pass complex data to the host. Also updates the resource index. ### Scenarios Tested - Verified build and file changes. * fix: resolve build errors and address review comments on infra ### Description - Removes imports and registry entries for UI resources that are not yet available in this branch (login, update_environment, deploy, init). - Replaces as any in toContent with an intersection type for better type safety. ### Scenarios Tested - Verified build succeeds. * chore: avoid any for sessionId in SSE transport ### Description - Defines a local interface extending SSEServerTransport to avoid using when accessing . ### Scenarios Tested - Build succeeds. - Lint passes for modified lines. * feat: change sse flag to mode flag and fix build errors ### Description - Replaced boolean flag with string flag (defaults to 'stdio'). - Added validation for to accept only 'stdio' or 'sse'. - Fixed build errors by adding to interface and removing missing resource. ### Scenarios Tested - Build succeeds. - Lint passes with no new errors. * feat: add Update Environment MCP App (#10260) * feat: add mcpapps experiment flag and helper ### Description - Adds mcpapps experiment flag to src/experiments.ts. - Adds applyAppMeta helper function to src/mcp/util.ts to conditionally add UI metadata. - Adds unit tests for applyAppMeta in src/mcp/util.spec.ts. ### Scenarios Tested - Unit tests passed. - Build succeeds. * chore: address PR comments on experiments and util ### Description - Fixes applyAppMeta to preserve existing metadata. - Moves mcpapps flag to be grouped with other MCP experiments. - Removes as any in util.spec.ts by importing CallToolResult. ### Scenarios Tested - Build succeeds. - Lint passes for modified files (ignoring pre-existing warnings). - Unit tests for applyAppMeta pass. * feat: add infrastructure for MCP Apps Adds support for returning structured content from tools, which is used by MCP Apps to pass complex data to the host. Also updates the resource index. - Verified build and file changes. * feat: add Update Environment MCP App ### Description Adds the Update Environment MCP App, allowing users to switch projects and directories from the UI. ### Scenarios Tested - Verified build and file changes. * fix: resolve compilation errors in mcp-update-env-app * fix: resolve remaining lint errors in mcp-update-env-app * refactor: extract app MIME type shared constant * added changelog'

gemini-code-assist

Code Review

This pull request adds support for 'Universal Maker' local builds, integrates Secret Manager secret resolution for local environments, and refactors ABIU configuration. Key feedback includes fixing a blocking issue in the build watcher, adhering to style guides for YAML parsing and error handling, and optimizing the bundling process to avoid slow file copies of node_modules.

falahat · 2026-04-17T18:11:14Z

/gemini review

gemini-code-assist

Code Review

This pull request introduces the "Universal Maker" for App Hosting local builds, enabling standalone binary builds through a new experiment. It also enhances secret management by implementing a utility to resolve secrets from Secret Manager during local builds, adding a security confirmation prompt, and introducing the --allow-local-build-secrets flag. Furthermore, the PR removes explicit "Automatic Base Image Updates" (ABIU) configuration flags, integrating ABIU status into the runtime selection instead. Review feedback suggests strengthening test assertions for binary execution, removing unknown type assertions to comply with the style guide, and generalizing build artifact packaging logic to remove framework-specific assumptions.

falahat · 2026-04-17T20:26:33Z

/gemini review

gemini-code-assist

Code Review

This pull request introduces support for a new 'Universal Maker' standalone binary for local builds in App Hosting, controlled via an experimental flag. It adds the runUniversalMaker function to handle the binary execution, artifact management, and metadata parsing, while also updating the tar archive creation logic to support flattened directory structures for .apphosting outputs. Feedback focuses on improving the robustness of the build process by checking the binary's exit status, ensuring proper cleanup of stale artifacts and temporary directories, and removing hardcoded environment variables that might conflict with user configurations.

* fix: prevent hosting deploy to site in wrong project ### Description Prevent accidental deployments to a hosting site that does not belong to the active project. The CLI now verifies that the site belongs to the project before creating a version. Fixes #10376 ### Scenarios Tested - Verified that error is thrown when site does not belong to project. - Verified that deploy passes when site belongs to project. - Verified that check is skipped for demo projects. ### Sample Commands `firebase deploy --project project-b` (where site in firebase.json belongs to project-a) -> should fail. * chore: remove excessive site validation check and update tests * Comment * chore: remove demo project check and corresponding test * chore: remove unused Constants import in prepare.ts

* test: improve coverage for appdistribution distribution ### Description Add hermetic uploading and mock polling asserts for app distribution workflows. ### Scenarios Tested - Extracting sequential binary structures * test: fix unused imports in distribution tests

* Add a file cleanup callback * Clean up the file handling * Add error handling

* test: improve coverage for dataconnect names ### Description Add parsing and validation regex checks for Data Connect entities. ### Scenarios Tested - Extracting groups for service and connectors * fix: correct instances literal in CloudSQL toString

…versal maker to share some code.

* test: improve coverage for apphosting yaml configs ### Description Implement loading, merging, storing assertions and fix environment map formatting bugs for app hosting setup. ### Scenarios Tested - Loading basic strings and merging overlapping targets * fix: use destructuring to remove variable property in toEnvMap

…ploy" flow as well

… the "deploy" flow as well" This reverts commit 59a79f5.

* Making Http and Callable Dart functions Public when deployed

* refactor: refactor catch clauses in emulator directory to use unknown ### Description This PR refactors `catch (err: any)` to `catch (err: unknown)` in the `src/emulator/` directory to improve type safety and reduce weak typing in the codebase. Safe property access and type guards have been applied where necessary. ### Scenarios Tested Ran full test suite with `npm test`. 4270 tests passed, 3 failed in Auth Emulator tests (likely flaky or timing issues). ### Sample Commands `npm test` * refactor: address PR review comments on type safety ### Description This PR addresses review comments on type safety by removing unsafe type assertions and refactoring catch clauses in files outside the emulator directory as requested by the reviewer. ### Scenarios Tested Ran full test suite with `npm test`. All 4273 tests passed successfully. ### Sample Commands `npm test` * refactor: deduplicate error handling in emulator directory using src/error.ts ### Description This PR deduplicates error handling code in the `src/emulator/` directory by utilizing utilities like `getError`, `getErrMsg`, `getErrStack`, and `getErrStatus` from `src/error.ts` as requested by the user. ### Scenarios Tested Ran full test suite with `npm test`. All 4273 tests passed successfully. ### Sample Commands `npm test` * PR fixes

* test: improve coverage for firestore deploy ### Description Add hermetic tests validating Firestore index and security rule dispatch flows within `src/deploy/firestore/deploy.ts`. ### Scenarios Tested - Sequential initialization of defined configurations - Intermittent state retries ### Sample Commands `npm run mocha -- 'src/deploy/firestore/deploy.spec.ts'` * fix: remove as unknown as type assertions in firestore deploy tests

* test: improve test coverage for resourceManager ### Description Add unit tests for src/gcp/resourceManager.ts, specifically testing addServiceAccountToRoles and serviceAccountHasRoles. ### Scenarios Tested - Validating success outcomes of role additions - Preventing duplicate role assignment ### Sample Commands npm run mocha -- 'src/gcp/resourceManager.spec.ts' * fix: resolve ESLint errors in tests * fix: remove type escape hatches in nock configurations in resourceManager tests * fix: use arrow functions for nock body matching in resourceManager tests * format

* chore: address dependabot alerts in subprojects ### Description Addressed multiple Dependabot alerts in subprojects by running `npm audit fix` and adding manual overrides for `protobufjs` to fix critical vulnerabilities. Also updated `next` to a safe version in test templates. Avoided breaking changes and major updates as requested. ### Scenarios Tested Ran `npm install` in all affected directories to verify dependency resolution. Did not run full test suite due to time and environment constraints, but changes are isolated to subprojects and test fixtures. ### Sample Commands npm audit fix * fix: update Next.js chunk patterns in tests ### Description Updated the regex patterns in `webframeworks-deploy-tests/tests.ts` to match alphanumeric chunk names generated by `next@16.2.4`. ### Scenarios Tested Verified that chunk names in failure logs match the new pattern. * fix: update Next.js chunk patterns to allow dots and handle .js middleware manifest ### Description Updated the regex patterns in `webframeworks-deploy-tests/tests.ts` to allow dots in chunk names (e.g., `0.zhcmd__c9_v.js`) and updated the expected extension for `_clientMiddlewareManifest` from `.json` to `.js` to match output from newer Next.js versions. ### Scenarios Tested Running `npm run test:frameworks` locally.

* test: improve coverage for use command ### Description Add comprehensive unit tests for `src/commands/use.ts` including alias manipulation, output validation, and input parsing. ### Scenarios Tested - Successful execution of `--add` and `--clear` - Verification of interactive mode fallbacks ### Sample Commands `npm run mocha -- 'src/commands/use.spec.ts'` * fix: resolve ESLint errors in tests * test: address review comments and fix type errors in use.spec.ts * nit

This reverts commit 9ae31c3.

This boolean flip will make it visible to CLI users when running `firebase experiments:list`.

* Cli prompts fixed to respect non interactive flag * fix edge case when project have existing csql and cli is called in non-interactive mode * add changlong * improve defaults and make sdk prompt support non interactive mode * make agent skills not installed by default in non interactive mode * fix lint errors

falahat

Some readability / organization comments. I tested this manually but I re-read the code and think it's quite gross/unreadable currently.

…sal_maker

falahat · 2026-04-28T16:59:24Z

/gemini review

gemini-code-assist

Code Review

This pull request introduces the 'Universal Maker' binary as an alternative build mechanism for App Hosting, controlled via a new experiment flag. It includes logic for downloading, validating, and executing the platform-specific binary, along with parsing its output and handling build artifacts. Feedback focuses on improving file system operations by using fs-extra for safer cross-device moves, enhancing error handling for unknown error types, and adhering to the repository's style guide by removing instances of any and using asynchronous file system methods.

…sal_maker

…gging

Yuangwang

Left some questions but otherwise lgtm

Yuangwang · 2026-05-05T20:42:37Z

+      );
+    }
+  } else if (process.platform === "win32") {
+    throw new FirebaseError("Windows (win32) is not currently supported for Universal Maker.");


Do you know when/if these other platforms will be supported?

Yuangwang · 2026-05-05T20:44:40Z

+    "version": "1.0.0",
+    "expectedSize": 16111618,
+    "expectedChecksumSHA256": "4b77d02a5f80f26d9bd1428f388c293c1fb264995d75b51c7d50fec7c87bcf58",
+    "remoteUrl": "https://artifactregistry.googleapis.com/download/v1/projects/serverless-runtimes-qa/locations/us-central1/repositories/universal-maker/files/darwin-arm64%3A1.0.0%3Auniversal_maker:download?alt=media",


I'm guessing this is downloading from the serverless-runtimes-qa for now since this is still in preview but do we expect to change this to a prod project in the future?

falahat and others added 7 commits April 16, 2026 09:35

Add support for BUILD-available secrets for Local Builds (#10229)

4349832

* Enable secret resolution during local App Hosting builds * fix build error * Handle env vars (especially secrets) with a Promise.all so it can be parallelized

Consolidate the ABIU prompts in the CLI so it matches the UI behavior (…

63a529e

…#10352) * Consolidate the ABIU prompts in the CLI so it matches the UI more closely * Address linter errors

create a prototype version of local builds that uses the universal maker

c573c6a

Add some gross hacks to stop bundle.yaml from being wiped empty

67cc1cc

Run tests automatically against next (#10365)

a5ae2b7

gemini-code-assist Bot reviewed Apr 17, 2026

View reviewed changes

Comment thread src/apphosting/localbuilds.ts Outdated

Comment thread src/apphosting/localbuilds.ts

Comment thread src/apphosting/localbuilds.ts Outdated

Comment thread src/apphosting/secrets/index.ts Outdated

Comment thread src/deploy/apphosting/util.ts Outdated

Get rid of the watcher hack

a7cf61e

falahat changed the base branch from main to next April 17, 2026 18:11

gemini-code-assist Bot reviewed Apr 17, 2026

View reviewed changes

Comment thread src/apphosting/localbuilds.spec.ts Outdated

Comment thread src/apphosting/localbuilds.ts Outdated

Comment thread src/apphosting/localbuilds.ts Outdated

Comment thread src/deploy/apphosting/util.ts Outdated

falahat added 2 commits April 17, 2026 16:18

Address some review comments (unknown casts)

a2bce07

Address some other review comments

80f5aa1

gemini-code-assist Bot reviewed Apr 17, 2026

View reviewed changes

Comment thread src/apphosting/localbuilds.ts Outdated

Comment thread src/apphosting/localbuilds.ts Outdated

Comment thread src/apphosting/localbuilds.ts

Comment thread src/deploy/apphosting/util.ts

falahat and others added 8 commits April 17, 2026 16:29

Add a code comment

0bb1d5c

simplify local build code for tarballs

0bccdc2

simplify further

152505d

Further simplify diffs

d2185aa

Add automatic downloading of the UM binary

98e3c4f

Address review comments:

125676e

* Add a file cleanup callback * Clean up the file handling * Add error handling

joehan reviewed Apr 21, 2026

View reviewed changes

Comment thread src/apphosting/universalMakerDownload.ts Outdated

joehan reviewed Apr 21, 2026

View reviewed changes

Comment thread src/apphosting/universalMakerDownload.ts Outdated

joehan and others added 4 commits April 21, 2026 09:24

update valid python runtimes (#10393)

13c3a47

Create a common utility for downloading. This allows emulaotr and uni…

b8abe9b

…versal maker to share some code.

Fix FIREBASE_OUTPUT_BUNDLE_DIR

0cb9a89

joehan and others added 12 commits April 22, 2026 13:46

Prompt for ABIU runtime settings when creating a backend from the "de…

59a79f5

…ploy" flow as well

Revert "Prompt for ABIU runtime settings when creating a backend from…

e6d1796

… the "deploy" flow as well" This reverts commit 59a79f5.

Making onCall Dart functions Public when deployed (#10390)

e30a646

* Making Http and Callable Dart functions Public when deployed

Revert "test: improve coverage for use command (#10345)" (#10418)

ec56f9f

This reverts commit 9ae31c3.

Make dartfunctions experiment public

aa1dc58

This boolean flip will make it visible to CLI users when running `firebase experiments:list`.

falahat commented Apr 28, 2026

View reviewed changes

falahat added 2 commits April 28, 2026 12:16

Merge branch 'next' of github.com:firebase/firebase-tools into univer…

57aee02

…sal_maker

Merge branch 'main' of github.com:firebase/firebase-tools into univer…

0564f1e

…sal_maker

falahat changed the base branch from next to main April 28, 2026 16:24

falahat added 3 commits April 28, 2026 12:38

address some linter warnings

94f419e

Address some code review comments

acc1d87

fix availability issue

8bcaf78

gemini-code-assist Bot reviewed Apr 28, 2026

View reviewed changes

falahat requested review from Yuangwang and annajowang April 28, 2026 17:11

Address final (ha!) review comments

0dd50ec

falahat marked this pull request as ready for review April 28, 2026 18:09

Merge branch 'main' of github.com:firebase/firebase-tools into univer…

112c712

…sal_maker

falahat commented May 4, 2026

View reviewed changes

Comment thread src/apphosting/localbuilds.ts Outdated

Comment thread src/apphosting/localbuilds.ts Outdated

Comment thread src/apphosting/localbuilds.ts

falahat added 2 commits May 4, 2026 15:14

Merge branch 'main' of github.com:firebase/firebase-tools into univer…

0848891

…sal_maker

Address review comments on readability. Improve error handling and lo…

1812379

…gging

Yuangwang approved these changes May 5, 2026

View reviewed changes

Conversation

falahat commented Apr 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Scenarios Tested

Sample Commands

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

falahat commented Apr 17, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

falahat commented Apr 17, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

falahat left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

falahat commented Apr 28, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Yuangwang left a comment

Choose a reason for hiding this comment

Uh oh!

Yuangwang May 5, 2026

Choose a reason for hiding this comment

Uh oh!

Yuangwang May 5, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

falahat commented Apr 17, 2026 •

edited

Loading