@fluid-app/fluid-cli-portal 0.1.41 → 0.1.43

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { A as fluid_os_v0_create_fluid_osversion, B as fluid_os_v0_update_fluid_osnavigation, C as writeMappings, D as fluid_os_v0_create_fluid_osprofile, E as fluid_os_v0_create_fluid_osnavigation_item, F as fluid_os_v0_delete_fluid_osscreen, G as fluid_os_v0_update_fluid_osversion, H as fluid_os_v0_update_fluid_osprofile, I as fluid_os_v0_delete_fluid_ostheme, K as createFetchClient, L as fluid_os_v0_list_fluid_osdefinitions, M as fluid_os_v0_delete_fluid_osnavigation, N as fluid_os_v0_delete_fluid_osnavigation_item, O as fluid_os_v0_create_fluid_osscreen, P as fluid_os_v0_delete_fluid_osprofile, R as fluid_os_v0_list_fluid_osnavigation_items, S as updateMapping, T as fluid_os_v0_create_fluid_osnavigation, U as fluid_os_v0_update_fluid_osscreen, V as fluid_os_v0_update_fluid_osnavigation_item, W as fluid_os_v0_update_fluid_ostheme, _ as deriveSlug, a as buildThemeIdToSlugMap, b as resolveIdToSlug, c as transformNavigationItems, d as transformTheme, f as buildSnapshot, g as writeSnapshot, h as readSnapshot, i as buildNavigationIdToSlugMap, j as fluid_os_v0_create_widget_package_version, k as fluid_os_v0_create_fluid_ostheme, l as transformProfile, m as diffAgainstSnapshot, o as deriveScreenSlug, p as computeFileHash, r as buildIdToSlugMap, s as transformNavigation, t as pullCommand, u as transformScreen, v as readMappings, w as fluid_os_v0_complete_widget_package_version_upload, x as resolveSlugToId, y as removeMapping, z as fluid_os_v0_list_fluid_osversions } from "./pull-CG5dELOX.mjs";
+import { C as writeMappings, S as updateMapping, _ as deriveSlug, a as buildThemeIdToSlugMap, b as resolveIdToSlug, c as transformNavigationItems, d as transformTheme, f as buildSnapshot, g as writeSnapshot, h as readSnapshot, i as buildNavigationIdToSlugMap, l as transformProfile, m as diffAgainstSnapshot, o as deriveScreenSlug, p as computeFileHash, r as buildIdToSlugMap, s as transformNavigation, t as pullCommand, u as transformScreen, v as readMappings, x as resolveSlugToId, y as removeMapping } from "./pull-Cl7omGLf.mjs";
 import { createRequire } from "node:module";
 import { Command } from "commander";
 import chalk from "chalk";
@@ -12,9 +12,10 @@ import { chmodSync, existsSync, mkdirSync, readFileSync, readdirSync, writeFileS
 import Handlebars from "handlebars";
 import { execa } from "execa";
 import os from "node:os";
-import fs from "fs-extra";
-import path$1 from "path";
+import { createFetchClient, fluidOs } from "@fluid-app/fluidos-api-client";
 import { createHash } from "node:crypto";
+import fs from "fs-extra";
+import { isJsonValue } from "@fluid-app/portal-core/remote-dom-widget-package";
 //#region src/types.ts
 /**
 * Available project templates
@@ -699,11 +700,14 @@ async function gitRemoteBranchExists(cwd, remoteUrl, branch = "main") {
 /**
 * Adopt `FETCH_HEAD` as the current (unborn) branch's base: point the
 * branch ref at it and load its tree into the index, leaving the working
-* tree untouched. The next auto-commit then records the local project
-* tree as a child of the remote history — local files win, remote-only
-* files are recorded as deletions — so the push fast-forwards instead of
-* being rejected for unrelated history. Only call when `hasCommits` is
-* false; with local commits it would silently rewrite the branch ref.
+* tree untouched. The next auto-commit (run with `ignoreRemovals`) then
+* records the local project tree on top of the remote history — local
+* additions/edits win, and remote-only files survive because a
+* content-only local dir (e.g. populated by `fluid portal pull`) is no
+* statement about what the full repo tracks — so the push fast-forwards
+* instead of being rejected for unrelated history. Only call when
+* `hasCommits` is false; with local commits it would silently rewrite
+* the branch ref.
 * Mirrors the widget CLI's first-push adoption (the backend provisions
 * repos with an auto-init/template commit, so a fresh root commit is
 * always unrelated history).
@@ -780,7 +784,9 @@ async function gitMergeFastForward(cwd) {
 	}
 }
 /**
-* `git add -A && git commit -m <message>`.
+* `git add -A && git commit -m <message>` (or, with
+* `{ ignoreRemovals: true }`, `git add --ignore-removal .` — see
+* GitAutoCommitOptions).
 *
 * `git add -A` intentionally stages the whole work tree: a portal's
 * provisioned repo tracks the entire project (it's seeded from the
@@ -794,9 +800,14 @@ async function gitMergeFastForward(cwd) {
 * identity so the commit isn't rejected. "nothing to commit" is treated
 * as a no-op, not an error.
 */
-async function gitAutoCommit(cwd, message) {
+async function gitAutoCommit(cwd, message, options = {}) {
+	const addArgs = options.ignoreRemovals ? [
+		"add",
+		"--ignore-removal",
+		"."
+	] : ["add", "-A"];
 	try {
-		await execa("git", ["add", "-A"], { cwd });
+		await execa("git", addArgs, { cwd });
 	} catch (err) {
 		throw toGitError(err, "add");
 	}
@@ -819,7 +830,7 @@ async function gitAutoCommit(cwd, message) {
 			cwd,
 			stdio: [
 				"ignore",
-				"inherit",
+				"pipe",
 				"pipe"
 			]
 		});
@@ -828,7 +839,7 @@ async function gitAutoCommit(cwd, message) {
 		if (missing) throw missing;
 		const e = err;
 		const streams = `${typeof e.stdout === "string" ? e.stdout : ""}\n${typeof e.stderr === "string" ? e.stderr : ""}`;
-		if (/nothing to commit/i.test(streams)) return;
+		if (/nothing to commit|no changes added to commit/i.test(streams)) return;
 		throw toGitError(err, "commit");
 	}
 }
@@ -1149,7 +1160,7 @@ async function autoPull(cwd) {
 	console.log(chalk.yellow("No portal/ directory found.") + " Attempting to pull content...");
 	console.log();
 	try {
-		const { pullCommand } = await import("./pull-CG5dELOX.mjs").then((n) => n.n);
+		const { pullCommand } = await import("./pull-Cl7omGLf.mjs").then((n) => n.n);
 		await pullCommand.parseAsync([], { from: "user" });
 		return hasPortalContent(cwd);
 	} catch (err) {
@@ -1204,615 +1215,173 @@ const devCommand = new Command("dev").description("Start the development server
 	}
 });
 //#endregion
-//#region src/utils/widget-package-config.ts
-const CONFIG_CANDIDATES = [
-	"src/widgets.config.ts",
-	"src/portal.config.ts",
-	"portal.config.ts"
-];
-const SOURCE_PACKAGE_EXTRACT_FILENAME = "extract-widget-packages.ts";
-const SOURCE_PACKAGE_OUTPUT_FILENAME = "source-widget-packages.json";
-const SOURCE_PACKAGE_OUTPUT_SENTINEL = "fluid-widget-source-packages:v1";
-const FLUID_WIDGET_AUTHORING_NODE_CONDITIONS = ["--conditions=fluid-widget-authoring", "--conditions=production"];
-const TSX_CLI_PATH$1 = createRequire(import.meta.url).resolve("tsx/cli");
-function withFluidWidgetAuthoringNodeCondition(nodeOptions) {
-	const existingOptions = nodeOptions?.trim();
-	const options = existingOptions ? existingOptions.split(/\s+/) : [];
-	const optionSet = new Set(options);
-	for (const condition of FLUID_WIDGET_AUTHORING_NODE_CONDITIONS) if (!optionSet.has(condition)) options.push(condition);
-	return options.join(" ");
-}
-async function resolvePortalWidgetSourceConfig(projectDir) {
-	for (const relativePath of CONFIG_CANDIDATES) {
-		const candidate = path.join(projectDir, relativePath);
-		if (await fs.pathExists(candidate)) return {
-			path: candidate,
-			relativePath
-		};
+//#region src/commands/build.ts
+const buildCommand = new Command("build").description("Build the application for production").option("-o, --out-dir <dir>", "Output directory", "dist").action(async (options) => {
+	const cwd = process.cwd();
+	if (!existsSync(join(cwd, "package.json"))) {
+		console.error(chalk.red("Error: No package.json found in current directory"));
+		console.error(chalk.yellow("Make sure you're in a Fluid project directory"));
+		process.exit(1);
 	}
-}
-async function loadSourceWidgetPackages(projectDir) {
-	const config = await resolvePortalWidgetSourceConfig(projectDir);
-	if (!config) return success([]);
-	let tempDir;
+	if (!existsSync(join(cwd, "vite.config.ts"))) {
+		console.error(chalk.red("Error: No vite.config.ts found"));
+		console.error(chalk.yellow("This command must be run from a Fluid project directory"));
+		process.exit(1);
+	}
+	console.log();
+	console.log(chalk.bold("Building for production..."));
+	console.log();
+	const spinner = ora("Building...").start();
 	try {
-		tempDir = await createTempDirectory$1(projectDir);
-		const extractFile = path.join(tempDir, SOURCE_PACKAGE_EXTRACT_FILENAME);
-		const outputFile = path.join(tempDir, SOURCE_PACKAGE_OUTPUT_FILENAME);
-		await fs.writeFile(extractFile, createSourcePackageExtractorScript({
-			projectDir,
-			configPath: config.path
-		}), {
-			encoding: "utf-8",
-			flag: "wx"
-		});
-		await execa(process.execPath, [
-			TSX_CLI_PATH$1,
-			extractFile,
-			outputFile
-		], {
-			cwd: projectDir,
-			stdio: "pipe",
-			env: {
-				...process.env,
-				NODE_ENV: "production",
-				NODE_OPTIONS: withFluidWidgetAuthoringNodeCondition(process.env.NODE_OPTIONS)
-			}
-		});
-		const outputResult = await readSourcePackageExtractorOutput(outputFile);
-		if (!outputResult.success) return outputResult;
-		const parsed = outputResult.value;
-		if (parsed.length === 0) return success([]);
-		return success(parsed);
-	} catch (err) {
-		const error = err;
-		return failure({
-			code: "CONFIG_LOAD_FAILED",
-			message: `Failed to load widget packages from ${config.relativePath}`,
-			details: error.stderr ?? error.message ?? String(err)
+		await execa("pnpm", ["run", "build"], {
+			cwd,
+			stdio: "pipe"
 		});
-	} finally {
-		if (tempDir) await fs.remove(tempDir).catch(() => {});
+		spinner.succeed("Build completed");
+		const outDir = options.outDir ?? "dist";
+		console.log();
+		console.log(`Output written to ${chalk.cyan(outDir)}/`);
+		console.log();
+		console.log("To preview the build locally:");
+		console.log(chalk.cyan("  pnpm vite preview"));
+		console.log();
+	} catch (error) {
+		spinner.fail("Build failed");
+		const execaError = error;
+		if (execaError.stderr) console.error(execaError.stderr);
+		process.exit(1);
 	}
+});
+//#endregion
+//#region src/utils/push-validation.ts
+/**
+* Cross-reference validation and change categorization utilities for the push command.
+*
+* Extracted into a standalone utility so that pure logic can be tested
+* without pulling in CLI dependencies (ora, chalk, prompts, etc.).
+*/
+/**
+* Extract the slug from a file path (e.g., "screens/home.json" -> "home").
+*/
+function slugFromPath(filePath) {
+	return basename(filePath, ".json");
 }
-async function createTempDirectory$1(projectDir) {
-	const projectTmpDir = path.join(projectDir, ".fluid", "tmp");
-	try {
-		await fs.ensureDir(projectTmpDir);
-		return await fs.mkdtemp(path.join(projectTmpDir, "widget-packages-"));
-	} catch (err) {
-		const message = err instanceof Error ? err.message : String(err);
-		throw new Error(`Unable to create project-local temporary directory at ${projectTmpDir}: ${message}`);
+/**
+* Extract the resource type directory from a file path (e.g., "screens/home.json" -> "screens").
+*/
+function resourceTypeFromPath(filePath) {
+	const dir = filePath.split("/")[0];
+	if (dir === "screens" || dir === "themes" || dir === "navigations" || dir === "profiles") return dir;
+	return null;
+}
+/**
+* Read and parse a JSON file from the portal directory.
+*/
+async function readPortalFile$1(portalDir, relativePath) {
+	const content = await readFile(join(portalDir, relativePath), "utf-8");
+	return JSON.parse(content);
+}
+/**
+* Categorize a snapshot diff into resource-type-specific change lists.
+*/
+function categorizeChanges(diff) {
+	const result = {
+		screens: {
+			new: [],
+			changed: [],
+			deleted: []
+		},
+		themes: {
+			new: [],
+			changed: [],
+			deleted: []
+		},
+		navigations: {
+			new: [],
+			changed: [],
+			deleted: []
+		},
+		profiles: {
+			new: [],
+			changed: [],
+			deleted: []
+		}
+	};
+	for (const file of diff.new) {
+		const type = resourceTypeFromPath(file);
+		if (type) result[type].new.push(file);
+	}
+	for (const file of diff.changed) {
+		const type = resourceTypeFromPath(file);
+		if (type) result[type].changed.push(file);
+	}
+	for (const file of diff.deleted) {
+		const type = resourceTypeFromPath(file);
+		if (type) result[type].deleted.push(file);
 	}
+	return result;
 }
-async function readSourcePackageExtractorOutput(outputFile) {
-	let output;
-	try {
-		output = await fs.readFile(outputFile, "utf-8");
-	} catch (err) {
-		return failure({
-			code: "CONFIG_LOAD_FAILED",
-			message: "Widget package extractor did not write an output file",
-			details: err instanceof Error ? err.message : String(err)
+/**
+* Validate that all cross-references between local portal files are valid.
+*
+* Checks:
+* - Navigation items' "screen" slugs reference existing screen files or mappings
+* - Profile "navigation" and "mobile_navigation" slugs reference existing nav files or mappings
+* - Profile "themes" slugs reference existing theme files or mappings
+*/
+async function validateCrossReferences(portalDir, mappings, changes) {
+	const errors = [];
+	const validScreenSlugs = buildValidSlugsSet(portalDir, "screens", mappings);
+	const validNavSlugs = buildValidSlugsSet(portalDir, "navigations", mappings);
+	const validThemeSlugs = buildValidSlugsSet(portalDir, "themes", mappings);
+	for (const file of changes.screens.deleted) validScreenSlugs.delete(slugFromPath(file));
+	for (const file of changes.navigations.deleted) validNavSlugs.delete(slugFromPath(file));
+	for (const file of changes.themes.deleted) validThemeSlugs.delete(slugFromPath(file));
+	const navFilesToCheck = [...changes.navigations.new, ...changes.navigations.changed];
+	for (const file of navFilesToCheck) try {
+		validateNavigationItems((await readPortalFile$1(portalDir, file)).navigation_items, file, validScreenSlugs, errors);
+	} catch {
+		errors.push({
+			file,
+			message: "Failed to read navigation file"
 		});
 	}
-	let parsed;
-	try {
-		parsed = JSON.parse(output);
+	const profileFilesToCheck = [...changes.profiles.new, ...changes.profiles.changed];
+	for (const file of profileFilesToCheck) try {
+		const profile = await readPortalFile$1(portalDir, file);
+		if (profile.navigation && !validNavSlugs.has(profile.navigation)) errors.push({
+			file,
+			message: `References navigation "${profile.navigation}" which does not exist`
+		});
+		if (profile.mobile_navigation && !validNavSlugs.has(profile.mobile_navigation)) errors.push({
+			file,
+			message: `References mobile_navigation "${profile.mobile_navigation}" which does not exist`
+		});
+		for (const themeSlug of profile.themes) if (!validThemeSlugs.has(themeSlug)) errors.push({
+			file,
+			message: `References theme "${themeSlug}" which does not exist`
+		});
 	} catch {
-		return failure({
-			code: "INVALID_FORMAT",
-			message: "Failed to parse widget package output file as JSON",
-			details: `Output was: ${output.slice(0, 200)}`
+		errors.push({
+			file,
+			message: "Failed to read profile file"
 		});
 	}
-	if (!isRecord$5(parsed) || parsed.sentinel !== SOURCE_PACKAGE_OUTPUT_SENTINEL) return failure({
-		code: "INVALID_FORMAT",
-		message: "Widget package extractor output file had an invalid sentinel"
-	});
-	if (!Array.isArray(parsed.data)) return failure({
-		code: "INVALID_FORMAT",
-		message: "Extracted widget package output is not an array",
-		details: `Expected an array, got: ${typeof parsed.data}`
-	});
-	return success(parsed.data);
+	return errors;
 }
-function createSourcePackageExtractorScript(options) {
-	return `
-import fs from "node:fs/promises";
-import path from "node:path";
-import { createServer, normalizePath } from "vite";
-
-const SOURCE_PACKAGE_MARKER = "__fluidSourceWidgetPackage";
-const OUTPUT_SENTINEL = ${JSON.stringify(SOURCE_PACKAGE_OUTPUT_SENTINEL)};
-const projectRoot = ${JSON.stringify(options.projectDir)};
-const widgetConfigPath = ${JSON.stringify(options.configPath)};
-const outputPath = process.argv[2];
-if (!outputPath) throw new Error("Missing widget package extractor output path.");
-
-function toViteModuleId(modulePath) {
-  const relativePath = path.relative(projectRoot, modulePath);
-  if (!relativePath.startsWith("..") && !path.isAbsolute(relativePath)) {
-    return "/" + normalizePath(relativePath);
-  }
-  return normalizePath(modulePath);
-}
-
-const server = await createServer({
-  root: projectRoot,
-  mode: "production",
-  server: { middlewareMode: true },
-  appType: "custom",
-  logLevel: "error",
-  clearScreen: false,
-  resolve: {
-    conditions: ["fluid-widget-authoring", "module", "browser", "development|production"],
-  },
-  ssr: {
-    noExternal: ["@fluid-app/portal-sdk"],
-    resolve: {
-      conditions: ["fluid-widget-authoring", "module", "node", "development|production"],
-    },
-  },
-});
-
-try {
-  const widgetConfig = await server.ssrLoadModule(toViteModuleId(widgetConfigPath));
-
-  function isSourceWidgetPackage(value) {
-    return Boolean(value && typeof value === "object" && value[SOURCE_PACKAGE_MARKER] === true);
-  }
-
-  function collectSourceWidgetPackages(mod) {
-    const candidates = [
-      mod.widgetPackage,
-      ...(Array.isArray(mod.widgetPackages) ? mod.widgetPackages : []),
-      mod.default,
-    ];
-    const byPackageId = new Map();
-    for (const candidate of candidates) {
-      if (!isSourceWidgetPackage(candidate)) continue;
-      if (!byPackageId.has(candidate.packageId)) byPackageId.set(candidate.packageId, candidate);
-    }
-    return Array.from(byPackageId.values());
-  }
-
-  function serializeWidget(widget) {
-    if (!widget || typeof widget !== "object" || Array.isArray(widget)) {
-      return widget;
-    }
-    const { component, ...metadata } = widget;
-    return metadata;
-  }
-
-  function serializePackage(sourcePackage) {
-    return {
-      manifestVersion: sourcePackage.manifestVersion,
-      scope: sourcePackage.scope,
-      packageStableId: sourcePackage.packageStableId,
-      packageId: sourcePackage.packageId,
-      packageType: sourcePackage.packageType,
-      version: sourcePackage.version,
-      cssUrls: sourcePackage.cssUrls,
-      widgets: Array.isArray(sourcePackage.widgets)
-        ? sourcePackage.widgets.map(serializeWidget)
-        : sourcePackage.widgets,
-    };
-  }
-
-  await fs.writeFile(
-    outputPath,
-    JSON.stringify({
-      sentinel: OUTPUT_SENTINEL,
-      data: collectSourceWidgetPackages(widgetConfig).map(serializePackage),
-    }),
-    "utf-8",
-  );
-} finally {
-  await server.close();
-}
-`;
-}
-function isRecord$5(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-//#endregion
-//#region src/utils/extract-manifests.ts
-/**
-* Manifest extraction utility
-*
-* Extracts serializable widget manifest metadata from portal.config.ts
-* by writing a minimal wrapper script that imports customWidgets plus
-* source widget package exports and serializes the result to a temp output
-* file, then running it with tsx.
-*
-* Strips the `component` field (not serializable) from each manifest.
-*
-* Writes a temp script, runs it with tsx, and parses JSON output from the
-* output file. The wrapper loads config modules through Vite SSR so project
-* aliases and Vite-compatible module resolution are honored.
-*/
-const EXTRACT_FILENAME = "extract-manifests.ts";
-const EXTRACT_OUTPUT_FILENAME = "manifests.json";
-const EXTRACT_OUTPUT_SENTINEL = "fluid-widget-manifests:v1";
-const TSX_CLI_PATH = createRequire(import.meta.url).resolve("tsx/cli");
-/**
-* Extract serializable widget manifests from a project's portal.config.ts.
-*
-* Writes a temp wrapper script, runs it with tsx, and parses the temp JSON
-* output file. The temp files are always cleaned up.
-*
-* Returns an empty array if no customWidgets or source package exports exist.
-*
-* Supported static export shapes are intentionally simple so the CLI can avoid
-* executing unrelated portal configs: named `export const|let|var customWidgets`,
-* `widgetPackage`, or `widgetPackages`; direct `export default
-* defineWidgetPackage(...)`; or `export default <identifier>` where that
-* identifier is initialized with `defineWidgetPackage(...)` in the same file.
-* Re-export-only and computed export shapes are not detected by this layer.
-*
-* @param projectDir - The project root directory containing src/portal.config.ts
-*/
-async function extractManifests(projectDir) {
-	let tempDir;
-	try {
-		const config = await resolvePortalWidgetSourceConfig(projectDir);
-		if (!config) return success([]);
-		const configExports = readStaticWidgetExports(await fs.readFile(config.path, "utf-8"));
-		const legacyPortalConfigPath = path$1.join(projectDir, "src", "portal.config.ts");
-		const legacyCustomWidgetsConfigPath = (path$1.resolve(config.path) !== path$1.resolve(legacyPortalConfigPath) && await fs.pathExists(legacyPortalConfigPath) ? readStaticWidgetExports(await fs.readFile(legacyPortalConfigPath, "utf-8")) : void 0)?.hasCustomWidgets ? legacyPortalConfigPath : void 0;
-		if (!configExports.hasCustomWidgets && !configExports.hasSourceWidgetPackages && !legacyCustomWidgetsConfigPath) return success([]);
-		tempDir = await createTempDirectory(projectDir);
-		const extractFile = path$1.join(tempDir, EXTRACT_FILENAME);
-		const outputFile = path$1.join(tempDir, EXTRACT_OUTPUT_FILENAME);
-		const wrapperScript = createManifestExtractorScript({
-			projectDir,
-			widgetConfigPath: config.path,
-			legacyCustomWidgetsConfigPath
-		});
-		await fs.writeFile(extractFile, wrapperScript, {
-			encoding: "utf-8",
-			flag: "wx"
-		});
-		await execa(process.execPath, [
-			TSX_CLI_PATH,
-			extractFile,
-			outputFile
-		], {
-			cwd: projectDir,
-			stdio: "pipe",
-			env: {
-				...process.env,
-				NODE_ENV: "production",
-				NODE_OPTIONS: withFluidWidgetAuthoringNodeCondition(process.env.NODE_OPTIONS)
-			}
-		});
-		const outputResult = await readManifestExtractorOutput(outputFile);
-		if (!outputResult.success) return outputResult;
-		const parsed = outputResult.value;
-		if (parsed.length === 0) return success([]);
-		return success(parsed.filter((m) => typeof m === "object" && m !== null && typeof m.type === "string" && typeof m.displayName === "string"));
-	} catch (err) {
-		const error = err;
-		return failure({
-			code: "EXTRACTION_FAILED",
-			message: "Failed to extract widget manifests from portal widget source config",
-			details: error.stderr ?? error.message ?? String(err)
-		});
-	} finally {
-		if (tempDir) await fs.remove(tempDir).catch(() => {});
-	}
-}
-function readStaticWidgetExports(source) {
-	const strippedSource = source.replace(/\/\/[^\n]*/g, "").replace(/\/\*[\s\S]*?\*\//g, "");
-	const defaultExportMatch = /export\s+default\s+([A-Za-z_$][\w$]*)\b/.exec(strippedSource);
-	const widgetPackageDefinitionNames = new Set(Array.from(strippedSource.matchAll(/\b(?:const|let|var)\s+([A-Za-z_$][\w$]*)(?:\s*:[^=]+)?\s*=\s*defineWidgetPackage\s*\(/g), (match) => match[1]));
-	const hasDefaultWidgetPackageExport = /export\s+default\s+defineWidgetPackage\s*\(/.test(strippedSource) || defaultExportMatch !== null && widgetPackageDefinitionNames.has(defaultExportMatch[1]);
-	return {
-		hasCustomWidgets: /export\s+(?:const|let|var)\s+customWidgets\b/.test(strippedSource),
-		hasSourceWidgetPackages: /export\s+(?:const|let|var)\s+widgetPackage\b/.test(strippedSource) || /export\s+(?:const|let|var)\s+widgetPackages\b/.test(strippedSource) || hasDefaultWidgetPackageExport
-	};
-}
-async function createTempDirectory(projectDir) {
-	const projectTmpDir = path$1.join(projectDir, ".fluid", "tmp");
-	try {
-		await fs.ensureDir(projectTmpDir);
-		return await fs.mkdtemp(path$1.join(projectTmpDir, "manifests-"));
-	} catch (err) {
-		const message = err instanceof Error ? err.message : String(err);
-		throw new Error(`Unable to create project-local temporary directory at ${projectTmpDir}: ${message}`);
-	}
-}
-async function readManifestExtractorOutput(outputFile) {
-	let output;
-	try {
-		output = await fs.readFile(outputFile, "utf-8");
-	} catch (err) {
-		return failure({
-			code: "EXTRACTION_FAILED",
-			message: "Manifest extractor did not write an output file",
-			details: err instanceof Error ? err.message : String(err)
-		});
-	}
-	let parsed;
-	try {
-		parsed = JSON.parse(output);
-	} catch {
-		return failure({
-			code: "INVALID_FORMAT",
-			message: "Failed to parse manifest output file as JSON",
-			details: `Output was: ${output.slice(0, 200)}`
-		});
-	}
-	if (!isRecord$4(parsed) || parsed.sentinel !== EXTRACT_OUTPUT_SENTINEL) return failure({
-		code: "INVALID_FORMAT",
-		message: "Manifest extractor output file had an invalid sentinel"
-	});
-	if (!Array.isArray(parsed.data)) return failure({
-		code: "INVALID_FORMAT",
-		message: "extracted widget manifests output is not an array",
-		details: `Expected an array, got: ${typeof parsed.data}`
-	});
-	return success(parsed.data);
-}
-function isRecord$4(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function createManifestExtractorScript(options) {
-	return `
-import fs from "node:fs/promises";
-import path from "node:path";
-import { createServer, normalizePath } from "vite";
-import {
-  isSourceWidgetPackage,
-  sourceWidgetPackagesToManifests,
-} from "@fluid-app/portal-sdk";
-
-const OUTPUT_SENTINEL = ${JSON.stringify(EXTRACT_OUTPUT_SENTINEL)};
-const projectRoot = ${JSON.stringify(options.projectDir)};
-const widgetConfigPath = ${JSON.stringify(options.widgetConfigPath)};
-const legacyCustomWidgetsConfigPath = ${JSON.stringify(options.legacyCustomWidgetsConfigPath)};
-const outputPath = process.argv[2];
-if (!outputPath) throw new Error("Missing manifest extractor output path.");
-
-function toViteModuleId(modulePath) {
-  const relativePath = path.relative(projectRoot, modulePath);
-  if (!relativePath.startsWith("..") && !path.isAbsolute(relativePath)) {
-    return "/" + normalizePath(relativePath);
-  }
-  return normalizePath(modulePath);
-}
-
-const server = await createServer({
-  root: projectRoot,
-  mode: "production",
-  server: { middlewareMode: true },
-  appType: "custom",
-  logLevel: "error",
-  clearScreen: false,
-  resolve: {
-    conditions: ["fluid-widget-authoring", "module", "browser", "development|production"],
-  },
-  ssr: {
-    noExternal: ["@fluid-app/portal-sdk"],
-    resolve: {
-      conditions: ["fluid-widget-authoring", "module", "node", "development|production"],
-    },
-  },
-});
-
-try {
-  const portalConfig = await server.ssrLoadModule(toViteModuleId(widgetConfigPath));
-  const legacyPortalConfig = legacyCustomWidgetsConfigPath
-    ? await server.ssrLoadModule(toViteModuleId(legacyCustomWidgetsConfigPath))
-    : {};
-
-  const sourcePackages = [];
-  const seenSourcePackageIds = new Set();
-  for (const candidate of [
-    portalConfig.widgetPackage,
-    ...(Array.isArray(portalConfig.widgetPackages) ? portalConfig.widgetPackages : []),
-    portalConfig.default,
-  ]) {
-    if (!isSourceWidgetPackage(candidate)) continue;
-    if (seenSourcePackageIds.has(candidate.packageId)) continue;
-    seenSourcePackageIds.add(candidate.packageId);
-    sourcePackages.push(candidate);
-  }
-  const manifests = [
-    ...(Array.isArray(portalConfig.customWidgets) ? portalConfig.customWidgets : []),
-    ...(Array.isArray(legacyPortalConfig.customWidgets) ? legacyPortalConfig.customWidgets : []),
-    ...sourceWidgetPackagesToManifests(sourcePackages),
-  ];
-  const serializable = manifests.map(({ component, ...rest }) => rest);
-  await fs.writeFile(
-    outputPath,
-    JSON.stringify({ sentinel: OUTPUT_SENTINEL, data: serializable }),
-    "utf-8",
-  );
-} finally {
-  await server.close();
-}
-`;
-}
-//#endregion
-//#region src/commands/build.ts
-const buildCommand = new Command("build").description("Build the application for production").option("-o, --out-dir <dir>", "Output directory", "dist").action(async (options) => {
-	const cwd = process.cwd();
-	if (!existsSync(join(cwd, "package.json"))) {
-		console.error(chalk.red("Error: No package.json found in current directory"));
-		console.error(chalk.yellow("Make sure you're in a Fluid project directory"));
-		process.exit(1);
-	}
-	if (!existsSync(join(cwd, "vite.config.ts"))) {
-		console.error(chalk.red("Error: No vite.config.ts found"));
-		console.error(chalk.yellow("This command must be run from a Fluid project directory"));
-		process.exit(1);
-	}
-	console.log();
-	console.log(chalk.bold("Building for production..."));
-	console.log();
-	const spinner = ora("Building...").start();
-	try {
-		await execa("pnpm", ["run", "build"], {
-			cwd,
-			stdio: "pipe"
-		});
-		spinner.succeed("Build completed");
-		const manifestSpinner = ora("Extracting widget manifests...").start();
-		const outDir = options.outDir ?? "dist";
-		const manifestResult = await extractManifests(cwd);
-		const manifestPath = [join(cwd, outDir, "__manifests__.json"), join(cwd, outDir, "public", "__manifests__.json")].find((p) => existsSync(p));
-		if (manifestResult.success) if (manifestResult.value.length === 0) manifestSpinner.info("No custom widgets found");
-		else if (!manifestPath) manifestSpinner.warn(`__manifests__.json not found in build output — skipping manifest write`);
-		else {
-			writeFileSync(manifestPath, JSON.stringify(manifestResult.value));
-			manifestSpinner.succeed(`Extracted ${manifestResult.value.length} widget manifest(s)`);
-		}
-		else manifestSpinner.warn(`Manifest extraction failed: ${manifestResult.error.message}`);
-		console.log();
-		console.log(`Output written to ${chalk.cyan(outDir)}/`);
-		console.log();
-		console.log("To preview the build locally:");
-		console.log(chalk.cyan("  pnpm vite preview"));
-		console.log();
-	} catch (error) {
-		spinner.fail("Build failed");
-		const execaError = error;
-		if (execaError.stderr) console.error(execaError.stderr);
-		process.exit(1);
-	}
-});
-//#endregion
-//#region src/utils/push-validation.ts
-/**
-* Cross-reference validation and change categorization utilities for the push command.
-*
-* Extracted into a standalone utility so that pure logic can be tested
-* without pulling in CLI dependencies (ora, chalk, prompts, etc.).
-*/
-/**
-* Extract the slug from a file path (e.g., "screens/home.json" -> "home").
-*/
-function slugFromPath(filePath) {
-	return basename(filePath, ".json");
-}
-/**
-* Extract the resource type directory from a file path (e.g., "screens/home.json" -> "screens").
-*/
-function resourceTypeFromPath(filePath) {
-	const dir = filePath.split("/")[0];
-	if (dir === "screens" || dir === "themes" || dir === "navigations" || dir === "profiles") return dir;
-	return null;
-}
-/**
-* Read and parse a JSON file from the portal directory.
-*/
-async function readPortalFile$1(portalDir, relativePath) {
-	const content = await readFile(join(portalDir, relativePath), "utf-8");
-	return JSON.parse(content);
-}
-/**
-* Categorize a snapshot diff into resource-type-specific change lists.
-*/
-function categorizeChanges(diff) {
-	const result = {
-		screens: {
-			new: [],
-			changed: [],
-			deleted: []
-		},
-		themes: {
-			new: [],
-			changed: [],
-			deleted: []
-		},
-		navigations: {
-			new: [],
-			changed: [],
-			deleted: []
-		},
-		profiles: {
-			new: [],
-			changed: [],
-			deleted: []
-		}
-	};
-	for (const file of diff.new) {
-		const type = resourceTypeFromPath(file);
-		if (type) result[type].new.push(file);
-	}
-	for (const file of diff.changed) {
-		const type = resourceTypeFromPath(file);
-		if (type) result[type].changed.push(file);
-	}
-	for (const file of diff.deleted) {
-		const type = resourceTypeFromPath(file);
-		if (type) result[type].deleted.push(file);
-	}
-	return result;
-}
-/**
-* Validate that all cross-references between local portal files are valid.
-*
-* Checks:
-* - Navigation items' "screen" slugs reference existing screen files or mappings
-* - Profile "navigation" and "mobile_navigation" slugs reference existing nav files or mappings
-* - Profile "themes" slugs reference existing theme files or mappings
-*/
-async function validateCrossReferences(portalDir, mappings, changes) {
-	const errors = [];
-	const validScreenSlugs = buildValidSlugsSet(portalDir, "screens", mappings);
-	const validNavSlugs = buildValidSlugsSet(portalDir, "navigations", mappings);
-	const validThemeSlugs = buildValidSlugsSet(portalDir, "themes", mappings);
-	for (const file of changes.screens.deleted) validScreenSlugs.delete(slugFromPath(file));
-	for (const file of changes.navigations.deleted) validNavSlugs.delete(slugFromPath(file));
-	for (const file of changes.themes.deleted) validThemeSlugs.delete(slugFromPath(file));
-	const navFilesToCheck = [...changes.navigations.new, ...changes.navigations.changed];
-	for (const file of navFilesToCheck) try {
-		validateNavigationItems((await readPortalFile$1(portalDir, file)).navigation_items, file, validScreenSlugs, errors);
-	} catch {
-		errors.push({
-			file,
-			message: "Failed to read navigation file"
-		});
-	}
-	const profileFilesToCheck = [...changes.profiles.new, ...changes.profiles.changed];
-	for (const file of profileFilesToCheck) try {
-		const profile = await readPortalFile$1(portalDir, file);
-		if (profile.navigation && !validNavSlugs.has(profile.navigation)) errors.push({
-			file,
-			message: `References navigation "${profile.navigation}" which does not exist`
-		});
-		if (profile.mobile_navigation && !validNavSlugs.has(profile.mobile_navigation)) errors.push({
-			file,
-			message: `References mobile_navigation "${profile.mobile_navigation}" which does not exist`
-		});
-		for (const themeSlug of profile.themes) if (!validThemeSlugs.has(themeSlug)) errors.push({
-			file,
-			message: `References theme "${themeSlug}" which does not exist`
-		});
-	} catch {
-		errors.push({
-			file,
-			message: "Failed to read profile file"
-		});
-	}
-	return errors;
-}
-/**
-* Build a set of valid slugs for a resource type by combining
-* existing mapping slugs with local file slugs on disk.
-*/
-function buildValidSlugsSet(portalDir, resourceType, mappings) {
-	const slugs = /* @__PURE__ */ new Set();
-	for (const slug of Object.keys(mappings[resourceType])) slugs.add(slug);
-	const dir = join(portalDir, resourceType);
-	if (existsSync(dir)) try {
-		const entries = readdirSync(dir);
-		for (const entry of entries) if (entry.endsWith(".json")) slugs.add(basename(entry, ".json"));
-	} catch {}
-	return slugs;
+/**
+* Build a set of valid slugs for a resource type by combining
+* existing mapping slugs with local file slugs on disk.
+*/
+function buildValidSlugsSet(portalDir, resourceType, mappings) {
+	const slugs = /* @__PURE__ */ new Set();
+	for (const slug of Object.keys(mappings[resourceType])) slugs.add(slug);
+	const dir = join(portalDir, resourceType);
+	if (existsSync(dir)) try {
+		const entries = readdirSync(dir);
+		for (const entry of entries) if (entry.endsWith(".json")) slugs.add(basename(entry, ".json"));
+	} catch {}
+	return slugs;
 }
 /**
 * Recursively validate navigation item screen references.
@@ -1949,7 +1518,7 @@ async function runPortalGitSync(options) {
 				await gitFetch(cwd, remoteUrl, branch);
 				await gitAdoptFetchHead(cwd);
 			}
-			if (await hasUncommittedChanges(cwd)) await gitAutoCommit(cwd, commitMessage);
+			if (await hasUncommittedChanges(cwd)) await gitAutoCommit(cwd, commitMessage, { ignoreRemovals: true });
 			return await pushCommitted(cwd, remoteUrl, branch);
 		}
 		await gitFetch(cwd, remoteUrl, branch);
@@ -2094,7 +1663,7 @@ async function pushScreens(client, defId, portalDir, changes, mappings) {
 		const slug = slugFromPath(file);
 		try {
 			const local = await readPortalFile(portalDir, file);
-			const newId = (await fluid_os_v0_create_fluid_osscreen(client, defId, { screen: {
+			const newId = (await fluidOs.fluid_os_v0_create_fluid_osscreen(client, defId, { screen: {
 				name: local.name,
 				slug,
 				component_tree: toApiComponentTree(local.component_tree)
@@ -2135,7 +1704,7 @@ async function pushScreens(client, defId, portalDir, changes, mappings) {
 		}
 		try {
 			const local = await readPortalFile(portalDir, file);
-			await fluid_os_v0_update_fluid_osscreen(client, defId, screenId, { screen: {
+			await fluidOs.fluid_os_v0_update_fluid_osscreen(client, defId, screenId, { screen: {
 				name: local.name,
 				slug,
 				component_tree: toApiComponentTree(local.component_tree)
@@ -2174,7 +1743,7 @@ async function pushScreens(client, defId, portalDir, changes, mappings) {
 			};
 		}
 		try {
-			await fluid_os_v0_delete_fluid_osscreen(client, defId, screenId);
+			await fluidOs.fluid_os_v0_delete_fluid_osscreen(client, defId, screenId);
 			currentMappings = removeMapping(currentMappings, "screens", slug);
 			results.push({
 				file,
@@ -2209,7 +1778,7 @@ async function pushThemes(client, defId, portalDir, changes, mappings) {
 		const slug = slugFromPath(file);
 		try {
 			const local = await readPortalFile(portalDir, file);
-			const newId = (await fluid_os_v0_create_fluid_ostheme(client, defId, { theme: {
+			const newId = (await fluidOs.fluid_os_v0_create_fluid_ostheme(client, defId, { theme: {
 				name: local.name,
 				active: local.active,
 				config: local.config
@@ -2250,7 +1819,7 @@ async function pushThemes(client, defId, portalDir, changes, mappings) {
 		}
 		try {
 			const local = await readPortalFile(portalDir, file);
-			await fluid_os_v0_update_fluid_ostheme(client, defId, themeId, { theme: {
+			await fluidOs.fluid_os_v0_update_fluid_ostheme(client, defId, themeId, { theme: {
 				name: local.name,
 				active: local.active,
 				config: local.config
@@ -2289,7 +1858,7 @@ async function pushThemes(client, defId, portalDir, changes, mappings) {
 			};
 		}
 		try {
-			await fluid_os_v0_delete_fluid_ostheme(client, defId, themeId);
+			await fluidOs.fluid_os_v0_delete_fluid_ostheme(client, defId, themeId);
 			currentMappings = removeMapping(currentMappings, "themes", slug);
 			results.push({
 				file,
@@ -2359,7 +1928,7 @@ async function pushNavigations(client, defId, portalDir, changes, mappings) {
 		const slug = slugFromPath(file);
 		try {
 			const local = await readPortalFile(portalDir, file);
-			const newId = (await fluid_os_v0_create_fluid_osnavigation(client, defId, { navigation: {
+			const newId = (await fluidOs.fluid_os_v0_create_fluid_osnavigation(client, defId, { navigation: {
 				name: local.name,
 				platform: local.platform
 			} })).navigation?.id;
@@ -2369,7 +1938,7 @@ async function pushNavigations(client, defId, portalDir, changes, mappings) {
 				const localToServerId = /* @__PURE__ */ new Map();
 				for (const item of resolvedItems) {
 					const resolvedParentId = item.parent_id != null ? localToServerId.get(item.parent_id) ?? item.parent_id : void 0;
-					const created = await fluid_os_v0_create_fluid_osnavigation_item(client, defId, newId, { navigation_item: {
+					const created = await fluidOs.fluid_os_v0_create_fluid_osnavigation_item(client, defId, newId, { navigation_item: {
 						label: item.label ?? "",
 						position: item.position ?? 0,
 						icon: item.icon ?? void 0,
@@ -2416,15 +1985,15 @@ async function pushNavigations(client, defId, portalDir, changes, mappings) {
 		}
 		try {
 			const local = await readPortalFile(portalDir, file);
-			await fluid_os_v0_update_fluid_osnavigation(client, defId, navId, { navigation: {
+			await fluidOs.fluid_os_v0_update_fluid_osnavigation(client, defId, navId, { navigation: {
 				name: local.name,
 				platform: local.platform
 			} });
 			const resolvedItems = flattenNavigationItems(resolveNavigationItemScreenIds(local.navigation_items, currentMappings));
-			const serverItems = (await fluid_os_v0_list_fluid_osnavigation_items(client, defId, navId)).navigation_items ?? [];
+			const serverItems = (await fluidOs.fluid_os_v0_list_fluid_osnavigation_items(client, defId, navId)).navigation_items ?? [];
 			const serverById = new Map(serverItems.map((s) => [s.id, s]));
 			const localIds = new Set(resolvedItems.filter((i) => i.id).map((i) => i.id));
-			for (const serverItem of serverItems) if (!localIds.has(serverItem.id)) await fluid_os_v0_delete_fluid_osnavigation_item(client, defId, navId, serverItem.id);
+			for (const serverItem of serverItems) if (!localIds.has(serverItem.id)) await fluidOs.fluid_os_v0_delete_fluid_osnavigation_item(client, defId, navId, serverItem.id);
 			const localToServerId = /* @__PURE__ */ new Map();
 			for (const item of resolvedItems) {
 				const resolvedParentId = item.parent_id != null ? localToServerId.get(item.parent_id) ?? item.parent_id : void 0;
@@ -2437,9 +2006,9 @@ async function pushNavigations(client, defId, portalDir, changes, mappings) {
 					source: item.source ?? void 0,
 					parent_id: resolvedParentId
 				};
-				if (item.id && serverById.has(item.id)) await fluid_os_v0_update_fluid_osnavigation_item(client, defId, navId, item.id, { navigation_item: body });
+				if (item.id && serverById.has(item.id)) await fluidOs.fluid_os_v0_update_fluid_osnavigation_item(client, defId, navId, item.id, { navigation_item: body });
 				else {
-					const created = await fluid_os_v0_create_fluid_osnavigation_item(client, defId, navId, { navigation_item: {
+					const created = await fluidOs.fluid_os_v0_create_fluid_osnavigation_item(client, defId, navId, { navigation_item: {
 						...body,
 						label: body.label ?? "",
 						position: body.position ?? 0
@@ -2481,7 +2050,7 @@ async function pushNavigations(client, defId, portalDir, changes, mappings) {
 			};
 		}
 		try {
-			await fluid_os_v0_delete_fluid_osnavigation(client, defId, navId);
+			await fluidOs.fluid_os_v0_delete_fluid_osnavigation(client, defId, navId);
 			currentMappings = removeMapping(currentMappings, "navigations", slug);
 			results.push({
 				file,
@@ -2515,7 +2084,8 @@ async function pushProfiles(client, defId, portalDir, changes, mappings) {
 	for (const file of changes.new) {
 		const slug = slugFromPath(file);
 		try {
-			const newId = (await fluid_os_v0_create_fluid_osprofile(client, defId, { profile: resolveProfileBody(await readPortalFile(portalDir, file), currentMappings) })).profile?.id;
+			const body = resolveProfileBody(await readPortalFile(portalDir, file), currentMappings);
+			const newId = (await fluidOs.fluid_os_v0_create_fluid_osprofile(client, defId, { profile: body })).profile?.id;
 			if (newId != null) currentMappings = updateMapping(currentMappings, "profiles", slug, newId);
 			results.push({
 				file,
@@ -2551,7 +2121,8 @@ async function pushProfiles(client, defId, portalDir, changes, mappings) {
 			};
 		}
 		try {
-			await fluid_os_v0_update_fluid_osprofile(client, defId, profileId, { profile: resolveProfileBody(await readPortalFile(portalDir, file), currentMappings) });
+			const body = resolveProfileBody(await readPortalFile(portalDir, file), currentMappings);
+			await fluidOs.fluid_os_v0_update_fluid_osprofile(client, defId, profileId, { profile: body });
 			results.push({
 				file,
 				action: "updated",
@@ -2586,7 +2157,7 @@ async function pushProfiles(client, defId, portalDir, changes, mappings) {
 			};
 		}
 		try {
-			await fluid_os_v0_delete_fluid_osprofile(client, defId, profileId);
+			await fluidOs.fluid_os_v0_delete_fluid_osprofile(client, defId, profileId);
 			currentMappings = removeMapping(currentMappings, "profiles", slug);
 			results.push({
 				file,
@@ -2843,7 +2414,7 @@ async function selectDefinition(client, appName) {
 	const definitions = [];
 	let page = 1;
 	while (true) {
-		const response = await fluid_os_v0_list_fluid_osdefinitions(client, {
+		const response = await fluidOs.fluid_os_v0_list_fluid_osdefinitions(client, {
 			page,
 			per_page: 500
 		});
@@ -2988,138 +2559,340 @@ function insertImport(source, importLine) {
 	if (lineEnd === -1) return source + "\n" + importLine + "\n";
 	return source.slice(0, lineEnd + 1) + importLine + "\n" + source.slice(lineEnd + 1);
 }
-/**
-* Insert a manifest reference into the customWidgets array.
-* Preserves developer comments. Skips if already present.
-* Returns null if the array pattern isn't found.
-*
-* Searches for the LAST `export const customWidgets` declaration to skip
-* matches inside JSDoc @example blocks.
-*/
-function insertIntoCustomWidgets(source, camelName) {
-	const pattern = /(export const customWidgets(?::[\s\S]*?)?\s*=\s*)\[([^\]]*)\]/g;
+/** Insert a widget definition into a defineWidgetPackage widgets array. */
+function insertIntoWidgetPackage(source, exportName) {
+	const packageStart = source.lastIndexOf("defineWidgetPackage(");
+	if (packageStart === -1) return null;
+	const packageSource = source.slice(packageStart);
+	const pattern = /(widgets\s*:\s*)\[([^\]]*)\]/g;
 	let lastMatch = null;
 	let m;
-	while ((m = pattern.exec(source)) !== null) lastMatch = m;
+	while ((m = pattern.exec(packageSource)) !== null) lastMatch = m;
 	if (!lastMatch) return null;
 	const fullMatch = lastMatch[0];
 	const declaration = lastMatch[1];
 	const inner = lastMatch[2];
-	const matchStart = lastMatch.index;
+	const matchStart = packageStart + lastMatch.index;
 	const lines = inner.split("\n");
 	const existingEntries = [];
 	for (const line of lines) {
 		const trimmed = line.trim();
 		if (trimmed && !trimmed.startsWith("//")) existingEntries.push(trimmed.replace(/,$/, ""));
 	}
-	if (existingEntries.includes(camelName)) return source;
-	const commentLines = lines.filter((line) => line.trim().startsWith("//")).map((line) => line.trimEnd());
-	const replacement = `${declaration}[${commentLines.length > 0 ? "\n" + commentLines.join("\n") : ""}\n${[...existingEntries, camelName].map((e) => `  ${e},`).join("\n")}\n]`;
-	return source.slice(0, matchStart) + replacement + source.slice(matchStart + fullMatch.length);
+	if (existingEntries.includes(exportName)) return source;
+	const commentLines = lines.filter((line) => line.trim().startsWith("//")).map((line) => line.trimEnd());
+	const replacement = `${declaration}[${commentLines.length > 0 ? "\n" + commentLines.join("\n") : ""}\n${[...existingEntries, exportName].map((e) => `  ${e},`).join("\n")}\n]`;
+	return source.slice(0, matchStart) + replacement + source.slice(matchStart + fullMatch.length);
+}
+//#endregion
+//#region src/commands/widget-create.ts
+const WIDGET_CONFIG_PATH$1 = path.join("src", "widgets.config.ts");
+const createSubcommand = new Command("create").description("Scaffold a new Remote DOM widget").argument("<name>", "Widget name in kebab-case (e.g., stock-ticker)").option("-c, --category <category>", "Widget category for palette grouping", "components").action(async (name, options) => {
+	const cwd = process.cwd();
+	const packageJsonPath = path.join(cwd, "package.json");
+	const configPath = path.join(cwd, WIDGET_CONFIG_PATH$1);
+	const widgetDir = path.join(cwd, "src", "widgets", name);
+	const validationError = validateWidgetName(name);
+	if (validationError) {
+		console.error(chalk.red(`Error: ${validationError}`));
+		process.exit(1);
+	}
+	if (!await fs.pathExists(packageJsonPath)) {
+		console.error(chalk.red("Error: No package.json found."));
+		console.error(chalk.yellow("Run this command from a Fluid portal project root."));
+		process.exit(1);
+	}
+	if (await fs.pathExists(widgetDir)) {
+		console.error(chalk.red(`Error: Widget directory already exists: src/widgets/${name}`));
+		process.exit(1);
+	}
+	const widgetType = toWidgetType(name);
+	const componentName = toComponentName(widgetType);
+	const camelName = toCamelCase(name);
+	const exportName = camelName.endsWith("Widget") ? camelName : `${camelName}Widget`;
+	const displayName = toDisplayName(name);
+	const category = options.category ?? "components";
+	const importLine = `import { ${exportName} } from "./widgets/${name}";`;
+	try {
+		await fs.ensureDir(widgetDir);
+		await fs.writeFile(path.join(widgetDir, "index.tsx"), createWidgetSource({
+			name,
+			widgetType,
+			componentName,
+			exportName,
+			displayName,
+			category
+		}), "utf-8");
+		if (await fs.pathExists(configPath)) {
+			const configSource = await fs.readFile(configPath, "utf-8");
+			if (isEmptyWidgetConfig(configSource)) await fs.writeFile(configPath, createWidgetConfigSource(importLine, exportName), "utf-8");
+			else {
+				const withImport = insertImport(configSource, importLine);
+				const updated = withImport ? insertIntoWidgetPackage(withImport, exportName) : null;
+				if (!updated) throw new Error(`${WIDGET_CONFIG_PATH$1} must export the starter widgetPackages placeholder or contain a defineWidgetPackage({ widgets: [...] }) declaration.`);
+				await fs.writeFile(configPath, updated, "utf-8");
+			}
+		} else await fs.writeFile(configPath, createWidgetConfigSource(importLine, exportName), "utf-8");
+	} catch (error) {
+		await fs.remove(widgetDir).catch(() => {});
+		console.error(chalk.red("Error: Failed to scaffold Remote DOM widget."));
+		console.error(error);
+		process.exit(1);
+	}
+	console.log();
+	console.log(chalk.green("Created widget:") + ` src/widgets/${name}/index.tsx`);
+	console.log(chalk.green("Registered") + ` in ${chalk.cyan(WIDGET_CONFIG_PATH$1)}`);
+	console.log();
+	console.log(chalk.yellow("Next steps:"));
+	console.log(`  1. Edit ${chalk.cyan(`src/widgets/${name}/index.tsx`)}`);
+	console.log(`  2. Run ${chalk.cyan("fluid portal deploy --dry-run")} to verify the package`);
+});
+function createWidgetSource(options) {
+	return `import { defineWidget } from "@fluid-app/portal-sdk/widgets/worker";
+
+interface ${options.widgetType}Props {
+  readonly title?: string;
+}
+
+function ${options.componentName}({ title = ${JSON.stringify(options.displayName)} }: ${options.widgetType}Props) {
+  return (
+    <section>
+      <h3>{title}</h3>
+      <p>Edit this widget in src/widgets/${options.name}/index.tsx</p>
+    </section>
+  );
+}
+
+export const ${options.exportName} = defineWidget({
+  name: ${JSON.stringify(options.componentName)},
+  component: ${options.componentName},
+  displayName: ${JSON.stringify(options.displayName)},
+  description: ${JSON.stringify(`A custom ${options.displayName.toLowerCase()} widget`)},
+  icon: "puzzle-piece",
+  category: ${JSON.stringify(options.category)},
+  propertySchema: {
+    fields: [{ key: "title", label: "Title", type: "text" }],
+  },
+  defaultProps: {
+    title: ${JSON.stringify(options.displayName)},
+  },
+});
+`;
+}
+function isEmptyWidgetConfig(source) {
+	return /export\s+const\s+widgetPackages\s*=\s*\[\]\s+as\s+const\s*;/u.test(source);
+}
+function createWidgetConfigSource(importLine, exportName) {
+	return `import { defineWidgetPackage } from "@fluid-app/portal-sdk/widgets/worker";
+${importLine}
+
+export const widgetPackage = defineWidgetPackage({
+  scope: "company",
+  packageStableId: "portal-widgets",
+  version: "0.0.0-dev",
+  widgets: [${exportName}],
+});
+`;
+}
+const widgetCommand = new Command("widget").description("Manage Remote DOM portal widgets").addCommand(createSubcommand);
+//#endregion
+//#region src/utils/widget-package-config.ts
+const WIDGET_CONFIG_PATH = "src/widgets.config.ts";
+const SOURCE_PACKAGE_EXTRACT_FILENAME = "extract-widget-packages.ts";
+const SOURCE_PACKAGE_OUTPUT_FILENAME = "source-widget-packages.json";
+const SOURCE_PACKAGE_OUTPUT_SENTINEL = "fluid-widget-source-packages:v1";
+const TSX_CLI_PATH = createRequire(import.meta.url).resolve("tsx/cli");
+async function resolvePortalWidgetSourceConfig(projectDir) {
+	const candidate = path.join(projectDir, WIDGET_CONFIG_PATH);
+	return await fs.pathExists(candidate) ? {
+		path: candidate,
+		relativePath: WIDGET_CONFIG_PATH
+	} : void 0;
+}
+async function loadSourceWidgetPackages(projectDir) {
+	const config = await resolvePortalWidgetSourceConfig(projectDir);
+	if (!config) return success([]);
+	let tempDir;
+	try {
+		tempDir = await createTempDirectory(projectDir);
+		const extractFile = path.join(tempDir, SOURCE_PACKAGE_EXTRACT_FILENAME);
+		const outputFile = path.join(tempDir, SOURCE_PACKAGE_OUTPUT_FILENAME);
+		await fs.writeFile(extractFile, createSourcePackageExtractorScript({
+			projectDir,
+			configPath: config.path
+		}), {
+			encoding: "utf-8",
+			flag: "wx"
+		});
+		await execa(process.execPath, [
+			TSX_CLI_PATH,
+			extractFile,
+			outputFile
+		], {
+			cwd: projectDir,
+			stdio: "pipe",
+			env: {
+				...process.env,
+				NODE_ENV: "production"
+			}
+		});
+		const outputResult = await readSourcePackageExtractorOutput(outputFile);
+		if (!outputResult.success) return outputResult;
+		const parsed = outputResult.value;
+		if (parsed.length === 0) return success([]);
+		return success(parsed);
+	} catch (err) {
+		const error = err;
+		return failure({
+			code: "CONFIG_LOAD_FAILED",
+			message: `Failed to load widget packages from ${config.relativePath}`,
+			details: error.stderr ?? error.message ?? String(err)
+		});
+	} finally {
+		if (tempDir) await fs.remove(tempDir).catch(() => {});
+	}
 }
-//#endregion
-//#region src/commands/widget-create.ts
-const createSubcommand = new Command("create").description("Scaffold a new custom widget").argument("<name>", "Widget name in kebab-case (e.g., stock-ticker)").option("-c, --category <category>", "Widget category for palette grouping", "components").action(async (name, options) => {
-	const cwd = process.cwd();
-	const widgetDir = path.join(cwd, "src", "widgets", name);
-	const validationError = validateWidgetName(name);
-	if (validationError) {
-		console.error(chalk.red(`Error: ${validationError}`));
-		process.exit(1);
-	}
-	if (!fs.existsSync(path.join(cwd, "src", "portal.config.ts"))) {
-		console.error(chalk.red("Error: No src/portal.config.ts found."));
-		console.error(chalk.yellow("Run this command from a Fluid portal project root."));
-		process.exit(1);
+async function createTempDirectory(projectDir) {
+	const projectTmpDir = path.join(projectDir, ".fluid", "tmp");
+	try {
+		await fs.ensureDir(projectTmpDir);
+		return await fs.mkdtemp(path.join(projectTmpDir, "widget-packages-"));
+	} catch (err) {
+		const message = err instanceof Error ? err.message : String(err);
+		throw new Error(`Unable to create project-local temporary directory at ${projectTmpDir}: ${message}`);
 	}
-	if (fs.existsSync(widgetDir)) {
-		console.error(chalk.red(`Error: Widget directory already exists: src/widgets/${name}`));
-		process.exit(1);
+}
+async function readSourcePackageExtractorOutput(outputFile) {
+	let output;
+	try {
+		output = await fs.readFile(outputFile, "utf-8");
+	} catch (err) {
+		return failure({
+			code: "CONFIG_LOAD_FAILED",
+			message: "Widget package extractor did not write an output file",
+			details: err instanceof Error ? err.message : String(err)
+		});
 	}
-	const widgetType = toWidgetType(name);
-	const componentName = toComponentName(widgetType);
-	const displayName = toDisplayName(name);
-	const category = options.category ?? "components";
+	let parsed;
 	try {
-		await fs.ensureDir(widgetDir);
-		await fs.writeFile(path.join(widgetDir, "component.tsx"), `interface ${widgetType}Props {
-  title?: string;
+		parsed = JSON.parse(output);
+	} catch {
+		return failure({
+			code: "INVALID_FORMAT",
+			message: "Failed to parse widget package output file as JSON",
+			details: `Output was: ${output.slice(0, 200)}`
+		});
+	}
+	if (!isRecord$4(parsed) || parsed.sentinel !== SOURCE_PACKAGE_OUTPUT_SENTINEL) return failure({
+		code: "INVALID_FORMAT",
+		message: "Widget package extractor output file had an invalid sentinel"
+	});
+	if (!Array.isArray(parsed.data)) return failure({
+		code: "INVALID_FORMAT",
+		message: "Extracted widget package output is not an array",
+		details: `Expected an array, got: ${typeof parsed.data}`
+	});
+	return success(parsed.data);
 }
+function createSourcePackageExtractorScript(options) {
+	return `
+import fs from "node:fs/promises";
+import path from "node:path";
+import { createServer, normalizePath } from "vite";
 
-export function ${componentName}({ title = "${displayName}" }: ${widgetType}Props) {
-  return (
-    <div className="p-4">
-      <h3 className="text-lg font-semibold">{title}</h3>
-      <p className="text-sm text-gray-500">
-        Edit this widget in src/widgets/${name}/component.tsx
-      </p>
-    </div>
-  );
+const SOURCE_PACKAGE_MARKER = "__fluidSourceWidgetPackage";
+const OUTPUT_SENTINEL = ${JSON.stringify(SOURCE_PACKAGE_OUTPUT_SENTINEL)};
+const projectRoot = ${JSON.stringify(options.projectDir)};
+const widgetConfigPath = ${JSON.stringify(options.configPath)};
+const outputPath = process.argv[2];
+if (!outputPath) throw new Error("Missing widget package extractor output path.");
+
+function toViteModuleId(modulePath) {
+  const relativePath = path.relative(projectRoot, modulePath);
+  if (!relativePath.startsWith("..") && !path.isAbsolute(relativePath)) {
+    return "/" + normalizePath(relativePath);
+  }
+  return normalizePath(modulePath);
 }
-`);
-		await fs.writeFile(path.join(widgetDir, "manifest.ts"), `import type { WidgetManifest } from "@fluid-app/portal-sdk";
-import { ${componentName} } from "./component";
 
-export const manifest: WidgetManifest = {
-  manifestVersion: 1,
-  type: "${widgetType}",
-  component: ${componentName},
-  displayName: "${displayName}",
-  description: "A custom ${displayName.toLowerCase()} widget",
-  icon: "puzzle-piece",
-  category: "${category}",
-  propertySchema: {
-    widgetType: "${widgetType}",
-    displayName: "${displayName}",
-    fields: [{ key: "title", label: "Title", type: "text" }],
+const server = await createServer({
+  root: projectRoot,
+  mode: "production",
+  server: { middlewareMode: true },
+  appType: "custom",
+  logLevel: "error",
+  clearScreen: false,
+  resolve: {
+    conditions: ["module", "browser", "development|production"],
   },
-  defaultProps: {
-    title: "${displayName}",
+  ssr: {
+    noExternal: ["@fluid-app/portal-sdk"],
+    resolve: {
+      conditions: ["module", "node", "development|production"],
+    },
   },
-};
-`);
-		await fs.writeFile(path.join(widgetDir, "index.ts"), `export { ${componentName} } from "./component";
-export { manifest } from "./manifest";
-`);
-	} catch (err) {
-		await fs.remove(widgetDir).catch(() => {});
-		console.error(chalk.red("Error: Failed to scaffold widget files."));
-		console.error(err);
-		process.exit(1);
-	}
-	const configPath = path.join(cwd, "src", "portal.config.ts");
-	const camelName = toCamelCase(name);
-	const importLine = `import { manifest as ${camelName} } from "./widgets/${name}";`;
-	const configSource = await fs.readFile(configPath, "utf-8");
-	const withImport = insertImport(configSource, importLine);
-	if (withImport === null) {
-		console.warn(chalk.yellow("Warning: Could not find import statements in portal.config.ts. Add the import manually:"));
-		console.warn(chalk.cyan(`  ${importLine}`));
-	}
-	let updated = insertIntoCustomWidgets(withImport ?? configSource, camelName);
-	if (updated === null) if (withImport === null) {
-		console.warn(chalk.yellow("Warning: Could not register widget in portal.config.ts. Add manually:"));
-		console.warn(chalk.cyan(`  ${importLine}`));
-		console.warn(chalk.cyan(`  customWidgets: [..., ${camelName}]`));
-	} else updated = withImport.trimEnd() + `\n\nexport const customWidgets = [${camelName}];\n`;
-	if (updated !== null) await fs.writeFile(configPath, updated, "utf-8");
-	else if (withImport !== null) await fs.writeFile(configPath, withImport, "utf-8");
-	console.log();
-	console.log(chalk.green("Created widget:") + ` src/widgets/${name}/`);
-	console.log(chalk.gray("  component.tsx  — React component"));
-	console.log(chalk.gray("  manifest.ts    — WidgetManifest"));
-	console.log(chalk.gray("  index.ts       — Re-exports"));
-	console.log();
-	if (updated !== null) {
-		console.log(chalk.green("Registered") + ` in ${chalk.cyan("src/portal.config.ts")}`);
-		console.log();
-	}
-	console.log(chalk.yellow("Next steps:"));
-	console.log(`  1. Edit the component in ${chalk.cyan(`src/widgets/${name}/component.tsx`)}`);
-	console.log(`  2. Customize the manifest fields in ${chalk.cyan(`src/widgets/${name}/manifest.ts`)}`);
-	console.log(`  3. Run ${chalk.cyan("fluid portal dev")} to preview in the builder`);
 });
-const widgetCommand = new Command("widget").description("Manage custom portal widgets").addCommand(createSubcommand);
+
+try {
+  const widgetConfig = await server.ssrLoadModule(toViteModuleId(widgetConfigPath));
+
+  function isSourceWidgetPackage(value) {
+    return Boolean(value && typeof value === "object" && value[SOURCE_PACKAGE_MARKER] === true);
+  }
+
+  function collectSourceWidgetPackages(mod) {
+    const candidates = [
+      mod.widgetPackage,
+      ...(Array.isArray(mod.widgetPackages) ? mod.widgetPackages : []),
+      mod.default,
+    ];
+    const byPackageId = new Map();
+    for (const candidate of candidates) {
+      if (!isSourceWidgetPackage(candidate)) continue;
+      if (!byPackageId.has(candidate.packageId)) byPackageId.set(candidate.packageId, candidate);
+    }
+    return Array.from(byPackageId.values());
+  }
+
+  function serializeWidget(widget) {
+    if (!widget || typeof widget !== "object" || Array.isArray(widget)) {
+      return widget;
+    }
+    const { component, ...metadata } = widget;
+    return metadata;
+  }
+
+  function serializePackage(sourcePackage) {
+    return {
+      manifestVersion: sourcePackage.manifestVersion,
+      scope: sourcePackage.scope,
+      packageStableId: sourcePackage.packageStableId,
+      packageId: sourcePackage.packageId,
+      packageType: sourcePackage.packageType,
+      version: sourcePackage.version,
+      cssUrls: sourcePackage.cssUrls,
+      widgets: Array.isArray(sourcePackage.widgets)
+        ? sourcePackage.widgets.map(serializeWidget)
+        : sourcePackage.widgets,
+    };
+  }
+
+  await fs.writeFile(
+    outputPath,
+    JSON.stringify({
+      sentinel: OUTPUT_SENTINEL,
+      data: collectSourceWidgetPackages(widgetConfig).map(serializePackage),
+    }),
+    "utf-8",
+  );
+} finally {
+  await server.close();
+}
+`;
+}
+function isRecord$4(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 //#endregion
 //#region src/utils/widget-package-artifacts.ts
 const WIDGET_PACKAGE_BUILDER_VERSION = "1";
@@ -3240,7 +3013,7 @@ const DEFAULT_MIN_SDK_VERSION = "0.0.0";
 function validateSingleSourceWidgetPackage(sourcePackages, options = {}) {
 	if (sourcePackages.length === 0) return validationFailure({
 		code: "NO_SOURCE_PACKAGE",
-		message: "No defineWidgetPackage source package was found. Export widgetPackage, widgetPackages, or a default widget package from src/widgets.config.ts, src/portal.config.ts, or portal.config.ts."
+		message: "No defineWidgetPackage source package was found. Export widgetPackage, widgetPackages, or a default widget package from src/widgets.config.ts."
 	});
 	if (sourcePackages.length > 1) return validationFailure({
 		code: "MULTIPLE_SOURCE_PACKAGES",
@@ -3342,22 +3115,19 @@ function validateSingleSourceWidgetPackage(sourcePackages, options = {}) {
 		errors: []
 	};
 }
-function buildWidgetPackageDescriptor(validated, options = {}) {
-	const remoteEntryUrl = options.remoteEntryUrl ?? "widget.js";
-	validateRuntimeDescriptorUrl(remoteEntryUrl, "remoteEntryUrl");
+function buildWidgetPackagePublishManifest(validated, options = {}) {
 	return {
 		manifestVersion: WIDGET_PACKAGE_MANIFEST_VERSION,
-		packageId: getWidgetPackageDescriptorPackageId(validated),
-		packageType: validated.owner,
+		runtime: "remote-dom",
+		packageId: validated.packageId,
+		source: validated.owner,
 		version: validated.version,
-		remoteEntryUrl,
+		workerEntryUrl: toWidgetPackageArtifactPath("widget.js"),
 		cssUrls: mergeCssUrls(validated.sourcePackage.cssUrls, options.cssUrls),
-		widgets: validated.widgets
+		assetUrls: [],
+		widgets: validated.widgets.map(({ name: _name, ...widget }) => widget)
 	};
 }
-function getWidgetPackageDescriptorPackageId(validated) {
-	return validated.owner === "droplet" ? validated.packageKey : validated.packageId;
-}
 function sourceWidgetToDescriptor(widget, type) {
 	const displayName = widget.displayName ?? widget.name;
 	return {
@@ -3371,9 +3141,16 @@ function sourceWidgetToDescriptor(widget, type) {
 		defaultProps: widget.defaultProps ?? {},
 		container: normalizeContainer(widget.container),
 		minSdkVersion: widget.minSdkVersion ?? DEFAULT_MIN_SDK_VERSION,
-		resizable: normalizeResizable(widget.resizable)
+		resizable: normalizeResizable(widget.resizable),
+		capabilities: normalizeCapabilities(widget.capabilities ?? [])
 	};
 }
+function normalizeCapabilities(capabilities) {
+	return capabilities.map((capability) => ({
+		name: capability.name,
+		version: capability.version ?? "1"
+	}));
+}
 function validationFailure(error) {
 	return {
 		success: false,
@@ -3426,8 +3203,9 @@ function validateSourcePackageShape(value) {
 		validateOptionalStringField(widget, "icon", `${widgetPath}.icon`, errors, { requireNonEmpty: true });
 		validateOptionalStringField(widget, "category", `${widgetPath}.category`, errors, { requireNonEmpty: true });
 		validateOptionalStringField(widget, "minSdkVersion", `${widgetPath}.minSdkVersion`, errors, { requireNonEmpty: true });
-		validateOptionalRecordField(widget, "propertySchema", `${widgetPath}.propertySchema`, errors);
-		validateOptionalRecordField(widget, "defaultProps", `${widgetPath}.defaultProps`, errors);
+		validateOptionalJsonRecordField(widget, "propertySchema", `${widgetPath}.propertySchema`, errors);
+		validateOptionalJsonRecordField(widget, "defaultProps", `${widgetPath}.defaultProps`, errors);
+		validateOptionalCapabilities(widget, "capabilities", `${widgetPath}.capabilities`, errors);
 	});
 	return errors;
 }
@@ -3473,85 +3251,67 @@ function validateCssUrl(value, cssUrlPath, errors) {
 		message: "Widget package cssUrls entries must be top-level generated CSS artifact filenames matching [A-Za-z0-9._~-]+.css. Self-host external CSS or fonts via @font-face in widget CSS so the build can isolate them."
 	});
 }
-function validateRuntimeDescriptorUrl(value, urlPath) {
-	if (value.trim().length === 0) throw new Error(`${urlPath} must be a non-empty string.`);
-	if (!isValidRuntimeDescriptorUrl(value)) throw new Error(`${urlPath} must be an https URL, trusted local http URL, or relative URL.`);
-}
-function isValidRuntimeDescriptorUrl(value) {
-	if (value.trim() !== value || containsUnsafeUrlCharacter(value)) return false;
-	if (/^[a-zA-Z][a-zA-Z\d+.-]*:/.exec(value)) {
-		let parsedUrl;
-		try {
-			parsedUrl = new URL(value);
-		} catch {
-			return false;
-		}
-		return parsedUrl.protocol === "https:" || isTrustedLocalHttpUrl(parsedUrl, value);
-	}
-	if (value.slice(0, 2) === "//") return false;
-	try {
-		new URL(value, "http://localhost");
-		return true;
-	} catch {
-		return false;
-	}
-}
-function isTrustedLocalHttpUrl(url, rawUrl) {
-	if (url.protocol !== "http:") return false;
-	const hostname = extractRawHostname(rawUrl).toLowerCase();
-	return hostname === "localhost" || hostname === "[::1]" || hostname === "::1" || isLoopbackIpv4Hostname(hostname);
-}
-function extractRawHostname(rawUrl) {
-	const authorityStart = rawUrl.indexOf("://") + 3;
-	const authorityEnd = findAuthorityEnd(rawUrl, authorityStart);
-	const authority = rawUrl.slice(authorityStart, authorityEnd);
-	const hostAndPort = authority.slice(authority.lastIndexOf("@") + 1);
-	if (hostAndPort.charAt(0) === "[") {
-		const bracketEnd = hostAndPort.indexOf("]");
-		return bracketEnd === -1 ? hostAndPort : hostAndPort.slice(0, bracketEnd + 1);
-	}
-	const portStart = hostAndPort.indexOf(":");
-	return portStart === -1 ? hostAndPort : hostAndPort.slice(0, portStart);
-}
-function findAuthorityEnd(rawUrl, authorityStart) {
-	let authorityEnd = rawUrl.length;
-	for (const delimiter of [
-		"/",
-		"?",
-		"#"
-	]) {
-		const delimiterIndex = rawUrl.indexOf(delimiter, authorityStart);
-		if (delimiterIndex !== -1 && delimiterIndex < authorityEnd) authorityEnd = delimiterIndex;
-	}
-	return authorityEnd;
-}
-function isLoopbackIpv4Hostname(hostname) {
-	const octets = hostname.split(".");
-	if (octets.length !== 4 || octets[0] !== "127") return false;
-	return octets.every(isBoundedIpv4Octet);
-}
-function isBoundedIpv4Octet(octet) {
-	if (!/^\d{1,3}$/.test(octet)) return false;
-	if (octet.length > 1 && octet.charAt(0) === "0") return false;
-	const value = Number(octet);
-	return value >= 0 && value <= 255;
-}
-function containsUnsafeUrlCharacter(value) {
-	for (let index = 0; index < value.length; index += 1) {
-		const charCode = value.charCodeAt(index);
-		if (charCode <= 31 || charCode === 127 || charCode === 92) return true;
-	}
-	return false;
-}
-function validateOptionalRecordField(record, key, path, errors) {
+function validateOptionalJsonRecordField(record, key, path, errors) {
 	const value = record[key];
-	if (value === void 0 || isRecord$3(value)) return;
+	if (value === void 0) return;
+	if (isRecord$3(value) && isJsonValue(value)) return;
 	errors.push({
 		code: "INVALID_WIDGET_METADATA",
 		path,
 		message: `${path} must be a JSON object when present.`
 	});
 }
+function validateOptionalCapabilities(record, key, path, errors) {
+	const value = record[key];
+	if (value === void 0) return;
+	if (!Array.isArray(value)) {
+		errors.push({
+			code: "INVALID_WIDGET_METADATA",
+			path,
+			message: `${path} must be an array when present.`
+		});
+		return;
+	}
+	const names = /* @__PURE__ */ new Set();
+	value.forEach((candidate, index) => {
+		const capabilityPath = `${path}[${index}]`;
+		if (!isRecord$3(candidate)) {
+			errors.push({
+				code: "INVALID_WIDGET_METADATA",
+				path: capabilityPath,
+				message: `${capabilityPath} must be a JSON object.`
+			});
+			return;
+		}
+		const name = candidate.name;
+		if (!isCanonicalMetadataString(name)) {
+			errors.push({
+				code: "INVALID_WIDGET_METADATA",
+				path: `${capabilityPath}.name`,
+				message: `${capabilityPath}.name must be a non-empty string without surrounding whitespace or control characters.`
+			});
+			return;
+		}
+		const version = candidate.version;
+		if (version !== void 0 && !isCanonicalMetadataString(version)) errors.push({
+			code: "INVALID_WIDGET_METADATA",
+			path: `${capabilityPath}.version`,
+			message: `${capabilityPath}.version must be a non-empty string without surrounding whitespace or control characters when present.`
+		});
+		if (names.has(name)) {
+			errors.push({
+				code: "INVALID_WIDGET_METADATA",
+				path: `${capabilityPath}.name`,
+				message: `${path} must not contain duplicate capability name ${JSON.stringify(name)}.`
+			});
+			return;
+		}
+		names.add(name);
+	});
+}
+function isCanonicalMetadataString(value) {
+	return typeof value === "string" && value.length > 0 && value === value.trim() && !/\p{Cc}/u.test(value);
+}
 function mergeCssUrls(sourceCssUrls, generatedCssUrls) {
 	const generatedCssUrlSet = new Set(generatedCssUrls ?? []);
 	generatedCssUrls?.forEach((cssUrl, index) => {
@@ -3562,7 +3322,10 @@ function mergeCssUrls(sourceCssUrls, generatedCssUrls) {
 		if (generatedCssUrlSet.has(cssUrl)) return;
 		throw new Error(`cssUrls[${index}] URL ${JSON.stringify(cssUrl)} must match a generated top-level CSS artifact. Import the CSS from the widget package bundle or remove it from cssUrls.`);
 	});
-	return Array.from(new Set([...sourceCssUrls ?? [], ...generatedCssUrls ?? []]));
+	return Array.from(new Set([...sourceCssUrls ?? [], ...generatedCssUrls ?? []])).map(toWidgetPackageArtifactPath);
+}
+function toWidgetPackageArtifactPath(value) {
+	return value;
 }
 function validateGeneratedCssArtifactUrl(value, cssUrlPath) {
 	if (value.trim().length === 0) throw new Error(`${cssUrlPath} must be a non-empty string.`);
@@ -3639,15 +3402,7 @@ const PROJECT_VITE_CONFIG_CANDIDATES = [
 	"vite.config.js",
 	"vite.config.mjs"
 ];
-const BLOCKED_FLUID_PROJECT_PLUGIN_NAMES = [
-	"fluid-manifest-plugin",
-	"fluid-preview-plugin",
-	"fluid-builder-preview",
-	"fluid-builder-preview-standalone",
-	"fluid-portal-dev",
-	"fluid-backend-dev"
-];
-const WIDGET_PACKAGE_QUEUE_GLOBAL = "FluidWidgetPackageQueue";
+const BLOCKED_FLUID_PROJECT_PLUGIN_NAMES = ["fluid-portal-dev", "fluid-backend-dev"];
 const require = createRequire(import.meta.url);
 function validateSharedWidgetPackagePublishDir(projectDir, publishDir = DEFAULT_PUBLISH_DIR, options = {}) {
 	const label = options.optionName ?? "publishDir";
@@ -3686,9 +3441,11 @@ async function buildSharedWidgetPackage(options) {
 	try {
 		await validateWidgetPackageOutputPaths(options.projectDir, publishDirInput);
 		const publishDir = path.resolve(options.projectDir, publishDirInput);
+		const widgetScriptPath = path.join(publishDir, "widget.js");
 		await fs.emptyDir(publishDir);
 		const tempDir = path.resolve(options.projectDir, TEMP_BUILD_DIR);
 		await fs.emptyDir(tempDir);
+		let buildFailure;
 		try {
 			await buildWidgetScriptBundle({
 				projectDir: options.projectDir,
@@ -3696,15 +3453,25 @@ async function buildSharedWidgetPackage(options) {
 				publishDir,
 				validated: validation.value
 			});
-		} finally {
-			await fs.remove(tempDir).catch(() => {});
+		} catch (error) {
+			buildFailure = { error };
+		}
+		try {
+			await fs.remove(tempDir);
+		} catch {
+			const cleanupFailure = /* @__PURE__ */ new Error("Failed to remove reserved temporary build directory.");
+			if (buildFailure) {
+				const primaryError = buildFailure.error instanceof Error ? buildFailure.error : new Error(String(buildFailure.error));
+				throw new AggregateError([primaryError, cleanupFailure], `${primaryError.message}\n${cleanupFailure.message}`);
+			}
+			throw cleanupFailure;
 		}
+		if (buildFailure) throw buildFailure.error;
 		const cssUrls = await collectCssUrls(publishDir);
-		const descriptor = buildWidgetPackageDescriptor(validation.value, { cssUrls });
+		const descriptor = buildWidgetPackagePublishManifest(validation.value, { cssUrls });
 		const manifestContent = stableStringify(descriptor);
 		const publishPackageId = descriptor.packageId;
 		const manifestPath = path.join(publishDir, "manifest.json");
-		const widgetScriptPath = path.join(publishDir, "widget.js");
 		const publishManifestPath = path.join(publishDir, "publish-manifest.json");
 		await fs.writeFile(manifestPath, manifestContent, "utf-8");
 		const artifacts = await collectWidgetPackageArtifacts(publishDir);
@@ -3719,7 +3486,7 @@ async function buildSharedWidgetPackage(options) {
 		await fs.writeFile(publishManifestPath, stableStringify(publishManifest), "utf-8");
 		return success({
 			publishDir,
-			packageId: getWidgetPackageDescriptorPackageId(validation.value),
+			packageId: validation.value.packageId,
 			version: validation.value.version,
 			manifestPath,
 			publishManifestPath,
@@ -3736,13 +3503,12 @@ async function buildSharedWidgetPackage(options) {
 	}
 }
 function createWidgetPackageEntrySource(options) {
-	const runtimePackageId = getWidgetPackageDescriptorPackageId(options.validated);
-	return `import * as widgetConfig from ${JSON.stringify(options.configImportPath)};
-import { createElement } from "react";
+	return `import { createElement } from "react";
+import { startWidgetPackage } from "@fluid-app/portal-sdk/widgets/worker";
+${options.cssImportPath ? `import ${JSON.stringify(options.cssImportPath)};` : ""}
 
+const widgetConfig = await import(${JSON.stringify(options.configImportPath)});
 const SOURCE_PACKAGE_MARKER = "__fluidSourceWidgetPackage";
-const WIDGET_PACKAGE_ID = ${JSON.stringify(runtimePackageId)};
-const WIDGET_PACKAGE_VERSION = ${JSON.stringify(options.validated.version)};
 const descriptors = ${JSON.stringify(options.validated.widgets, null, 2)};
 
 function isSourceWidgetPackage(value) {
@@ -3759,50 +3525,25 @@ function collectSourceWidgetPackages(mod) {
 
 const sourcePackage = collectSourceWidgetPackages(widgetConfig)[0];
 if (!sourcePackage) {
-  throw new Error("No Fluid source widget package found while loading widget package bundle.");
+  throw new Error("No Fluid source widget package found while loading widget package worker bundle.");
 }
 
 const componentsByName = new Map(
   sourcePackage.widgets.map((widget) => [widget.name, widget.component]),
 );
 
-function createScopedWidgetComponent(component, descriptor) {
-  const wrapperTagName = descriptor.container === "inline" ? "span" : "div";
-  const WrappedFluidWidgetComponent = (props) => createElement(
-    wrapperTagName,
-    {
-      "data-fluid-widget-package": WIDGET_PACKAGE_ID,
-      "data-fluid-widget-version": WIDGET_PACKAGE_VERSION,
-      "data-fluid-widget-name": descriptor.name,
-    },
-    // PortalContainerProvider is not imported here because standalone widget packages
-    // only depend on @fluid-app/portal-sdk, which does not currently expose a
-    // public portal-container provider. Radix/ui-primitives portals remain a
-    // residual isolation risk until a public widget-safe provider is available.
-    createElement(component, props),
-  );
-  WrappedFluidWidgetComponent.displayName = "FluidWidgetPackage(" + WIDGET_PACKAGE_ID + "/" + descriptor.name + ")";
-  return WrappedFluidWidgetComponent;
-}
-
 const widgets = descriptors.map((descriptor) => {
   const component = componentsByName.get(descriptor.name);
-  if (typeof component !== "function" && typeof component !== "object") {
-    throw new Error("Widget package is missing component for " + descriptor.name + ".");
+  if (typeof component !== "function") {
+    throw new Error("Widget package is missing Remote DOM component for " + descriptor.name + ".");
   }
-  return { ...descriptor, component: createScopedWidgetComponent(component, descriptor) };
+  return {
+    ...descriptor,
+    component: (props) => createElement(component, props),
+  };
 });
 
-var _fluidWidgets = globalObject.FluidWidgets;
-if (!_fluidWidgets || typeof _fluidWidgets.registerPackage !== "function") {
-  throw new Error("FluidWidgets registry is not installed.");
-}
-
-_fluidWidgets.registerPackage({
-  packageId: ${JSON.stringify(runtimePackageId)},
-  version: ${JSON.stringify(options.validated.version)},
-  widgets,
-});
+startWidgetPackage({ widgets });
 `;
 }
 async function buildWidgetScriptBundle(options) {
@@ -3810,14 +3551,14 @@ async function buildWidgetScriptBundle(options) {
 	if (!sourceConfig) throw new Error("No portal widget source config found.");
 	const entryPath = path.join(options.tempDir, "widget-entry.ts");
 	const viteConfigPath = path.join(options.tempDir, "vite.config.mjs");
+	const rootStylesPath = path.join(options.projectDir, "styles.css");
 	await fs.writeFile(entryPath, createWidgetPackageEntrySource({
 		configImportPath: pathToFileURL(sourceConfig.path).href,
+		cssImportPath: await fs.pathExists(rootStylesPath) ? pathToFileURL(rootStylesPath).href : void 0,
 		validated: options.validated
 	}), "utf-8");
 	await fs.writeFile(viteConfigPath, createViteConfigSource({
 		entryPath,
-		packageId: getWidgetPackageDescriptorPackageId(options.validated),
-		packageVersion: options.validated.version,
 		publishDir: options.publishDir,
 		projectConfigPath: await resolveProjectViteConfigPath(options.projectDir)
 	}), "utf-8");
@@ -3832,43 +3573,9 @@ async function buildWidgetScriptBundle(options) {
 		stdio: "pipe",
 		env: {
 			...process.env,
-			NODE_ENV: "production",
-			NODE_OPTIONS: withFluidWidgetAuthoringNodeCondition(process.env.NODE_OPTIONS)
+			NODE_ENV: "production"
 		}
 	});
-	const widgetScriptPath = path.join(options.publishDir, "widget.js");
-	const widgetScriptContent = await fs.readFile(widgetScriptPath, "utf-8");
-	await fs.writeFile(widgetScriptPath, wrapWidgetPackageScript(widgetScriptContent), "utf-8");
-}
-function wrapWidgetPackageScript(widgetScriptContent) {
-	return `;(function () {
-  var globalObject = window;
-  var runWidgetPackage = function fluidWidgetPackageFactory() {
-    // Intentionally shadow Rollup's expected FluidShared global with the wrapper-scoped host globals.
-    var FluidShared = globalObject.FluidShared;
-    if (!FluidShared || !FluidShared.PortalSdk) {
-      throw new Error("window.FluidShared.PortalSdk is not installed.");
-    }
-${indentScript(widgetScriptContent, "    ")}
-  };
-  runWidgetPackage.__fluidRequiresPortalSdk = true;
-
-  if (globalObject.FluidShared && globalObject.FluidShared.PortalSdk) {
-    runWidgetPackage();
-    return;
-  }
-
-  var queue = globalObject.${WIDGET_PACKAGE_QUEUE_GLOBAL};
-  if (!Array.isArray(queue)) {
-    queue = [];
-    globalObject.${WIDGET_PACKAGE_QUEUE_GLOBAL} = queue;
-  }
-  queue.push(runWidgetPackage);
-})();
-`;
-}
-function indentScript(source, indent) {
-	return source.split("\n").map((line) => line.length > 0 ? `${indent}${line}` : line).join("\n");
 }
 function resolveViteCliPath(projectDir) {
 	const projectViteCliPath = resolveViteCliPathFromRequire(createRequire(path.join(projectDir, "package.json")));
@@ -3896,6 +3603,9 @@ export default defineConfig(${widgetConfigSource});
 
 const projectConfigPath = ${JSON.stringify(options.projectConfigPath)};
 const widgetConfig = ${widgetConfigSource};
+const fluidWidgetDefineInvariants = {
+  "process.env.NODE_ENV": JSON.stringify("production"),
+};
 const blockedFluidPluginNames = new Set(${JSON.stringify(BLOCKED_FLUID_PROJECT_PLUGIN_NAMES)});
 
 function isAllowedProjectPlugin(plugin) {
@@ -3936,30 +3646,35 @@ function sanitizeProjectConfig(config) {
   return sanitized;
 }
 
+function copyConfigDefineValue(value) {
+  return value && typeof value === "object" && !Array.isArray(value)
+    ? { ...value }
+    : {};
+}
+
+function mergeFluidWidgetDefineInvariants(mergedConfig, safeProjectConfig, widgetConfig) {
+  mergedConfig.define = {
+    ...copyConfigDefineValue(safeProjectConfig.define),
+    ...copyConfigDefineValue(mergedConfig.define),
+    ...copyConfigDefineValue(widgetConfig.define),
+    ...fluidWidgetDefineInvariants,
+  };
+  return mergedConfig;
+}
+
 export default defineConfig(async (configEnv) => {
   const projectConfig = await loadConfigFromFile(configEnv, projectConfigPath);
   const safeProjectConfig = sanitizeProjectConfig(projectConfig?.config ?? {});
-  return mergeConfig(safeProjectConfig, widgetConfig);
+  return mergeFluidWidgetDefineInvariants(mergeConfig(safeProjectConfig, widgetConfig), safeProjectConfig, widgetConfig);
 });
 `;
 }
 function createWidgetViteConfigObjectSource(options) {
 	const configFileSource = options.disableConfigFileLookup ? "  configFile: false,\n" : "";
 	return `(() => {
-  const widgetPackageId = ${JSON.stringify(options.packageId)};
-  const widgetPackageVersion = ${JSON.stringify(options.packageVersion)};
-  const widgetPackageScopeSelector = '[data-fluid-widget-package="' + widgetPackageId + '"][data-fluid-widget-version="' + widgetPackageVersion + '"]';
-  const widgetPackageGeneratedCssFileName = "widget.css";
-  const widgetPackageKeyframePrefix = "fluid-widget-" + encodeCssIdentifier(widgetPackageId) + "-" + encodeCssIdentifier(widgetPackageVersion) + "-";
-  const widgetPackageLayerPrefix = widgetPackageKeyframePrefix + "layer-";
-  const widgetPackageHostDefaultLayerName = widgetPackageLayerPrefix + "generated-host-defaults";
-  const widgetPackageHostDefaultRule = "@layer " + widgetPackageHostDefaultLayerName + " { " + widgetPackageScopeSelector + " { display: contents; } }";
-  const widgetPackageContainerPrefix = widgetPackageKeyframePrefix + "container-";
-  const widgetPackageCssGlobalNamePrefix = widgetPackageKeyframePrefix + "css-name-";
-  const groupingAtRules = new Set(["media", "supports", "container", "document", "starting-style"]);
-  const unsafeSelectorPattern = /(^|[\\s>+~,])(:root|html|body)(?=$|[\\s.#:[>+~,)])/i;
-  const universalSelectorPattern = /(^|[\\s>+~,])\\*(?=$|[\\s.#:[>+~,)])/g;
-  const pseudoElementOnlySelectorPattern = /^::[A-Za-z-]+(?:\\([^)]*\\))?$/;
+  const fluidWidgetDefineInvariants = {
+    "process.env.NODE_ENV": JSON.stringify("production"),
+  };
 
   function createFluidWidgetBuildInvariants() {
     return {
@@ -3967,26 +3682,18 @@ function createWidgetViteConfigObjectSource(options) {
       emptyOutDir: false,
       outDir: ${JSON.stringify(options.publishDir)},
       sourcemap: false,
+      target: "esnext",
+      cssCodeSplit: false,
       lib: {
         entry: ${JSON.stringify(options.entryPath)},
-        formats: ["iife"],
-        name: "FluidWidgetPackage",
+        formats: ["es"],
         fileName: () => "widget.js",
+        cssFileName: "widget",
       },
       rollupOptions: {
-        external: [
-          "react",
-          "react-dom",
-          "react/jsx-runtime",
-          "@fluid-app/portal-sdk",
-        ],
         output: {
-          globals: {
-            react: "FluidShared.React",
-            "react-dom": "FluidShared.ReactDOM",
-            "react/jsx-runtime": "FluidShared.ReactJsxRuntime",
-            "@fluid-app/portal-sdk": "FluidShared.PortalSdk",
-          },
+          inlineDynamicImports: true,
+          hoistTransitiveImports: false,
         },
       },
     };
@@ -4000,1179 +3707,26 @@ function createWidgetViteConfigObjectSource(options) {
         return { build: createFluidWidgetBuildInvariants() };
       },
       configResolved(config) {
+        config.define = {
+          ...(config.define ?? {}),
+          ...fluidWidgetDefineInvariants,
+        };
         Object.assign(config.build, createFluidWidgetBuildInvariants());
       },
     };
   }
 
-  function fluidWidgetCssIsolationPlugin() {
-    return {
-      name: "fluid-widget-css-isolation",
-      enforce: "post",
-      generateBundle(_outputOptions, bundle) {
-        let hasCssAsset = false;
-        for (const asset of Object.values(bundle)) {
-          if (!asset || asset.type !== "asset" || !asset.fileName.endsWith(".css")) continue;
-          hasCssAsset = true;
-          const source = typeof asset.source === "string" ? asset.source : new TextDecoder().decode(asset.source);
-          asset.source = isolateWidgetCssAsset(source, asset.fileName);
-        }
-        if (!hasCssAsset) {
-          this.emitFile({
-            type: "asset",
-            fileName: widgetPackageGeneratedCssFileName,
-            source: widgetPackageHostDefaultRule + "\\n",
-          });
-        }
-      },
-    };
-  }
-
-  function isolateWidgetCssAsset(css, assetName) {
-    const keyframeNames = collectKeyframeNames(css);
-    const fontFamilyNames = collectFontFamilyNames(css);
-    const customPropertyNames = collectRegisteredCustomPropertyNames(css);
-    const placementSensitivePrefix = readPlacementSensitiveCssPrefix(css, assetName);
-    const isolatedCss = isolateCssRange(css, assetName, keyframeNames, fontFamilyNames, customPropertyNames, placementSensitivePrefix.endIndex, css.length).css;
-    return placementSensitivePrefix.css + widgetPackageHostDefaultRule + "\\n" + isolatedCss;
-  }
-
-  function collectKeyframeNames(css) {
-    const names = new Map();
-    visitCssAtRules(css, (atRuleName, atRule) => {
-      if (!isKeyframesAtRule(atRuleName)) return false;
-      const match = /^@(?:-[A-Za-z]+-)?keyframes\\s+([^\\s{]+)/i.exec(atRule.prelude);
-      const name = match?.[1];
-      if (name && !names.has(name)) names.set(name, widgetPackageKeyframePrefix + name);
-      return atRule.blockStart !== -1;
-    });
-    return names;
-  }
-
-  function collectFontFamilyNames(css) {
-    const names = new Map();
-    visitCssAtRules(css, (atRuleName, atRule) => {
-      if (atRuleName !== "font-face" || atRule.blockStart === -1 || atRule.blockEnd === -1) return false;
-      let familyName = "";
-      rewriteDeclarationBlock(css.slice(atRule.blockStart + 1, atRule.blockEnd), (propertyName, rawProperty, value) => {
-        if (propertyName === "font-family" && !familyName) {
-          familyName = normalizeFontFamilyName(value);
-        }
-        return { property: rawProperty, value };
-      });
-      if (familyName && !names.has(familyName)) names.set(familyName, widgetPackageKeyframePrefix + familyName);
-      return true;
-    });
-    return names;
-  }
-
-  function collectRegisteredCustomPropertyNames(css) {
-    const names = new Map();
-    visitCssAtRules(css, (atRuleName, atRule) => {
-      if (atRuleName !== "property") return false;
-      const match = /^@property\\s+(--[A-Za-z0-9_-]+)/i.exec(atRule.prelude);
-      const name = match?.[1];
-      if (name && !names.has(name)) names.set(name, "--" + widgetPackageKeyframePrefix + name.slice(2));
-      return atRule.blockStart !== -1;
-    });
-    return names;
-  }
-
-  function visitCssAtRules(css, visitAtRule) {
-    let index = 0;
-    while (index < css.length) {
-      if (cssStartsWithComment(css, index)) {
-        const commentEnd = css.indexOf("*/", index + 2);
-        index = commentEnd === -1 ? css.length : commentEnd + 2;
-        continue;
-      }
-      const char = css[index];
-      if (char === '"' || char === "'") {
-        index = findCssStringEnd(css, index);
-        continue;
-      }
-      if (char !== "@") {
-        index += 1;
-        continue;
-      }
-      const atRule = readRulePrelude(css, index, css.length);
-      const blockEnd = atRule.blockStart === -1 ? -1 : findMatchingBrace(css, atRule.blockStart, css.length);
-      const shouldSkipBlock = visitAtRule(readAtRuleName(atRule.prelude), { ...atRule, blockEnd });
-      index = shouldSkipBlock && blockEnd !== -1 ? blockEnd + 1 : index + 1;
-    }
-  }
-
-  function isolateCssRange(css, assetName, keyframeNames, fontFamilyNames, customPropertyNames, startIndex, endIndex) {
-    let output = "";
-    let index = startIndex;
-    while (index < endIndex) {
-      if (css.startsWith("/*", index)) {
-        const commentEnd = css.indexOf("*/", index + 2);
-        const nextIndex = commentEnd === -1 ? endIndex : commentEnd + 2;
-        output += css.slice(index, nextIndex);
-        index = nextIndex;
-        continue;
-      }
-
-      if (/\\s/.test(css[index] ?? "")) {
-        output += css[index];
-        index += 1;
-        continue;
-      }
-
-      if (css[index] === "@") {
-        const atRule = readRulePrelude(css, index, endIndex);
-        const atRuleName = readAtRuleName(atRule.prelude);
-        if (atRule.blockStart === -1) {
-          if (atRuleName === "import") {
-            throw new Error('Unsupported @import rule in CSS asset "' + assetName + '" cannot be isolated safely. Self-host external CSS or fonts via @font-face in widget CSS so the build can isolate them.');
-          }
-          if (atRuleName === "charset" || atRuleName === "namespace") {
-            throw new Error('Unsupported @' + atRuleName + ' rule in CSS asset "' + assetName + '" cannot be isolated safely after generated host defaults. Move @' + atRuleName + ' before all non-@charset/@namespace rules.');
-          }
-          if (atRuleName === "layer") {
-            output += rewriteLayerPrelude(atRule.prelude) + css.slice(index + atRule.prelude.length, atRule.end);
-            index = atRule.end;
-            continue;
-          }
-          output += css.slice(index, atRule.end);
-          index = atRule.end;
-          continue;
-        }
-
-        const blockEnd = findMatchingBrace(css, atRule.blockStart, endIndex);
-        if (blockEnd === -1) {
-          output += css.slice(index, endIndex);
-          index = endIndex;
-          continue;
-        }
-
-        const ruleHeader = css.slice(index, atRule.blockStart + 1);
-        if (isKeyframesAtRule(atRuleName)) {
-          output += rewriteKeyframesHeader(ruleHeader, keyframeNames) + namespaceKeyframesBlock(css.slice(atRule.blockStart + 1, blockEnd), keyframeNames, fontFamilyNames, customPropertyNames, assetName) + "}";
-        } else if (atRuleName === "font-face") {
-          output += ruleHeader + namespaceFontFaceBlock(css.slice(atRule.blockStart + 1, blockEnd), fontFamilyNames, customPropertyNames) + "}";
-        } else if (atRuleName === "property") {
-          output += rewritePropertyHeader(ruleHeader, customPropertyNames) + namespaceCustomPropertyReferences(css.slice(atRule.blockStart + 1, blockEnd), customPropertyNames) + "}";
-        } else if (atRuleName === "layer") {
-          output += rewriteLayerPrelude(atRule.prelude) + css.slice(index + atRule.prelude.length, atRule.blockStart + 1) + isolateCssRange(css, assetName, keyframeNames, fontFamilyNames, customPropertyNames, atRule.blockStart + 1, blockEnd).css + "}";
-        } else if (groupingAtRules.has(atRuleName)) {
-          const groupingRuleHeader = atRuleName === "container" ? rewriteContainerAtRuleHeader(ruleHeader) : ruleHeader;
-          output += groupingRuleHeader + isolateCssRange(css, assetName, keyframeNames, fontFamilyNames, customPropertyNames, atRule.blockStart + 1, blockEnd).css + "}";
-        } else {
-          throw new Error('Unsupported @' + atRuleName + ' rule in CSS asset "' + assetName + '" cannot be isolated safely.');
-        }
-        index = blockEnd + 1;
-        continue;
-      }
-
-      const styleRule = readRulePrelude(css, index, endIndex);
-      if (styleRule.blockStart === -1) {
-        output += css.slice(index, styleRule.end);
-        index = styleRule.end;
-        continue;
-      }
-
-      const styleBlockEnd = findMatchingBrace(css, styleRule.blockStart, endIndex);
-      if (styleBlockEnd === -1) {
-        output += css.slice(index, endIndex);
-        index = endIndex;
-        continue;
-      }
-
-      output += isolateSelectorList(styleRule.prelude, assetName) + "{" + namespaceStyleBlock(css.slice(styleRule.blockStart + 1, styleBlockEnd), keyframeNames, fontFamilyNames, customPropertyNames, assetName) + "}";
-      index = styleBlockEnd + 1;
-    }
-
-    return { css: output, index };
-  }
-
-  function readPlacementSensitiveCssPrefix(css, assetName) {
-    let output = "";
-    let index = 0;
-    let hasNamespace = false;
-    while (index < css.length) {
-      const leadingStart = index;
-      index = skipCssWhitespaceAndComments(css, index);
-      const leading = css.slice(leadingStart, index);
-      if (css[index] !== "@") {
-        return { css: output + leading, endIndex: index };
-      }
-
-      const atRule = readRulePrelude(css, index, css.length);
-      const atRuleName = readAtRuleName(atRule.prelude);
-      if (atRuleName !== "charset" && atRuleName !== "namespace") {
-        return { css: output + leading, endIndex: index };
-      }
-      if (atRule.blockStart !== -1) {
-        throw new Error('Unsupported @' + atRuleName + ' rule in CSS asset "' + assetName + '" cannot be isolated safely.');
-      }
-      if (atRuleName === "charset" && hasNamespace) {
-        throw new Error('Unsupported @charset rule in CSS asset "' + assetName + '" cannot be isolated safely after @namespace. Move @charset before @namespace.');
-      }
-      if (atRuleName === "namespace") hasNamespace = true;
-      output += leading + css.slice(index, atRule.end);
-      index = atRule.end;
-    }
-    return { css: output, endIndex: index };
-  }
-
-  function readRulePrelude(css, startIndex, endIndex) {
-    let index = startIndex;
-    let quote = "";
-    let bracketDepth = 0;
-    let parenDepth = 0;
-    while (index < endIndex) {
-      const char = css[index];
-      if (quote) {
-        if (char === "\\\\") index += 2;
-        else {
-          if (char === quote) quote = "";
-          index += 1;
-        }
-        continue;
-      }
-      if (cssStartsWithComment(css, index)) {
-        const commentEnd = css.indexOf("*/", index + 2);
-        index = commentEnd === -1 ? endIndex : Math.min(commentEnd + 2, endIndex);
-        continue;
-      }
-      if (char === '"' || char === "'") {
-        quote = char;
-        index += 1;
-        continue;
-      }
-      if (char === "[") bracketDepth += 1;
-      else if (char === "]") bracketDepth = Math.max(0, bracketDepth - 1);
-      else if (char === "(") parenDepth += 1;
-      else if (char === ")") parenDepth = Math.max(0, parenDepth - 1);
-      else if (bracketDepth === 0 && parenDepth === 0 && char === "{") {
-        return { prelude: css.slice(startIndex, index), blockStart: index, end: index + 1 };
-      } else if (bracketDepth === 0 && parenDepth === 0 && char === ";") {
-        return { prelude: css.slice(startIndex, index), blockStart: -1, end: index + 1 };
-      }
-      index += 1;
-    }
-    return { prelude: css.slice(startIndex, endIndex), blockStart: -1, end: endIndex };
-  }
-
-  function findMatchingBrace(css, openBraceIndex, endIndex) {
-    let depth = 1;
-    let index = openBraceIndex + 1;
-    let quote = "";
-    while (index < endIndex) {
-      const char = css[index];
-      if (quote) {
-        if (char === "\\\\") index += 2;
-        else {
-          if (char === quote) quote = "";
-          index += 1;
-        }
-        continue;
-      }
-      if (char === '"' || char === "'") {
-        quote = char;
-        index += 1;
-        continue;
-      }
-      if (css.startsWith("/*", index)) {
-        const commentEnd = css.indexOf("*/", index + 2);
-        index = commentEnd === -1 ? endIndex : commentEnd + 2;
-        continue;
-      }
-      if (char === "{") depth += 1;
-      else if (char === "}") {
-        depth -= 1;
-        if (depth === 0) return index;
-      }
-      index += 1;
-    }
-    return -1;
-  }
-
-  function readAtRuleName(prelude) {
-    const match = /^@([A-Za-z-]+)/.exec(prelude.trim());
-    return match?.[1]?.toLowerCase() ?? "";
-  }
-
-  function isKeyframesAtRule(atRuleName) {
-    return atRuleName === "keyframes" || atRuleName.endsWith("-keyframes");
-  }
-
-  function rewriteKeyframesHeader(header, keyframeNames) {
-    return header.replace(/(@(?:-[A-Za-z]+-)?keyframes\\s+)([^\\s{]+)/, (_match, prefix, name) => prefix + (keyframeNames.get(name) ?? name));
-  }
-
-  function splitSelectorList(selectorList) {
-    const selectors = [];
-    let current = "";
-    let quote = "";
-    let bracketDepth = 0;
-    let parenDepth = 0;
-    for (let index = 0; index < selectorList.length; index += 1) {
-      const char = selectorList[index];
-      if (quote) {
-        current += char;
-        if (char === "\\\\") {
-          index += 1;
-          current += selectorList[index] ?? "";
-        } else if (char === quote) quote = "";
-        continue;
-      }
-      if (char === '"' || char === "'") {
-        quote = char;
-        current += char;
-        continue;
-      }
-      if (cssStartsWithComment(selectorList, index)) {
-        const commentEnd = selectorList.indexOf("*/", index + 2);
-        const nextIndex = commentEnd === -1 ? selectorList.length : commentEnd + 2;
-        current += selectorList.slice(index, nextIndex);
-        index = nextIndex - 1;
-        continue;
-      }
-      if (char === "[") bracketDepth += 1;
-      else if (char === "]") bracketDepth = Math.max(0, bracketDepth - 1);
-      else if (char === "(") parenDepth += 1;
-      else if (char === ")") parenDepth = Math.max(0, parenDepth - 1);
-      if (char === "," && bracketDepth === 0 && parenDepth === 0) {
-        selectors.push(current);
-        current = "";
-      } else current += char;
-    }
-    selectors.push(current);
-    return selectors;
-  }
-
-  function isolateSelectorList(selectorList, assetName) {
-    return splitSelectorList(selectorList).map((selector) => isolateSelector(selector, assetName)).join(",");
-  }
-
-  function isolateSelector(selector, assetName) {
-    const leadingWhitespace = selector.match(/^\\s*/)?.[0] ?? "";
-    const trailingWhitespace = selector.match(/\\s*$/)?.[0] ?? "";
-    const trimmed = selector.trim();
-    assertSafeSelector(trimmed, assetName);
-    if (trimmed.includes(":host")) {
-      return leadingWhitespace + isolateHostSelector(trimmed, assetName) + trailingWhitespace;
-    }
-    return leadingWhitespace + widgetPackageScopeSelector + " " + trimmed + trailingWhitespace;
-  }
-
-  function isolateHostSelector(selector, assetName) {
-    if (!selector.startsWith(":host")) {
-      throw new Error('Unsupported :host selector "' + selector + '" in CSS asset "' + assetName + '" cannot be isolated safely.');
-    }
-    const match = /^:host(?:\\(([^()]*)\\))?($|[\\s>+~].*)/.exec(selector);
-    if (!match) {
-      throw new Error('Unsupported :host selector "' + selector + '" in CSS asset "' + assetName + '" cannot be isolated safely.');
-    }
-    const hostSelector = (match[1] ?? "").trim();
-    const selectorAfterHost = match[2] ?? "";
-    const firstSelectorAfterHostIndex = skipCssWhitespaceAndComments(selectorAfterHost, 0);
-    const firstSelectorAfterHostChar = selectorAfterHost[firstSelectorAfterHostIndex] ?? "";
-    if (hostSelector.includes(",") || hasTopLevelHostArgumentCombinator(hostSelector) || firstSelectorAfterHostChar === "+" || firstSelectorAfterHostChar === "~" || (hostSelector && (unsafeSelectorPattern.test(hostSelector) || hasUnsafeUniversalSelector(hostSelector)))) {
-      throw new Error('Unsupported :host selector "' + selector + '" in CSS asset "' + assetName + '" cannot be isolated safely.');
-    }
-    return widgetPackageScopeSelector + hostSelector + selectorAfterHost;
-  }
-
-  function hasTopLevelHostArgumentCombinator(value) {
-    let quote = "";
-    let bracketDepth = 0;
-    let hasSelectorBeforeWhitespace = false;
-    let index = 0;
-    while (index < value.length) {
-      const char = value[index];
-      if (quote) {
-        if (char === "\\\\") index += 2;
-        else {
-          if (char === quote) quote = "";
-          index += 1;
-        }
-        continue;
-      }
-      if (char === '"' || char === "'") {
-        quote = char;
-        index += 1;
-        continue;
-      }
-      if (char === "[") {
-        bracketDepth += 1;
-        hasSelectorBeforeWhitespace = true;
-      } else if (char === "]") {
-        bracketDepth = Math.max(0, bracketDepth - 1);
-      } else if (bracketDepth === 0 && (char === "+" || char === "~" || char === ">")) {
-        return true;
-      } else if (bracketDepth === 0 && /\\s/.test(char)) {
-        const nextIndex = skipCssWhitespaceAndComments(value, index);
-        if (hasSelectorBeforeWhitespace && nextIndex < value.length) return true;
-        index = nextIndex;
-        continue;
-      } else if (bracketDepth === 0 && cssStartsWithComment(value, index)) {
-        const nextIndex = skipCssWhitespaceAndComments(value, index);
-        if (hasSelectorBeforeWhitespace && nextIndex < value.length) return true;
-        index = nextIndex;
-        continue;
-      } else if (bracketDepth === 0 && !/\\s/.test(char)) {
-        hasSelectorBeforeWhitespace = true;
-      }
-      index += 1;
-    }
-    return false;
-  }
-
-  function assertSafeSelector(selector, assetName) {
-    if (!selector || unsafeSelectorPattern.test(selector) || hasUnsafeUniversalSelector(selector) || pseudoElementOnlySelectorPattern.test(selector)) {
-      throw new Error('Unsafe selector "' + selector + '" in CSS asset "' + assetName + '" cannot be isolated safely.');
-    }
-  }
-
-  function hasUnsafeUniversalSelector(selector) {
-    universalSelectorPattern.lastIndex = 0;
-    let match;
-    while ((match = universalSelectorPattern.exec(selector)) !== null) {
-      const universalStart = match.index + match[1].length;
-      if (!hasAnchoringSelectorBefore(selector.slice(0, universalStart))) return true;
-    }
-    return false;
-  }
-
-  function hasAnchoringSelectorBefore(value) {
-    return stripCssComments(value).replace(/[\\s>+~]+/g, "").length > 0;
-  }
-
-  function namespaceKeyframesBlock(block, keyframeNames, fontFamilyNames, customPropertyNames, assetName) {
-    let output = "";
-    let index = 0;
-    while (index < block.length) {
-      if (cssStartsWithComment(block, index)) {
-        const commentEnd = block.indexOf("*/", index + 2);
-        const nextIndex = commentEnd === -1 ? block.length : commentEnd + 2;
-        output += block.slice(index, nextIndex);
-        index = nextIndex;
-        continue;
-      }
-      if (/\\s/.test(block[index] ?? "")) {
-        output += block[index];
-        index += 1;
-        continue;
-      }
-      const keyframeRule = readRulePrelude(block, index, block.length);
-      if (keyframeRule.blockStart === -1) {
-        output += block.slice(index, keyframeRule.end);
-        index = keyframeRule.end;
-        continue;
-      }
-      const keyframeBlockEnd = findMatchingBrace(block, keyframeRule.blockStart, block.length);
-      if (keyframeBlockEnd === -1) {
-        output += block.slice(index);
-        index = block.length;
-        continue;
-      }
-      output += keyframeRule.prelude + "{" + namespaceStyleBlock(block.slice(keyframeRule.blockStart + 1, keyframeBlockEnd), keyframeNames, fontFamilyNames, customPropertyNames, assetName) + "}";
-      index = keyframeBlockEnd + 1;
-    }
-    return output;
-  }
-
-  function namespaceStyleBlock(block, keyframeNames, fontFamilyNames, customPropertyNames, assetName) {
-    assertNoNestedCssBlock(block, assetName);
-    return rewriteDeclarationBlock(block, (propertyName, rawProperty, value) => {
-      const nextProperty = namespaceCustomPropertyName(rawProperty, propertyName, customPropertyNames);
-      let nextValue = value;
-      if (propertyName === "animation" || propertyName === "-webkit-animation") {
-        nextValue = namespaceAnimationShorthandValue(nextValue, keyframeNames);
-      } else if (propertyName === "animation-name" || propertyName === "-webkit-animation-name") {
-        nextValue = namespaceAnimationNameValue(nextValue, keyframeNames);
-      } else if (propertyName === "font-family") {
-        nextValue = namespaceFontFamilyValue(nextValue, fontFamilyNames);
-      } else if (propertyName === "font") {
-        nextValue = namespaceFontShorthandValue(nextValue, fontFamilyNames, assetName);
-      }
-      if (propertyName === "container-name") {
-        nextValue = namespaceContainerNameValue(nextValue);
-      } else if (propertyName === "container") {
-        nextValue = namespaceContainerShorthandValue(nextValue);
-      }
-      if (propertyName === "transition" || propertyName === "transition-property" || propertyName === "will-change") {
-        nextValue = namespaceCustomPropertyIdentifierValue(nextValue, customPropertyNames);
-      }
-      if (propertyName === "view-transition-name" || propertyName === "scroll-timeline-name" || propertyName === "animation-timeline") {
-        nextValue = namespaceCssGlobalNameValue(nextValue);
-      }
-      nextValue = namespaceCustomPropertyReferencesValue(nextValue, customPropertyNames);
-      return { property: nextProperty, value: nextValue };
-    });
-  }
-
-  function namespaceFontFaceBlock(block, fontFamilyNames, customPropertyNames) {
-    return rewriteDeclarationBlock(block, (propertyName, rawProperty, value) => {
-      const nextValue = propertyName === "font-family"
-        ? namespaceFontFamilyValue(value, fontFamilyNames)
-        : namespaceCustomPropertyReferencesValue(value, customPropertyNames);
-      return { property: rawProperty, value: nextValue };
-    });
-  }
-
-  function namespaceAnimationNameValue(value, keyframeNames) {
-    return replaceCssValueOutsideProtectedRanges(value, (chunk) => {
-      let nextChunk = chunk;
-      for (const [name, scopedName] of keyframeNames) {
-        nextChunk = nextChunk.replace(new RegExp("(^|[^A-Za-z0-9_-])" + escapeRegExp(name) + "(?=$|[^A-Za-z0-9_-])", "g"), (_match, prefix) => prefix + scopedName);
-      }
-      return nextChunk;
-    });
-  }
-
-  function namespaceAnimationShorthandValue(value, keyframeNames) {
-    if (keyframeNames.size === 0) return value;
-    return splitCssCommaList(value).map((item) => rewriteAnimationShorthandItem(item, keyframeNames)).join(",");
-  }
-
-  function rewriteAnimationShorthandItem(item, keyframeNames) {
-    const tokens = readCssValueTokens(item);
-    const reservedState = createAnimationShorthandReservedState();
-    let output = "";
-    let lastIndex = 0;
-    for (const token of tokens) {
-      const scopedName = keyframeNames.get(token.text);
-      const isReservedToken = consumeAnimationShorthandReservedToken(token.text, reservedState);
-      if (!scopedName || isReservedToken) continue;
-      output += item.slice(lastIndex, token.start) + scopedName;
-      lastIndex = token.end;
-    }
-    return output + item.slice(lastIndex);
-  }
-
-  function createAnimationShorthandReservedState() {
-    return {
-      duration: false,
-      delay: false,
-      timingFunction: false,
-      iterationCount: false,
-      direction: false,
-      fillMode: false,
-      playState: false,
-    };
-  }
-
-  function consumeAnimationShorthandReservedToken(token, state) {
-    const lower = token.toLowerCase();
-    if (isAnimationTimeToken(token)) {
-      if (!state.duration) {
-        state.duration = true;
-        return true;
-      }
-      if (!state.delay) {
-        state.delay = true;
-        return true;
-      }
-      return false;
-    }
-    if (!state.timingFunction && isAnimationTimingFunctionToken(lower)) {
-      state.timingFunction = true;
-      return true;
-    }
-    if (!state.iterationCount && isAnimationIterationCountToken(token, lower)) {
-      state.iterationCount = true;
-      return true;
-    }
-    if (!state.direction && animationDirectionKeywords.has(lower)) {
-      state.direction = true;
-      return true;
-    }
-    if (!state.fillMode && animationFillModeKeywords.has(lower)) {
-      state.fillMode = true;
-      return true;
-    }
-    if (!state.playState && animationPlayStateKeywords.has(lower)) {
-      state.playState = true;
-      return true;
-    }
-    if (animationGlobalKeywords.has(lower)) return true;
-    return false;
-  }
-
-  function isAnimationTimeToken(token) {
-    return /^-?(?:\\d+|\\d*\\.\\d+)(?:ms|s)$/i.test(token);
-  }
-
-  function isAnimationTimingFunctionToken(lowerToken) {
-    return animationTimingFunctionKeywords.has(lowerToken) || lowerToken.includes("(");
-  }
-
-  function isAnimationIterationCountToken(token, lowerToken) {
-    return lowerToken === "infinite" || /^-?(?:\\d+|\\d*\\.\\d+)$/.test(token);
-  }
-
-  const animationTimingFunctionKeywords = new Set([
-    "ease",
-    "ease-in",
-    "ease-in-out",
-    "ease-out",
-    "linear",
-    "step-end",
-    "step-start",
-  ]);
-  const animationDirectionKeywords = new Set(["normal", "reverse", "alternate", "alternate-reverse"]);
-  const animationFillModeKeywords = new Set(["none", "forwards", "backwards", "both"]);
-  const animationPlayStateKeywords = new Set(["running", "paused"]);
-  const animationGlobalKeywords = new Set(["inherit", "initial", "revert", "revert-layer", "unset"]);
-
-  function namespaceFontFamilyValue(value, fontFamilyNames) {
-    if (fontFamilyNames.size === 0) return value;
-    const important = splitCssImportantSuffix(value);
-    return splitCssCommaList(important.value).map((family) => namespaceSingleFontFamily(family, fontFamilyNames)).join(",") + important.suffix;
-  }
-
-  function namespaceFontShorthandValue(value, fontFamilyNames, assetName) {
-    if (fontFamilyNames.size === 0) return value;
-    const familyStart = findFontShorthandFamilyStart(value);
-    if (familyStart === -1) {
-      if (fontShorthandReferencesScopedFontFamily(value, fontFamilyNames)) {
-        throw new Error('Unsupported font shorthand in CSS asset "' + assetName + '" cannot be isolated safely. Use font-family with font-style/font-weight/font-size longhands, or use a supported font shorthand with an explicit font-size before the family list.');
-      }
-      return value;
-    }
-    return value.slice(0, familyStart) + namespaceFontFamilyValue(value.slice(familyStart), fontFamilyNames);
-  }
-
-  function fontShorthandReferencesScopedFontFamily(value, fontFamilyNames) {
-    const tokens = readCssValueTokens(value);
-    return tokens.some((token) => fontFamilyNames.has(normalizeFontFamilyName(token.text)));
-  }
-
-  function splitCssImportantSuffix(value) {
-    const match = /!\\s*important\\s*$/i.exec(value);
-    if (!match) return { value, suffix: "" };
-    return {
-      value: value.slice(0, match.index),
-      suffix: value.slice(match.index),
-    };
-  }
-
-  function namespaceSingleFontFamily(family, fontFamilyNames) {
-    const leadingWhitespace = family.match(/^\\s*/)?.[0] ?? "";
-    const trailingWhitespace = family.match(/\\s*$/)?.[0] ?? "";
-    const trimmed = family.trim();
-    const normalized = normalizeFontFamilyName(trimmed);
-    const scopedName = fontFamilyNames.get(normalized);
-    if (!scopedName) return family;
-    const quote = trimmed[0] === '"' || trimmed[0] === "'" ? trimmed[0] : "";
-    return leadingWhitespace + (quote ? quote + scopedName + quote : scopedName) + trailingWhitespace;
-  }
-
-  function normalizeFontFamilyName(value) {
-    const trimmed = value.trim();
-    if ((trimmed.startsWith('"') && trimmed.endsWith('"')) || (trimmed.startsWith("'") && trimmed.endsWith("'"))) {
-      return trimmed.slice(1, -1);
-    }
-    return trimmed;
-  }
-
-  function rewritePropertyHeader(header, customPropertyNames) {
-    let nextHeader = header;
-    for (const [name, scopedName] of customPropertyNames) {
-      nextHeader = nextHeader.replace(new RegExp("(@property\\\\s+)" + escapeRegExp(name) + "(?=$|[\\\\s{])", "g"), (_match, prefix) => prefix + scopedName);
-    }
-    return nextHeader;
-  }
-
-  function rewriteLayerPrelude(prelude) {
-    const match = /^(@layer\\b)([\\s\\S]*)$/i.exec(prelude);
-    if (!match) return prelude;
-    const layerList = match[2] ?? "";
-    if (!layerList.trim()) return prelude;
-    return match[1] + splitCssCommaList(layerList).map(namespaceLayerName).join(",");
-  }
-
-  function namespaceLayerName(layerName) {
-    const leadingWhitespace = layerName.match(/^\\s*/)?.[0] ?? "";
-    const trailingWhitespace = layerName.match(/\\s*$/)?.[0] ?? "";
-    const trimmed = layerName.trim();
-    return trimmed ? leadingWhitespace + widgetPackageLayerPrefix + trimmed + trailingWhitespace : layerName;
-  }
-
-  function rewriteContainerAtRuleHeader(header) {
-    if (!header.endsWith("{")) return header;
-    return rewriteContainerAtRulePrelude(header.slice(0, -1)) + "{";
-  }
-
-  function rewriteContainerAtRulePrelude(prelude) {
-    const match = /^(@container\\b)([\\s\\S]*)$/i.exec(prelude);
-    if (!match) return prelude;
-    const condition = match[2] ?? "";
-    const leadingWhitespace = condition.match(/^\\s*/)?.[0] ?? "";
-    const conditionBody = condition.slice(leadingWhitespace.length);
-    if (!conditionBody || conditionBody.startsWith("(") || /^(?:style|scroll-state)\\s*\\(/.test(conditionBody)) {
-      return prelude;
-    }
-
-    const tokens = readCssValueTokens(conditionBody);
-    const nameToken = tokens[0];
-    if (!nameToken || nameToken.start !== 0 || isContainerQueryConditionKeyword(nameToken.text) || isReservedContainerName(nameToken.text) || nameToken.text.includes("(")) {
-      return prelude;
-    }
-    return match[1] + leadingWhitespace + namespaceContainerName(nameToken.text) + conditionBody.slice(nameToken.end);
-  }
-
-  function namespaceContainerNameValue(value) {
-    return replaceCssValueOutsideProtectedRanges(value, (chunk) => namespaceContainerNamesInChunk(chunk));
-  }
-
-  function namespaceContainerShorthandValue(value) {
-    const slashIndex = findTopLevelSlash(value);
-    if (slashIndex !== -1) {
-      return namespaceContainerNameValue(value.slice(0, slashIndex)) + value.slice(slashIndex);
-    }
-
-    const trimmed = stripCssComments(value).trim().toLowerCase();
-    if (isReservedContainerName(trimmed) || containerTypeKeywords.has(trimmed)) return value;
-    return namespaceContainerNameValue(value);
-  }
-
-  function namespaceContainerNamesInChunk(chunk) {
-    return chunk.replace(/(^|[^A-Za-z0-9_-])([A-Za-z_][A-Za-z0-9_-]*|-[A-Za-z_][A-Za-z0-9_-]*)(?=$|[^A-Za-z0-9_-])/g, (_match, prefix, name) => {
-      if (isReservedContainerName(name)) return prefix + name;
-      return prefix + namespaceContainerName(name);
-    });
-  }
-
-  function namespaceContainerName(name) {
-    return widgetPackageContainerPrefix + name;
-  }
-
-  function isReservedContainerName(name) {
-    return containerNameReservedKeywords.has(name.toLowerCase());
-  }
-
-  function isContainerQueryConditionKeyword(name) {
-    return containerQueryConditionKeywords.has(name.toLowerCase());
-  }
-
-  const containerTypeKeywords = new Set(["normal", "size", "inline-size", "scroll-state"]);
-  const containerQueryConditionKeywords = new Set(["not", "and", "or"]);
-  const containerNameReservedKeywords = new Set(["none", "inherit", "initial", "revert", "revert-layer", "unset"]);
-
-  function namespaceCustomPropertyName(rawProperty, propertyName, customPropertyNames) {
-    const scopedName = customPropertyNames.get(propertyName);
-    if (!scopedName) return rawProperty;
-    return rawProperty.replace(new RegExp(escapeRegExp(propertyName) + "(?=\\\\s*$)"), scopedName);
-  }
-
-  function namespaceCustomPropertyReferences(block, customPropertyNames) {
-    return rewriteDeclarationBlock(block, (propertyName, rawProperty, value) => ({
-      property: rawProperty,
-      value: namespaceCustomPropertyReferencesValue(value, customPropertyNames),
-    }));
-  }
-
-  function namespaceCustomPropertyReferencesValue(value, customPropertyNames) {
-    if (customPropertyNames.size === 0) return value;
-    return replaceCssValueOutsideProtectedRanges(value, (chunk) => {
-      let nextChunk = chunk;
-      for (const [name, scopedName] of customPropertyNames) {
-        nextChunk = nextChunk.replace(new RegExp("(\\\\bvar\\\\(\\\\s*)" + escapeRegExp(name) + "(?=\\\\s*[,)])", "g"), (_match, prefix) => prefix + scopedName);
-      }
-      return nextChunk;
-    });
-  }
-
-  function namespaceCustomPropertyIdentifierValue(value, customPropertyNames) {
-    if (customPropertyNames.size === 0) return value;
-    return replaceCssValueOutsideProtectedRanges(value, (chunk) => {
-      let nextChunk = chunk;
-      for (const [name, scopedName] of customPropertyNames) {
-        nextChunk = nextChunk.replace(new RegExp("(^|[^A-Za-z0-9_-])" + escapeRegExp(name) + "(?=$|[^A-Za-z0-9_-])", "g"), (_match, prefix) => prefix + scopedName);
-      }
-      return nextChunk;
-    });
-  }
-
-  function namespaceCssGlobalNameValue(value) {
-    return replaceCssValueOutsideProtectedRanges(value, (chunk) => {
-      return chunk.replace(/(^|[^A-Za-z0-9_-])(--[A-Za-z0-9_-]+|[A-Za-z_][A-Za-z0-9_-]*|-[A-Za-z_][A-Za-z0-9_-]*)(?=$|[^A-Za-z0-9_-])/g, (_match, prefix, name, offset, source) => {
-        const nextChar = source[offset + prefix.length + name.length] ?? "";
-        const beforeName = source.slice(0, offset + prefix.length);
-        if (nextChar === "(" || /(?:^|[^A-Za-z0-9_-])var\\s*\\($/i.test(beforeName) || cssGlobalNameReservedKeywords.has(name.toLowerCase())) return prefix + name;
-        return prefix + widgetPackageCssGlobalNamePrefix + name;
-      });
-    });
-  }
-
-  const cssGlobalNameReservedKeywords = new Set(["auto", "none", "inherit", "initial", "revert", "revert-layer", "unset"]);
-
-  function assertNoNestedCssBlock(block, assetName) {
-    let index = 0;
-    let quote = "";
-    let parenDepth = 0;
-    while (index < block.length) {
-      const char = block[index];
-      if (quote) {
-        if (char === "\\\\") index += 2;
-        else {
-          if (char === quote) quote = "";
-          index += 1;
-        }
-        continue;
-      }
-      if (cssStartsWithComment(block, index)) {
-        const commentEnd = block.indexOf("*/", index + 2);
-        index = commentEnd === -1 ? block.length : commentEnd + 2;
-        continue;
-      }
-      if (char === '"' || char === "'") {
-        quote = char;
-        index += 1;
-        continue;
-      }
-      if (char === "(") parenDepth += 1;
-      else if (char === ")") parenDepth = Math.max(0, parenDepth - 1);
-      else if (char === "{" && parenDepth === 0) {
-        throw new Error('Unsupported nested CSS rule in CSS asset "' + assetName + '" cannot be isolated safely. Compile nested CSS before building the widget package.');
-      }
-      index += 1;
-    }
-  }
-
-  function rewriteDeclarationBlock(block, rewriteDeclaration) {
-    let output = "";
-    let declarationStart = 0;
-    let index = 0;
-    let quote = "";
-    let parenDepth = 0;
-    while (index < block.length) {
-      const char = block[index];
-      if (quote) {
-        if (char === "\\\\") index += 2;
-        else {
-          if (char === quote) quote = "";
-          index += 1;
-        }
-        continue;
-      }
-      if (cssStartsWithComment(block, index)) {
-        const commentEnd = block.indexOf("*/", index + 2);
-        index = commentEnd === -1 ? block.length : commentEnd + 2;
-        continue;
-      }
-      if (char === '"' || char === "'") {
-        quote = char;
-        index += 1;
-        continue;
-      }
-      if (char === "(") parenDepth += 1;
-      else if (char === ")") parenDepth = Math.max(0, parenDepth - 1);
-      else if (char === ";" && parenDepth === 0) {
-        output += rewriteDeclarationSegment(block.slice(declarationStart, index), rewriteDeclaration) + ";";
-        declarationStart = index + 1;
-      }
-      index += 1;
-    }
-    return output + rewriteDeclarationSegment(block.slice(declarationStart), rewriteDeclaration);
-  }
-
-  function rewriteDeclarationSegment(segment, rewriteDeclaration) {
-    const colonIndex = findDeclarationColon(segment);
-    if (colonIndex === -1) return segment;
-    const rawProperty = segment.slice(0, colonIndex);
-    const rawPropertyName = stripCssComments(rawProperty).trim();
-    const propertyName = rawPropertyName.startsWith("--") ? rawPropertyName : rawPropertyName.toLowerCase();
-    if (!propertyName) return segment;
-    const rewritten = rewriteDeclaration(propertyName, rawProperty, segment.slice(colonIndex + 1));
-    return rewritten.property + ":" + rewritten.value;
-  }
-
-  function findDeclarationColon(segment) {
-    let index = 0;
-    let quote = "";
-    let parenDepth = 0;
-    while (index < segment.length) {
-      const char = segment[index];
-      if (quote) {
-        if (char === "\\\\") index += 2;
-        else {
-          if (char === quote) quote = "";
-          index += 1;
-        }
-        continue;
-      }
-      if (cssStartsWithComment(segment, index)) {
-        const commentEnd = segment.indexOf("*/", index + 2);
-        index = commentEnd === -1 ? segment.length : commentEnd + 2;
-        continue;
-      }
-      if (char === '"' || char === "'") {
-        quote = char;
-        index += 1;
-        continue;
-      }
-      if (char === "(") parenDepth += 1;
-      else if (char === ")") parenDepth = Math.max(0, parenDepth - 1);
-      else if (char === ":" && parenDepth === 0) return index;
-      index += 1;
-    }
-    return -1;
-  }
-
-  function replaceCssValueOutsideProtectedRanges(value, replaceChunk) {
-    let output = "";
-    let chunkStart = 0;
-    let index = 0;
-    while (index < value.length) {
-      if (cssStartsWithComment(value, index)) {
-        output += replaceChunk(value.slice(chunkStart, index));
-        const commentEnd = value.indexOf("*/", index + 2);
-        const nextIndex = commentEnd === -1 ? value.length : commentEnd + 2;
-        output += value.slice(index, nextIndex);
-        index = nextIndex;
-        chunkStart = index;
-        continue;
-      }
-      const char = value[index];
-      if (char === '"' || char === "'") {
-        output += replaceChunk(value.slice(chunkStart, index));
-        const stringEnd = findCssStringEnd(value, index);
-        output += value.slice(index, stringEnd);
-        index = stringEnd;
-        chunkStart = index;
-        continue;
-      }
-      if (isCssUrlFunctionStart(value, index)) {
-        output += replaceChunk(value.slice(chunkStart, index));
-        const urlEnd = findCssFunctionEnd(value, value.indexOf("(", index));
-        output += value.slice(index, urlEnd);
-        index = urlEnd;
-        chunkStart = index;
-        continue;
-      }
-      index += 1;
-    }
-    return output + replaceChunk(value.slice(chunkStart));
-  }
-
-  function findCssStringEnd(value, quoteIndex) {
-    const quote = value[quoteIndex];
-    let index = quoteIndex + 1;
-    while (index < value.length) {
-      const char = value[index];
-      if (char === "\\\\") index += 2;
-      else {
-        index += 1;
-        if (char === quote) return index;
-      }
-    }
-    return value.length;
-  }
-
-  function findCssFunctionEnd(value, openParenIndex) {
-    let index = openParenIndex + 1;
-    let depth = 1;
-    let quote = "";
-    while (index < value.length) {
-      const char = value[index];
-      if (quote) {
-        if (char === "\\\\") index += 2;
-        else {
-          if (char === quote) quote = "";
-          index += 1;
-        }
-        continue;
-      }
-      if (char === '"' || char === "'") {
-        quote = char;
-        index += 1;
-        continue;
-      }
-      if (cssStartsWithComment(value, index)) {
-        const commentEnd = value.indexOf("*/", index + 2);
-        index = commentEnd === -1 ? value.length : commentEnd + 2;
-        continue;
-      }
-      if (char === "(") depth += 1;
-      else if (char === ")") {
-        depth -= 1;
-        if (depth === 0) return index + 1;
-      }
-      index += 1;
-    }
-    return value.length;
-  }
-
-  function findFontShorthandFamilyStart(value) {
-    const tokens = readCssValueTokens(value);
-    for (let index = 0; index < tokens.length; index += 1) {
-      const token = tokens[index];
-      if (!token || !isFontSizeToken(token.text)) continue;
-      if (findTopLevelSlash(token.text) !== -1) return token.end;
-      const slashIndex = skipCssWhitespaceAndComments(value, token.end);
-      if (value[slashIndex] !== "/") return token.end;
-      const lineHeightStart = skipCssWhitespaceAndComments(value, slashIndex + 1);
-      const lineHeightToken = tokens.find((candidate) => candidate.start >= lineHeightStart);
-      return lineHeightToken ? lineHeightToken.end : token.end;
-    }
-    return -1;
-  }
-
-  function readCssValueTokens(value) {
-    const tokens = [];
-    let index = 0;
-    while (index < value.length) {
-      if (/\\s/.test(value[index] ?? "")) {
-        index += 1;
-        continue;
-      }
-      if (cssStartsWithComment(value, index)) {
-        const commentEnd = value.indexOf("*/", index + 2);
-        index = commentEnd === -1 ? value.length : commentEnd + 2;
-        continue;
-      }
-      const start = index;
-      const char = value[index];
-      if (char === '"' || char === "'") {
-        index = findCssStringEnd(value, index);
-      } else {
-        let parenDepth = 0;
-        while (index < value.length) {
-          if (cssStartsWithComment(value, index)) {
-            if (parenDepth === 0) break;
-            const commentEnd = value.indexOf("*/", index + 2);
-            index = commentEnd === -1 ? value.length : commentEnd + 2;
-            continue;
-          }
-          const tokenChar = value[index];
-          if ((tokenChar === '"' || tokenChar === "'") && parenDepth > 0) {
-            index = findCssStringEnd(value, index);
-            continue;
-          }
-          if (tokenChar === "(") parenDepth += 1;
-          else if (tokenChar === ")") parenDepth = Math.max(0, parenDepth - 1);
-          if (parenDepth === 0 && /\\s/.test(tokenChar ?? "")) break;
-          index += 1;
-        }
-      }
-      tokens.push({ start, end: index, text: value.slice(start, index) });
-    }
-    return tokens;
-  }
-
-  function isFontSizeToken(token) {
-    const slashIndex = findTopLevelSlash(token);
-    const sizeToken = slashIndex === -1 ? token : token.slice(0, slashIndex);
-    return /^(?:xx-small|x-small|small|medium|large|x-large|xx-large|xxx-large|smaller|larger|math|(?:\\d+|\\d*\\.\\d+)(?:px|em|rem|%|vh|vw|vmin|vmax|ch|ex|cap|ic|lh|rlh|cm|mm|q|in|pc|pt))$/i.test(sizeToken) || isFontSizeFunctionToken(sizeToken);
-  }
-
-  function isFontSizeFunctionToken(token) {
-    return /^(?:calc|clamp|min|max|var|env|abs|sign|round|mod|rem|sin|cos|tan|asin|acos|atan|atan2|pow|sqrt|hypot|log|exp)\\(/i.test(token);
-  }
-
-  function findTopLevelSlash(value) {
-    let index = 0;
-    let quote = "";
-    let parenDepth = 0;
-    while (index < value.length) {
-      const char = value[index];
-      if (quote) {
-        if (char === "\\\\") index += 2;
-        else {
-          if (char === quote) quote = "";
-          index += 1;
-        }
-        continue;
-      }
-      if (char === '"' || char === "'") {
-        quote = char;
-        index += 1;
-        continue;
-      }
-      if (char === "(") parenDepth += 1;
-      else if (char === ")") parenDepth = Math.max(0, parenDepth - 1);
-      else if (char === "/" && parenDepth === 0) return index;
-      index += 1;
-    }
-    return -1;
-  }
-
-  function skipCssWhitespaceAndComments(value, startIndex) {
-    let index = startIndex;
-    while (index < value.length) {
-      if (/\\s/.test(value[index] ?? "")) {
-        index += 1;
-        continue;
-      }
-      if (cssStartsWithComment(value, index)) {
-        const commentEnd = value.indexOf("*/", index + 2);
-        index = commentEnd === -1 ? value.length : commentEnd + 2;
-        continue;
-      }
-      return index;
-    }
-    return index;
-  }
-
-  function cssStartsWithComment(value, index) {
-    return value[index] === "/" && value[index + 1] === "*";
-  }
-
-  function isCssUrlFunctionStart(value, index) {
-    return /^url\\s*\\(/i.test(value.slice(index)) && !/[A-Za-z0-9_-]/.test(value[index - 1] ?? "");
-  }
-
-  function stripCssComments(value) {
-    return value.replace(/\\/\\*[\\s\\S]*?\\*\\//g, "");
-  }
-
-  function splitCssCommaList(value) {
-    const parts = [];
-    let current = "";
-    let quote = "";
-    let parenDepth = 0;
-    for (let index = 0; index < value.length; index += 1) {
-      const char = value[index];
-      if (quote) {
-        current += char;
-        if (char === "\\\\") {
-          index += 1;
-          current += value[index] ?? "";
-        } else if (char === quote) quote = "";
-        continue;
-      }
-      if (char === '"' || char === "'") {
-        quote = char;
-        current += char;
-        continue;
-      }
-      if (char === "(") parenDepth += 1;
-      else if (char === ")") parenDepth = Math.max(0, parenDepth - 1);
-      if (char === "," && parenDepth === 0) {
-        parts.push(current);
-        current = "";
-      } else current += char;
-    }
-    parts.push(current);
-    return parts;
-  }
-
-  function escapeRegExp(value) {
-    return value.replace(/[.*+?^\${}()|[\\]\\\\]/g, "\\\\$&");
-  }
-
-  function encodeCssIdentifier(value) {
-    return Array.from(value, (char) => char.codePointAt(0)?.toString(16).padStart(2, "0") ?? "00").join("_");
-  }
-
   return {
 ${configFileSource}    publicDir: false,
+    define: fluidWidgetDefineInvariants,
     resolve: {
       conditions: [
-        "fluid-widget-authoring",
         "module",
         "browser",
         "development|production",
       ],
     },
-    plugins: [fluidWidgetBuildInvariantsPlugin(), fluidWidgetCssIsolationPlugin()],
+    plugins: [fluidWidgetBuildInvariantsPlugin()],
     build: createFluidWidgetBuildInvariants(),
   };
 })()`;
@@ -5223,12 +3777,22 @@ function stableStringify(value) {
 	return `${JSON.stringify(value, null, 2)}\n`;
 }
 function readCliVersion() {
-	const startDir = path.dirname(fileURLToPath(import.meta.url));
-	for (const packageJsonPath of candidatePackageJsonPaths(startDir)) try {
-		const packageJson = require(packageJsonPath);
-		if (packageJson.name === "@fluid-app/fluid-cli-portal" && typeof packageJson.version === "string") return packageJson.version;
-	} catch {}
-	return "0.0.0";
+	return resolveCliVersionFromPackageMetadata(path.dirname(fileURLToPath(import.meta.url)), require);
+}
+function resolveCliVersionFromPackageMetadata(startDir, loadPackageMetadata) {
+	for (const packageJsonPath of candidatePackageJsonPaths(startDir)) {
+		let packageJson;
+		try {
+			packageJson = loadPackageMetadata(packageJsonPath);
+		} catch (error) {
+			if (isModuleResolutionError(error)) continue;
+			throw new Error("Failed to read Fluid CLI package metadata.", { cause: error });
+		}
+		if (!isRecord$2(packageJson) || packageJson.name !== "@fluid-app/fluid-cli-portal") continue;
+		if (typeof packageJson.version !== "string" || packageJson.version.length === 0) throw new Error("Fluid CLI package metadata does not declare a valid version.");
+		return packageJson.version;
+	}
+	throw new Error("Unable to find Fluid CLI package metadata.");
 }
 function resolveViteCliPathFromRequire(moduleRequire) {
 	try {
@@ -5276,22 +3840,6 @@ var WidgetPackageUploadError = class extends Error {
 		this.code = code;
 	}
 };
-const SESSION_ARRAY_KEYS = [
-	"uploads",
-	"artifacts",
-	"signedUploads",
-	"signed_uploads",
-	"signedUrls",
-	"signed_urls",
-	"uploadUrls",
-	"upload_urls"
-];
-const SESSION_RECORD_KEYS = [
-	"signedUrls",
-	"signed_urls",
-	"uploadUrls",
-	"upload_urls"
-];
 function buildWidgetPackageArtifactPayload(artifact) {
 	return {
 		path: artifact.path,
@@ -5333,7 +3881,7 @@ function getWidgetPackageCompleteUploadRoute(owner, version) {
 async function requestWidgetPackageUploadSession(client, owner, request) {
 	const payload = buildWidgetPackageUploadSessionPayload(request);
 	try {
-		return normalizeWidgetPackageUploadSession(owner.kind === "company" ? await fluid_os_v0_create_widget_package_version(client, payload) : await client.post(getWidgetPackageUploadSessionRoute(owner), payload), request.version, request.artifacts);
+		return normalizeWidgetPackageUploadSession(owner.kind === "company" ? await fluidOs.fluid_os_v0_create_widget_package_version(client, payload) : await client.post(getWidgetPackageUploadSessionRoute(owner), payload), request.version, request.artifacts);
 	} catch (err) {
 		if (err instanceof WidgetPackageUploadError) throw err;
 		throw new WidgetPackageUploadError("SESSION_REQUEST_FAILED", `Failed to create widget package upload session: ${formatUnknownError(err)}`);
@@ -5372,7 +3920,7 @@ async function uploadWidgetPackageArtifacts(session, artifacts, fetchImpl = fetc
 async function completeWidgetPackageUpload(client, owner, version, packageKey, artifacts) {
 	const payload = buildWidgetPackageCompleteUploadPayload(packageKey, artifacts);
 	try {
-		return normalizeWidgetPackageCompleteResponse(owner.kind === "company" ? await fluid_os_v0_complete_widget_package_version_upload(client, version, payload) : await client.post(getWidgetPackageCompleteUploadRoute(owner, version), payload), version);
+		return normalizeWidgetPackageCompleteResponse(owner.kind === "company" ? await fluidOs.fluid_os_v0_complete_widget_package_version_upload(client, version, payload) : await client.post(getWidgetPackageCompleteUploadRoute(owner, version), payload), version);
 	} catch (err) {
 		if (err instanceof WidgetPackageUploadError) throw err;
 		throw new WidgetPackageUploadError("COMPLETE_UPLOAD_FAILED", `Failed to complete widget package upload: ${formatUnknownError(err)}`);
@@ -5395,128 +3943,53 @@ async function publishWidgetPackageVersion(options) {
 	};
 }
 function normalizeWidgetPackageUploadSession(response, requestedVersion, requestedArtifacts) {
-	const record = requireRecord(response, "Upload session response must be a JSON object.");
-	const responseVersion = getResponseVersion(record);
-	if (responseVersion && responseVersion !== requestedVersion) throw new WidgetPackageUploadError("INVALID_SESSION_RESPONSE", `Upload session response version "${responseVersion}" did not match requested version "${requestedVersion}".`);
-	const version = responseVersion ?? requestedVersion;
-	const nestedRecord = getNestedVersionRecord(record);
-	const uploads = getSignedUploads(nestedRecord ? [record, nestedRecord] : [record], requestedArtifacts);
-	const missingUploadPaths = requestedArtifacts.map((artifact) => artifact.path).filter((artifactPath) => !uploads.some((upload) => upload.path === artifactPath));
+	const record = requireRecord(response, "INVALID_SESSION_RESPONSE", "Upload session response must be a JSON object.");
+	requireFiniteNumberProperty(record, "version_id", "INVALID_SESSION_RESPONSE");
+	requireStringProperty(record, "artifact_base_url", "INVALID_SESSION_RESPONSE");
+	const uploadValues = record["uploads"];
+	if (!Array.isArray(uploadValues)) throw new WidgetPackageUploadError("INVALID_SESSION_RESPONSE", "Upload session response must contain an \"uploads\" array.");
+	const requestedArtifactsByPath = new Map(requestedArtifacts.map((artifact) => [artifact.path, artifact]));
+	const seenUploadPaths = /* @__PURE__ */ new Set();
+	const uploads = uploadValues.map((value, index) => {
+		const upload = requireRecord(value, "INVALID_SESSION_RESPONSE", `Upload session uploads[${index}] must be a JSON object.`);
+		const path = requireStringProperty(upload, "path", "INVALID_SESSION_RESPONSE");
+		const url = requireStringProperty(upload, "upload_url", "INVALID_SESSION_RESPONSE");
+		requireStringProperty(upload, "public_url", "INVALID_SESSION_RESPONSE");
+		const requestedArtifact = requestedArtifactsByPath.get(path);
+		if (!requestedArtifact) throw new WidgetPackageUploadError("INVALID_SESSION_RESPONSE", `Upload session response included unexpected artifact "${path}".`);
+		if (seenUploadPaths.has(path)) throw new WidgetPackageUploadError("INVALID_SESSION_RESPONSE", `Upload session response included duplicate artifact "${path}".`);
+		seenUploadPaths.add(path);
+		return {
+			path,
+			url,
+			contentType: requestedArtifact.contentType,
+			headers: {}
+		};
+	});
+	const missingUploadPaths = requestedArtifacts.map((artifact) => artifact.path).filter((artifactPath) => !seenUploadPaths.has(artifactPath));
 	if (missingUploadPaths.length > 0) throw new WidgetPackageUploadError("INVALID_SESSION_RESPONSE", `Upload session response is missing signed URLs for artifact(s): ${missingUploadPaths.join(", ")}.`);
 	return {
-		version,
+		version: requestedVersion,
 		uploads,
 		raw: response
 	};
 }
 function normalizeWidgetPackageCompleteResponse(response, requestedVersion) {
-	if (response == null) return {
-		version: requestedVersion,
-		raw: response
-	};
-	const record = requireRecord(response, "Complete upload response must be a JSON object or empty response.");
-	const nested = getNestedVersionRecord(record) ?? record;
-	const responseVersion = getResponseVersion(nested);
-	if (responseVersion && responseVersion !== requestedVersion) throw new WidgetPackageUploadError("INVALID_COMPLETE_RESPONSE", `Complete upload response version "${responseVersion}" did not match requested version "${requestedVersion}".`);
-	const packageKey = getStringProperty(nested, "package_key") ?? getStringProperty(nested, "packageKey") ?? getStringProperty(nested, "packageId");
-	const status = getStringProperty(nested, "status") ?? getStringProperty(nested, "state");
+	const record = requireRecord(response, "INVALID_COMPLETE_RESPONSE", "Complete upload response must be a JSON object.");
+	const responseVersion = requireStringProperty(record, "version", "INVALID_COMPLETE_RESPONSE");
+	if (responseVersion !== requestedVersion) throw new WidgetPackageUploadError("INVALID_COMPLETE_RESPONSE", `Complete upload response version "${responseVersion}" did not match requested version "${requestedVersion}".`);
+	const packageKey = requireStringProperty(record, "packageId", "INVALID_COMPLETE_RESPONSE");
+	const status = requireStringProperty(record, "status", "INVALID_COMPLETE_RESPONSE");
+	requireStringProperty(record, "scriptUrl", "INVALID_COMPLETE_RESPONSE");
+	requireStringProperty(record, "manifestUrl", "INVALID_COMPLETE_RESPONSE");
+	requireStringArrayProperty(record, "cssUrls", "INVALID_COMPLETE_RESPONSE");
 	return {
-		version: responseVersion ?? requestedVersion,
-		...status ? { status } : {},
-		...packageKey ? { packageKey } : {},
+		version: responseVersion,
+		status,
+		packageKey,
 		raw: response
 	};
 }
-function getSignedUploads(records, requestedArtifacts) {
-	const uploads = [];
-	for (const record of records) {
-		for (const key of SESSION_ARRAY_KEYS) {
-			const value = record[key];
-			if (!Array.isArray(value)) continue;
-			for (const item of value) {
-				const upload = signedUploadFromRecord(item, requestedArtifacts);
-				if (upload) uploads.push(upload);
-			}
-		}
-		for (const key of SESSION_RECORD_KEYS) {
-			const value = record[key];
-			if (!isRecord$1(value) || Array.isArray(value)) continue;
-			for (const [artifactPath, uploadValue] of Object.entries(value)) {
-				const upload = signedUploadFromKeyedValue(artifactPath, uploadValue, requestedArtifacts);
-				if (upload) uploads.push(upload);
-			}
-		}
-	}
-	return dedupeUploads(uploads);
-}
-function signedUploadFromRecord(value, requestedArtifacts) {
-	if (!isRecord$1(value)) return null;
-	const artifactPath = readFirstString(value, [
-		"path",
-		"key",
-		"artifactPath",
-		"artifact_path",
-		"artifactKey",
-		"artifact_key",
-		"name"
-	]);
-	const url = readFirstString(value, [
-		"url",
-		"signedUrl",
-		"signed_url",
-		"uploadUrl",
-		"upload_url"
-	]);
-	if (!artifactPath || !url) return null;
-	const requestedArtifact = findRequestedArtifact(requestedArtifacts, artifactPath);
-	const contentType = readFirstString(value, [
-		"contentType",
-		"content_type",
-		"expectedContentType",
-		"expected_content_type"
-	]) ?? requestedArtifact?.contentType;
-	if (!contentType) return null;
-	return {
-		path: artifactPath,
-		url,
-		contentType,
-		headers: getHeaders(value["headers"])
-	};
-}
-function signedUploadFromKeyedValue(artifactPath, value, requestedArtifacts) {
-	const requestedArtifact = findRequestedArtifact(requestedArtifacts, artifactPath);
-	if (typeof value === "string") {
-		if (!requestedArtifact) return null;
-		return {
-			path: artifactPath,
-			url: value,
-			contentType: requestedArtifact.contentType,
-			headers: {}
-		};
-	}
-	if (!isRecord$1(value)) return null;
-	const url = readFirstString(value, [
-		"url",
-		"signedUrl",
-		"signed_url",
-		"uploadUrl",
-		"upload_url"
-	]);
-	if (!url) return null;
-	const contentType = readFirstString(value, [
-		"contentType",
-		"content_type",
-		"expectedContentType",
-		"expected_content_type"
-	]) ?? requestedArtifact?.contentType;
-	if (!contentType) return null;
-	return {
-		path: artifactPath,
-		url,
-		contentType,
-		headers: getHeaders(value["headers"])
-	};
-}
 function normalizeHeaderName(name) {
 	return name.toLowerCase();
 }
@@ -5529,57 +4002,47 @@ function mergeUploadHeaders(headers, contentType) {
 	merged["Content-Type"] = contentType;
 	return merged;
 }
-function dedupeUploads(uploads) {
-	const deduped = /* @__PURE__ */ new Map();
-	for (const upload of uploads) deduped.set(upload.path, upload);
-	return Array.from(deduped.values());
-}
-function findRequestedArtifact(requestedArtifacts, artifactPath) {
-	return requestedArtifacts.find((artifact) => artifact.path === artifactPath);
-}
-function requireRecord(value, message) {
-	if (!isRecord$1(value) || Array.isArray(value)) throw new WidgetPackageUploadError("INVALID_RESPONSE", message);
+function requireRecord(value, code, message) {
+	if (!isRecord$1(value) || Array.isArray(value)) throw new WidgetPackageUploadError(code, message);
 	return value;
 }
 function isRecord$1(value) {
 	return typeof value === "object" && value !== null;
 }
-function getStringProperty(record, key) {
+function requireStringProperty(record, key, code) {
 	const value = record[key];
 	if (typeof value === "string" && value.trim().length > 0) return value;
-	if (typeof value === "number" && Number.isFinite(value)) return String(value);
-}
-function readFirstString(record, keys) {
-	for (const key of keys) {
-		const value = getStringProperty(record, key);
-		if (value) return value;
-	}
-}
-function getHeaders(value) {
-	if (!isRecord$1(value) || Array.isArray(value)) return {};
-	const headers = {};
-	for (const [key, headerValue] of Object.entries(value)) if (typeof headerValue === "string") headers[key] = headerValue;
-	return headers;
-}
-function getResponseVersion(record) {
-	const directVersion = getStringProperty(record, "version");
-	if (directVersion) return directVersion;
-	const nested = getNestedVersionRecord(record);
-	return nested ? getStringProperty(nested, "version") : void 0;
-}
-function getNestedVersionRecord(record) {
-	const candidates = [
-		record["portal_widget_package_version"],
-		record["widget_package_version"],
-		record["package_version"]
-	];
-	for (const candidate of candidates) if (isRecord$1(candidate) && !Array.isArray(candidate)) return candidate;
+	throw new WidgetPackageUploadError(code, `Response field "${key}" must be a non-empty string.`);
+}
+function requireFiniteNumberProperty(record, key, code) {
+	const value = record[key];
+	if (typeof value === "number" && Number.isFinite(value)) return value;
+	throw new WidgetPackageUploadError(code, `Response field "${key}" must be a finite number.`);
+}
+function requireStringArrayProperty(record, key, code) {
+	const value = record[key];
+	if (Array.isArray(value) && value.every((entry) => typeof entry === "string" && entry.trim().length > 0)) return value;
+	throw new WidgetPackageUploadError(code, `Response field "${key}" must be an array of non-empty strings.`);
 }
 function formatUnknownError(err) {
 	const base = err instanceof Error ? err.message : String(err);
-	if (isRecord$1(err) && "data" in err) return `${base} — ${JSON.stringify(err.data)}`;
+	if (isRecord$1(err) && "data" in err) return `${base} — ${safeStringify(err.data)}`;
 	return base;
 }
+function safeStringify(value) {
+	const seen = /* @__PURE__ */ new WeakSet();
+	try {
+		return JSON.stringify(value, (_key, item) => {
+			if (typeof item === "bigint") return `${item}n`;
+			if (typeof item !== "object" || item === null) return item;
+			if (seen.has(item)) return "[Circular]";
+			seen.add(item);
+			return item;
+		}) ?? String(value);
+	} catch {
+		return "[unserializable error data]";
+	}
+}
 //#endregion
 //#region src/commands/widget-package-publish.ts
 async function publishWidgetRuntimeArtifacts(options, dependencies = {}) {
@@ -6074,7 +4537,7 @@ const createVersionCommand = new Command("create").description("Create a new ver
 	console.log(chalk.bold("Creating version..."));
 	let result;
 	try {
-		result = await fluid_os_v0_create_fluid_osversion(client, definitionId);
+		result = await fluidOs.fluid_os_v0_create_fluid_osversion(client, definitionId);
 	} catch (err) {
 		console.error(chalk.red("Error:") + " Failed to create version — " + (err instanceof Error ? err.message : String(err)));
 		process.exit(1);
@@ -6092,7 +4555,7 @@ const createVersionCommand = new Command("create").description("Create a new ver
 	if (options.activate) {
 		console.log("Activating version...");
 		try {
-			await fluid_os_v0_update_fluid_osversion(client, definitionId, version.id, { version: { active: true } });
+			await fluidOs.fluid_os_v0_update_fluid_osversion(client, definitionId, version.id, { version: { active: true } });
 		} catch (err) {
 			console.error(chalk.red("Error:") + " Failed to activate version — " + (err instanceof Error ? err.message : String(err)));
 			process.exit(1);
@@ -6107,7 +4570,7 @@ const listVersionCommand = new Command("list").description("List all versions of
 	const definitionId = await requireDefinitionId();
 	let result;
 	try {
-		result = await fluid_os_v0_list_fluid_osversions(client, definitionId);
+		result = await fluidOs.fluid_os_v0_list_fluid_osversions(client, definitionId);
 	} catch (err) {
 		console.error(chalk.red("Error:") + " Failed to list versions — " + (err instanceof Error ? err.message : String(err)));
 		process.exit(1);
@@ -6150,7 +4613,7 @@ const activateVersionCommand = new Command("activate").description("Activate a s
 	console.log();
 	console.log(chalk.bold("Activating version..."));
 	try {
-		await fluid_os_v0_update_fluid_osversion(client, definitionId, versionId, { version: { active: true } });
+		await fluidOs.fluid_os_v0_update_fluid_osversion(client, definitionId, versionId, { version: { active: true } });
 	} catch (err) {
 		console.error(chalk.red("Error:") + " Failed to activate version — " + (err instanceof Error ? err.message : String(err)));
 		process.exit(1);
@@ -6233,6 +4696,6 @@ const plugin = {
 	}
 };
 //#endregion
-export { CANONICAL_PROJECT_NAME, FILE_SYSTEM_ERRORS, GitError, TEMPLATES, TEMPLATE_REPO_URL, WIDGET_PACKAGE_BUILDER_VERSION, WidgetPackageUploadError, buildIdToSlugMap, buildNavigationIdToSlugMap, buildSharedWidgetPackage, buildSnapshot, buildThemeIdToSlugMap, buildWidgetPackageCompleteUploadPayload, buildWidgetPackageDescriptor, buildWidgetPackageUploadSessionPayload, categorizeChanges, cloneCommand, collectWidgetPackageArtifacts, completeWidgetPackageUpload, computeArtifactMetadata, computeFileHash, copyTemplate, copyTemplateSafe, createAuthenticatedWidgetPackageClient, createCommand, createDirectory, createDirectorySafe, createPortalGitCredential, createPublishManifestMetadata, createWidgetPackageEntrySource, createWidgetPackagePublishRequest, plugin as default, deployCommand, deriveScreenSlug, deriveSlug, diffAgainstSnapshot, directoryExists, doctorCommand, ensureGitAvailable, fileExists, getArtifactContentType, getInstallCommand, getOriginUrl, getRunCommand, getSdkVersion, getSdkVersionSafe, getTemplatePaths, getWidgetPackageCompleteUploadRoute, getWidgetPackageUploadSessionRoute, gitAheadBehindVsFetchHead, gitAutoCommit, gitClone, gitFetch, gitInit, gitMergeFastForward, gitMissingError, gitPush, hasUncommittedChanges, installDependencies, isGitAvailable, isGitRepo, loadSourceWidgetPackages, normalizeWidgetPackageCompleteResponse, normalizeWidgetPackageUploadSession, pathExists, portalGitCredentialPath, printDryRunSessionPayload, printRuntimeOnlyNotice, printWidgetPublishSummary, promptProjectConfig, publishWidgetPackageVersion, publishWidgetRuntimeArtifacts, pullCommand, pushCommand, readFileSafe, readMappings, readSnapshot, removeMapping, requestWidgetPackageUploadSession, resolveIdToSlug, resolvePortalWidgetSourceConfig, resolveSlugToId, rewriteProjectName, runPackageManager, runPortalGitSync, scaffoldFromGitHub, sha256, slugFromPath, topLevelWidgetCommand, transformNavigation, transformNavigationItems, transformProfile, transformScreen, transformTheme, updateMapping, uploadWidgetPackageArtifacts, validateCrossReferences, validateSingleSourceWidgetPackage, validateWidgetPublishOutDir, versionCommand, widgetCommand, writeFileSafe, writeFluidrcProfile, writeMappings, writeSnapshot };
+export { CANONICAL_PROJECT_NAME, FILE_SYSTEM_ERRORS, GitError, TEMPLATES, TEMPLATE_REPO_URL, WIDGET_PACKAGE_BUILDER_VERSION, WidgetPackageUploadError, buildIdToSlugMap, buildNavigationIdToSlugMap, buildSharedWidgetPackage, buildSnapshot, buildThemeIdToSlugMap, buildWidgetPackageCompleteUploadPayload, buildWidgetPackagePublishManifest, buildWidgetPackageUploadSessionPayload, categorizeChanges, cloneCommand, collectWidgetPackageArtifacts, completeWidgetPackageUpload, computeArtifactMetadata, computeFileHash, copyTemplate, copyTemplateSafe, createAuthenticatedWidgetPackageClient, createCommand, createDirectory, createDirectorySafe, createPortalGitCredential, createPublishManifestMetadata, createWidgetPackageEntrySource, createWidgetPackagePublishRequest, plugin as default, deployCommand, deriveScreenSlug, deriveSlug, diffAgainstSnapshot, directoryExists, doctorCommand, ensureGitAvailable, fileExists, getArtifactContentType, getInstallCommand, getOriginUrl, getRunCommand, getSdkVersion, getSdkVersionSafe, getTemplatePaths, getWidgetPackageCompleteUploadRoute, getWidgetPackageUploadSessionRoute, gitAheadBehindVsFetchHead, gitAutoCommit, gitClone, gitFetch, gitInit, gitMergeFastForward, gitMissingError, gitPush, hasUncommittedChanges, installDependencies, isGitAvailable, isGitRepo, loadSourceWidgetPackages, normalizeWidgetPackageCompleteResponse, normalizeWidgetPackageUploadSession, pathExists, portalGitCredentialPath, printDryRunSessionPayload, printRuntimeOnlyNotice, printWidgetPublishSummary, promptProjectConfig, publishWidgetPackageVersion, publishWidgetRuntimeArtifacts, pullCommand, pushCommand, readFileSafe, readMappings, readSnapshot, removeMapping, requestWidgetPackageUploadSession, resolveIdToSlug, resolvePortalWidgetSourceConfig, resolveSlugToId, rewriteProjectName, runPackageManager, runPortalGitSync, scaffoldFromGitHub, sha256, slugFromPath, topLevelWidgetCommand, transformNavigation, transformNavigationItems, transformProfile, transformScreen, transformTheme, updateMapping, uploadWidgetPackageArtifacts, validateCrossReferences, validateSingleSourceWidgetPackage, validateWidgetPublishOutDir, versionCommand, widgetCommand, writeFileSafe, writeFluidrcProfile, writeMappings, writeSnapshot };
 
 //# sourceMappingURL=index.mjs.map