fix: ungate server resource staging

Stage BrowserOS and BrowserClaw server resources for every product while retaining OS/arch filters.

This lets Chromium GN targets consume whichever server resource bundle the build flags select, including package-all-resource builds. The final package/sign paths still use product descriptors to decide what ships.

Also stabilize the BrowserClaw context tests by pinning their macOS app-name expectation to the macOS platform branch, which keeps the Linux CI job deterministic.

Author: shadowfax92

packages/browseros/bos_build/config/copy_resources.yaml

@@ -93,39 +93,34 @@ copy_operations:
     source: "resources/binaries/browseros_server/darwin-arm64/resources"
     destination: "chrome/browser/browseros/server/resources"
     type: "directory"
-    product: ["browseros"]
     os: ["macos"]
     arch: ["arm64"]
 
   - name: "BrowserOS Server Resources - macOS x64"
     source: "resources/binaries/browseros_server/darwin-x64/resources"
     destination: "chrome/browser/browseros/server/resources"
     type: "directory"
-    product: ["browseros"]
     os: ["macos"]
     arch: ["x64"]
 
   - name: "BrowserOS Server Resources - Linux ARM64"
     source: "resources/binaries/browseros_server/linux-arm64/resources"
     destination: "chrome/browser/browseros/server/resources"
     type: "directory"
-    product: ["browseros"]
     os: ["linux"]
     arch: ["arm64"]
 
   - name: "BrowserOS Server Resources - Linux x64"
     source: "resources/binaries/browseros_server/linux-x64/resources"
     destination: "chrome/browser/browseros/server/resources"
     type: "directory"
-    product: ["browseros"]
     os: ["linux"]
     arch: ["x64"]
 
   - name: "BrowserOS Server Resources - Windows x64"
     source: "resources/binaries/browseros_server/windows-x64/resources"
     destination: "chrome/browser/browseros/server/resources"
     type: "directory"
-    product: ["browseros"]
     os: ["windows"]
     arch: ["x64"]
 
@@ -134,38 +129,33 @@ copy_operations:
     source: "resources/binaries/browseros_claw_server/darwin-arm64/resources"
     destination: "chrome/browser/browseros/claw_server/resources"
     type: "directory"
-    product: ["browserclaw"]
     os: ["macos"]
     arch: ["arm64"]
 
   - name: "BrowserOS Claw Server Resources - macOS x64"
     source: "resources/binaries/browseros_claw_server/darwin-x64/resources"
     destination: "chrome/browser/browseros/claw_server/resources"
     type: "directory"
-    product: ["browserclaw"]
     os: ["macos"]
     arch: ["x64"]
 
   - name: "BrowserOS Claw Server Resources - Linux ARM64"
     source: "resources/binaries/browseros_claw_server/linux-arm64/resources"
     destination: "chrome/browser/browseros/claw_server/resources"
     type: "directory"
-    product: ["browserclaw"]
     os: ["linux"]
     arch: ["arm64"]
 
   - name: "BrowserOS Claw Server Resources - Linux x64"
     source: "resources/binaries/browseros_claw_server/linux-x64/resources"
     destination: "chrome/browser/browseros/claw_server/resources"
     type: "directory"
-    product: ["browserclaw"]
     os: ["linux"]
     arch: ["x64"]
 
   - name: "BrowserOS Claw Server Resources - Windows x64"
     source: "resources/binaries/browseros_claw_server/windows-x64/resources"
     destination: "chrome/browser/browseros/claw_server/resources"
     type: "directory"
-    product: ["browserclaw"]
     os: ["windows"]
     arch: ["x64"]

packages/browseros/bos_build/config/download_resources.yaml

@@ -39,39 +39,34 @@ download_operations:
     r2_key: "artifacts/server/latest/browseros-server-resources-darwin-arm64.zip"
     destination: "resources/binaries/browseros_server/darwin-arm64"
     download_type: "artifact_zip"
-    product: ["browseros"]
     os: ["macos"]
     arch: ["arm64"]
 
   - name: "BrowserOS Server Resources - macOS x64"
     r2_key: "artifacts/server/latest/browseros-server-resources-darwin-x64.zip"
     destination: "resources/binaries/browseros_server/darwin-x64"
     download_type: "artifact_zip"
-    product: ["browseros"]
     os: ["macos"]
     arch: ["x64"]
 
   - name: "BrowserOS Server Resources - Linux ARM64"
     r2_key: "artifacts/server/latest/browseros-server-resources-linux-arm64.zip"
     destination: "resources/binaries/browseros_server/linux-arm64"
     download_type: "artifact_zip"
-    product: ["browseros"]
     os: ["linux"]
     arch: ["arm64"]
 
   - name: "BrowserOS Server Resources - Linux x64"
     r2_key: "artifacts/server/latest/browseros-server-resources-linux-x64.zip"
     destination: "resources/binaries/browseros_server/linux-x64"
     download_type: "artifact_zip"
-    product: ["browseros"]
     os: ["linux"]
     arch: ["x64"]
 
   - name: "BrowserOS Server Resources - Windows x64"
     r2_key: "artifacts/server/latest/browseros-server-resources-windows-x64.zip"
     destination: "resources/binaries/browseros_server/windows-x64"
     download_type: "artifact_zip"
-    product: ["browseros"]
     os: ["windows"]
     arch: ["x64"]
 
@@ -80,38 +75,33 @@ download_operations:
     r2_key: "claw-server/prod-resources/latest/browseros-claw-server-resources-darwin-arm64.zip"
     destination: "resources/binaries/browseros_claw_server/darwin-arm64"
     download_type: "artifact_zip"
-    product: ["browserclaw"]
     os: ["macos"]
     arch: ["arm64"]
 
   - name: "BrowserOS Claw Server Resources - macOS x64"
     r2_key: "claw-server/prod-resources/latest/browseros-claw-server-resources-darwin-x64.zip"
     destination: "resources/binaries/browseros_claw_server/darwin-x64"
     download_type: "artifact_zip"
-    product: ["browserclaw"]
     os: ["macos"]
     arch: ["x64"]
 
   - name: "BrowserOS Claw Server Resources - Linux ARM64"
     r2_key: "claw-server/prod-resources/latest/browseros-claw-server-resources-linux-arm64.zip"
     destination: "resources/binaries/browseros_claw_server/linux-arm64"
     download_type: "artifact_zip"
-    product: ["browserclaw"]
     os: ["linux"]
     arch: ["arm64"]
 
   - name: "BrowserOS Claw Server Resources - Linux x64"
     r2_key: "claw-server/prod-resources/latest/browseros-claw-server-resources-linux-x64.zip"
     destination: "resources/binaries/browseros_claw_server/linux-x64"
     download_type: "artifact_zip"
-    product: ["browserclaw"]
     os: ["linux"]
     arch: ["x64"]
 
   - name: "BrowserOS Claw Server Resources - Windows x64"
     r2_key: "claw-server/prod-resources/latest/browseros-claw-server-resources-windows-x64.zip"
     destination: "resources/binaries/browseros_claw_server/windows-x64"
     download_type: "artifact_zip"
-    product: ["browserclaw"]
     os: ["windows"]
     arch: ["x64"]

packages/browseros/bos_build/core/context_test.py

@@ -5,7 +5,9 @@
 import unittest
 from pathlib import Path
 from typing import cast
+from unittest import mock
 
+from . import context as context_mod
 from .context import Context
 from .products import ProductDescriptor, get_product_descriptor
 
@@ -72,35 +74,43 @@ def test_fixed_app_path_short_circuits_resolution(self):
         self.assertEqual(ctx.get_app_path(), pinned)
 
     def test_browserclaw_context_derives_names_and_paths(self):
-        ctx = Context(
-            chromium_src=Path("/nonexistent-src"),
-            architecture="arm64",
-            build_type="release",
-            product=get_product_descriptor("browserclaw"),
-        )
+        with (
+            mock.patch.object(context_mod, "IS_MACOS", return_value=True),
+            mock.patch.object(context_mod, "IS_WINDOWS", return_value=False),
+        ):
+            ctx = Context(
+                chromium_src=Path("/nonexistent-src"),
+                architecture="arm64",
+                build_type="release",
+                product=get_product_descriptor("browserclaw"),
+            )
 
-        self.assertEqual(ctx.BROWSEROS_APP_BASE_NAME, "BrowserClaw")
-        self.assertEqual(ctx.BROWSEROS_APP_NAME, "BrowserClaw.app")
-        self.assertEqual(ctx.out_dir, "out/Default_browserclaw_arm64")
-        self.assertEqual(
-            ctx.get_artifact_name("dmg"),
-            f"BrowserClaw_v{ctx.semantic_version}_arm64.dmg",
-        )
-        self.assertEqual(
-            ctx.get_release_path("macos"),
-            f"releases/browserclaw/{ctx.semantic_version}/macos/",
-        )
+            self.assertEqual(ctx.BROWSEROS_APP_BASE_NAME, "BrowserClaw")
+            self.assertEqual(ctx.BROWSEROS_APP_NAME, "BrowserClaw.app")
+            self.assertEqual(ctx.out_dir, "out/Default_browserclaw_arm64")
+            self.assertEqual(
+                ctx.get_artifact_name("dmg"),
+                f"BrowserClaw_v{ctx.semantic_version}_arm64.dmg",
+            )
+            self.assertEqual(
+                ctx.get_release_path("macos"),
+                f"releases/browserclaw/{ctx.semantic_version}/macos/",
+            )
 
     def test_context_accepts_product_id(self):
-        ctx = Context(
-            chromium_src=Path("/nonexistent-src"),
-            architecture="arm64",
-            build_type="release",
-            product=cast(ProductDescriptor, "browserclaw"),
-        )
+        with (
+            mock.patch.object(context_mod, "IS_MACOS", return_value=True),
+            mock.patch.object(context_mod, "IS_WINDOWS", return_value=False),
+        ):
+            ctx = Context(
+                chromium_src=Path("/nonexistent-src"),
+                architecture="arm64",
+                build_type="release",
+                product=cast(ProductDescriptor, "browserclaw"),
+            )
 
-        self.assertEqual(ctx.product.id, "browserclaw")
-        self.assertEqual(ctx.BROWSEROS_APP_NAME, "BrowserClaw.app")
+            self.assertEqual(ctx.product.id, "browserclaw")
+            self.assertEqual(ctx.BROWSEROS_APP_NAME, "BrowserClaw.app")
 
     def test_context_accepts_product_id_string(self):
         ctx = Context(

packages/browseros/bos_build/steps/resources/resources_test.py

@@ -187,7 +187,7 @@ def test_missing_source_is_tolerated(self):
 
         self.assertFalse((self.chromium.src / "chrome" / "ghost").exists())
 
-    def test_real_config_copies_browseros_server_for_browseros_product(self):
+    def test_real_config_copies_server_resources_for_browseros_product(self):
         self.root.write_copy_config(self._real_copy_config())
         browseros_source = (
             self.root.root
@@ -240,9 +240,9 @@ def test_real_config_copies_browseros_server_for_browseros_product(self):
             / "browseros-claw-server"
         )
         self.assertEqual(browseros_dest.read_text(), "browseros")
-        self.assertFalse(claw_dest.exists())
+        self.assertEqual(claw_dest.read_text(), "claw")
 
-    def test_real_config_copies_claw_server_for_browserclaw_product(self):
+    def test_real_config_copies_server_resources_for_browserclaw_product(self):
         self.root.write_copy_config(self._real_copy_config())
         browseros_source = (
             self.root.root
@@ -295,7 +295,7 @@ def test_real_config_copies_claw_server_for_browserclaw_product(self):
             / "bin"
             / "browseros-claw-server"
         )
-        self.assertFalse(browseros_dest.exists())
+        self.assertEqual(browseros_dest.read_text(), "browseros")
         self.assertEqual(claw_dest.read_text(), "claw")
 
     def _real_copy_config(self) -> dict:

packages/browseros/bos_build/steps/storage/download_test.py

@@ -199,7 +199,7 @@ def _build_metadata(self, files: dict[str, bytes]) -> dict:
 
 
 class DownloadResourceConfigTest(unittest.TestCase):
-    def test_real_config_includes_browseros_artifacts_by_target(self) -> None:
+    def test_real_config_includes_server_artifacts_by_target(self) -> None:
         cases = [
             (
                 "macos",
@@ -210,6 +210,11 @@ def test_real_config_includes_browseros_artifacts_by_target(self) -> None:
                         "artifacts/server/latest/browseros-server-resources-darwin-arm64.zip",
                         "resources/binaries/browseros_server/darwin-arm64",
                     ),
+                    (
+                        "BrowserOS Claw Server Resources - macOS ARM64",
+                        "claw-server/prod-resources/latest/browseros-claw-server-resources-darwin-arm64.zip",
+                        "resources/binaries/browseros_claw_server/darwin-arm64",
+                    ),
                 ],
             ),
             (
@@ -221,6 +226,11 @@ def test_real_config_includes_browseros_artifacts_by_target(self) -> None:
                         "artifacts/server/latest/browseros-server-resources-darwin-x64.zip",
                         "resources/binaries/browseros_server/darwin-x64",
                     ),
+                    (
+                        "BrowserOS Claw Server Resources - macOS x64",
+                        "claw-server/prod-resources/latest/browseros-claw-server-resources-darwin-x64.zip",
+                        "resources/binaries/browseros_claw_server/darwin-x64",
+                    ),
                 ],
             ),
             (
@@ -232,6 +242,11 @@ def test_real_config_includes_browseros_artifacts_by_target(self) -> None:
                         "artifacts/server/latest/browseros-server-resources-linux-arm64.zip",
                         "resources/binaries/browseros_server/linux-arm64",
                     ),
+                    (
+                        "BrowserOS Claw Server Resources - Linux ARM64",
+                        "claw-server/prod-resources/latest/browseros-claw-server-resources-linux-arm64.zip",
+                        "resources/binaries/browseros_claw_server/linux-arm64",
+                    ),
                 ],
             ),
             (
@@ -243,6 +258,11 @@ def test_real_config_includes_browseros_artifacts_by_target(self) -> None:
                         "artifacts/server/latest/browseros-server-resources-linux-x64.zip",
                         "resources/binaries/browseros_server/linux-x64",
                     ),
+                    (
+                        "BrowserOS Claw Server Resources - Linux x64",
+                        "claw-server/prod-resources/latest/browseros-claw-server-resources-linux-x64.zip",
+                        "resources/binaries/browseros_claw_server/linux-x64",
+                    ),
                 ],
             ),
             (
@@ -254,6 +274,11 @@ def test_real_config_includes_browseros_artifacts_by_target(self) -> None:
                         "artifacts/server/latest/browseros-server-resources-windows-x64.zip",
                         "resources/binaries/browseros_server/windows-x64",
                     ),
+                    (
+                        "BrowserOS Claw Server Resources - Windows x64",
+                        "claw-server/prod-resources/latest/browseros-claw-server-resources-windows-x64.zip",
+                        "resources/binaries/browseros_claw_server/windows-x64",
+                    ),
                 ],
             ),
         ]
@@ -278,11 +303,13 @@ def test_real_config_includes_both_macos_arches_for_universal(self) -> None:
             [
                 "BrowserOS Server Resources - macOS ARM64",
                 "BrowserOS Server Resources - macOS x64",
+                "BrowserOS Claw Server Resources - macOS ARM64",
+                "BrowserOS Claw Server Resources - macOS x64",
             ],
             [op["name"] for op in filtered],
         )
 
-    def test_real_config_includes_claw_artifacts_for_browserclaw_product(self) -> None:
+    def test_real_config_includes_server_artifacts_for_browserclaw_product(self) -> None:
         operations = self._real_download_operations()
 
         filtered = self._filter_operations(
@@ -291,6 +318,11 @@ def test_real_config_includes_claw_artifacts_for_browserclaw_product(self) -> No
 
         self.assertEqual(
             [
+                (
+                    "BrowserOS Server Resources - macOS ARM64",
+                    "artifacts/server/latest/browseros-server-resources-darwin-arm64.zip",
+                    "resources/binaries/browseros_server/darwin-arm64",
+                ),
                 (
                     "BrowserOS Claw Server Resources - macOS ARM64",
                     "claw-server/prod-resources/latest/browseros-claw-server-resources-darwin-arm64.zip",