webloom-framework 0.1.0 → 0.2.0

package/dist/{chunk-KGNF36DZ.js → chunk-URY3E6UH.js}

@@ -136,11 +136,8 @@ var PluginGraphValidationError = class extends Error {
 function unique(values) {
   return [...new Set(values)];
 }
-function isPluginExecution(value) {
-  return typeof value === "string" && value.trim().length > 0;
-}
-function isPluginLifetime(value) {
-  return typeof value === "string" && value.trim().length > 0;
+function isRuntimeKind(value) {
+  return value === "window-main" || value === "shared-worker";
 }
 function isRecord(value) {
   return typeof value === "object" && value !== null;
@@ -228,11 +225,11 @@ function validateRuntimeUnitDependencyContracts(manifests) {
         if (typeof dependency.contractVersion !== "string" || dependency.contractVersion.trim() === "") {
           errors.push("contractVersion\uFF08\u5951\u7EA6\u7248\u672C\uFF09\u4E0D\u80FD\u4E3A\u7A7A");
         }
-        if (!isPluginExecution(dependency.sourceExecution)) {
-          errors.push("sourceExecution\uFF08\u63D0\u4F9B\u8005\u8FD0\u884C\u73AF\u5883\uFF09\u65E0\u6548");
+        if (!isRuntimeKind(dependency.sourceRuntime)) {
+          errors.push("sourceRuntime\uFF08\u63D0\u4F9B\u8005 Runtime\uFF09\u65E0\u6548");
         }
-        if (!isPluginLifetime(dependency.scope)) {
-          errors.push("scope\uFF08\u63D0\u4F9B\u8005\u4F5C\u7528\u57DF\uFF09\u65E0\u6548");
+        if (unitValue.runtime !== void 0 && !isRuntimeKind(unitValue.runtime)) {
+          errors.push("runtime\uFF08\u76EE\u6807 Runtime\uFF09\u65E0\u6548");
         }
         if (dependency.reason !== void 0 && typeof dependency.reason !== "string") {
           errors.push("reason\uFF08\u4F9D\u8D56\u8BF4\u660E\uFF09\u5FC5\u987B\u662F\u5B57\u7B26\u4E32");
@@ -250,15 +247,34 @@ function validateRuntimeUnitDependencyContracts(manifests) {
       });
     });
   }
+  for (const manifest of manifests) {
+    for (const unit of manifest.units ?? []) {
+      if (!isRuntimeKind(unit.runtime)) {
+        diagnostics.push({
+          code: "plugin.runtime_invalid",
+          ids: [manifest.id, unit.id],
+          message: `\u63D2\u4EF6 "${manifest.id}" \u7684\u8FD0\u884C\u5355\u5143 "${unit.id}" \u58F0\u660E\u4E86\u4E0D\u652F\u6301\u7684 Runtime\uFF1Bv1 \u4EC5\u652F\u6301 window-main/shared-worker`
+        });
+      }
+    }
+  }
   return diagnostics;
 }
-function selectedRuntimeUnits(manifest, execution) {
+function unitRuntime(unit) {
+  return unit.runtime;
+}
+function isRuntimeUnit(unit) {
+  return typeof unit.id === "string" && unit.id.length > 0 && isRuntimeKind(unit.runtime);
+}
+function selectedRuntimeUnits(manifest, runtime) {
   const units = manifest.units ?? [];
   if (units.length === 0) return [];
-  if (execution !== void 0) return units.filter((unit) => unit.execution === execution);
-  return units.length === 1 ? [...units] : [];
+  if (runtime !== void 0) return units.filter(
+    (unit) => isRuntimeUnit(unit) && unit.runtime === runtime
+  );
+  return units.length === 1 && isRuntimeUnit(units[0]) ? [units[0]] : [];
 }
-function dependenciesOfManifest(manifest, execution) {
+function dependenciesOfManifest(manifest, runtime) {
   const byCapability = /* @__PURE__ */ new Map();
   const add = (dependency) => {
     const previous = byCapability.get(dependency.capability);
@@ -267,8 +283,8 @@ function dependenciesOfManifest(manifest, execution) {
     }
   };
   const units = manifest.units ?? [];
-  if (units.length > 1 && execution === void 0) return [];
-  const selectedUnits = selectedRuntimeUnits(manifest, execution);
+  if (units.length > 1 && runtime === void 0) return [];
+  const selectedUnits = selectedRuntimeUnits(manifest, runtime);
   if (units.length > 0 && selectedUnits.length === 0) return [];
   if (units.length === 0) {
     for (const dependency of manifest.dependencies ?? []) add(dependency);
@@ -279,12 +295,12 @@ function dependenciesOfManifest(manifest, execution) {
   }
   return [...byCapability.values()];
 }
-function providesOfManifest(manifest, execution) {
+function providesOfManifest(manifest, runtime) {
   const units = manifest.units ?? [];
-  if (units.length > 1 && execution === void 0) return [];
+  if (units.length > 1 && runtime === void 0) return [];
   return unique([
     ...units.length === 0 ? manifest.provides ?? [] : [],
-    ...selectedRuntimeUnits(manifest, execution).flatMap((unit) => unit.provides ?? [])
+    ...selectedRuntimeUnits(manifest, runtime).flatMap((unit) => unit.provides ?? [])
   ]);
 }
 function runtimeUnitProviders(manifests, capability) {
@@ -292,11 +308,11 @@ function runtimeUnitProviders(manifests, capability) {
   for (const manifest of manifests) {
     for (const unit of manifest.units ?? []) {
       if (!unit.provides?.includes(capability)) continue;
+      if (!isRuntimeUnit(unit)) continue;
       providers.push({
         pluginId: manifest.id,
         unitId: unit.id,
-        execution: unit.execution,
-        lifetime: unit.lifetime,
+        runtime: unit.runtime,
         contractVersion: unit.providedContracts?.[capability]
       });
     }
@@ -305,12 +321,12 @@ function runtimeUnitProviders(manifests, capability) {
 }
 function matchingRuntimeUnitProviders(manifests, dependency) {
   return runtimeUnitProviders(manifests, dependency.capability).filter(
-    (provider) => provider.execution === dependency.sourceExecution && provider.lifetime === dependency.scope && provider.contractVersion === dependency.contractVersion
+    (provider) => provider.runtime === dependency.sourceRuntime && provider.contractVersion === dependency.contractVersion
   );
 }
-function runtimeDependenciesForValidation(manifest, execution) {
+function runtimeDependenciesForValidation(manifest, runtime) {
   const units = manifest.units ?? [];
-  const selected = execution === void 0 ? units : units.filter((unit) => unit.execution === execution);
+  const selected = runtime === void 0 ? units : units.filter((unit) => unitRuntime(unit) === runtime);
   return selected.flatMap((unit) => unit.dependencies ?? []);
 }
 function buildPluginGraph(manifests, options = {}) {
@@ -322,9 +338,9 @@ function buildPluginGraph(manifests, options = {}) {
   const unitGraph = {};
   const enabled = options.enabledPluginIds;
   for (const manifest of manifests) {
-    const selectedUnits = selectedRuntimeUnits(manifest, options.execution);
-    const provided = providesOfManifest(manifest, options.execution);
-    const dependencyEntries = dependenciesOfManifest(manifest, options.execution);
+    const selectedUnits = selectedRuntimeUnits(manifest, options.runtime);
+    const provided = providesOfManifest(manifest, options.runtime);
+    const dependencyEntries = dependenciesOfManifest(manifest, options.runtime);
     dependencyDetails[manifest.id] = dependencyEntries.map((dependency) => ({ ...dependency }));
     const deps = unique(dependencyEntries.map((dependency) => dependency.capability));
     optionalDependencies[manifest.id] = unique(
@@ -337,7 +353,7 @@ function buildPluginGraph(manifests, options = {}) {
       unitGraph[unitKey] = {
         pluginId: manifest.id,
         unitId: unit.id,
-        execution: unit.execution,
+        runtime: unit.runtime,
         dependencies: unique((unit.dependencies ?? []).map((dependency) => dependency.capability)),
         dependencyDetails: (unit.dependencies ?? []).map((dependency) => ({ ...dependency })),
         provides: unique(unit.provides ?? []),
@@ -391,7 +407,7 @@ function buildPluginGraph(manifests, options = {}) {
       visited.add(pluginId);
       return;
     }
-    for (const dependency of dependenciesOfManifest(manifest, options.execution)) {
+    for (const dependency of dependenciesOfManifest(manifest, options.runtime)) {
       if (dependency.optional) continue;
       const provider = firstProvider.get(dependency.capability);
       if (provider) visit(provider);
@@ -439,9 +455,12 @@ function validatePluginGraph(manifests, options = {}) {
     }
   }
   for (const manifest of manifests) {
-    const strictDependencies = runtimeDependenciesForValidation(manifest, options.execution);
+    const strictDependencies = runtimeDependenciesForValidation(manifest, options.runtime);
     for (const dependency of strictDependencies) {
       if (dependency.optional) continue;
+      if (options.externalRuntimeDependencies && options.runtime !== void 0 && dependency.sourceRuntime !== options.runtime) {
+        continue;
+      }
       const matches = matchingRuntimeUnitProviders(manifests, dependency);
       if (matches.length > 0) {
         if (matches.length > 1 && !multiProvider.has(dependency.capability)) {
@@ -474,9 +493,9 @@ function validatePluginGraph(manifests, options = {}) {
   }
   for (const manifest of manifests) {
     const strictDependencyCapabilities = new Set(
-      runtimeDependenciesForValidation(manifest, options.execution).map((dependency) => dependency.capability)
+      runtimeDependenciesForValidation(manifest, options.runtime).map((dependency) => dependency.capability)
     );
-    for (const dependency of dependenciesOfManifest(manifest, options.execution)) {
+    for (const dependency of dependenciesOfManifest(manifest, options.runtime)) {
       if (dependency.optional) continue;
       if (strictDependencyCapabilities.has(dependency.capability)) continue;
       const provided = (graph.providers?.[dependency.capability]?.length ?? 0) > 0 || builtins.has(dependency.capability);
@@ -2189,24 +2208,26 @@ function lifecycleStateFor(state, desired) {
       return desired ? "waiting" : "disabled";
   }
 }
-function selectedUnit(manifest, execution, defaultLifetime) {
+function selectedUnit(manifest, runtime) {
   const units = manifest.units ?? [];
   if (units.length > 1) {
-    const matches = execution === void 0 ? [] : units.filter((unit) => unit.execution === execution);
+    const matches = runtime === void 0 ? [] : units.filter(
+      (unit) => unit.runtime === runtime
+    );
     return matches.length === 1 ? matches[0] : void 0;
   }
   if (units.length === 1) {
-    return execution === void 0 || units[0]?.execution === execution ? units[0] : void 0;
+    const unit = units[0];
+    return unit && (runtime === void 0 || unit.runtime === runtime) && unit.runtime !== void 0 ? unit : void 0;
   }
+  const targetRuntime = runtime ?? "window-main";
   return {
     id: manifest.id,
-    execution: manifest.meta.execution ?? execution ?? "default",
-    lifetime: manifest.meta.lifetime ?? defaultLifetime,
+    runtime: targetRuntime,
     dependencies: manifest.dependencies?.map((dependency) => ({
       capability: dependency.capability,
       contractVersion: dependency.contractVersion ?? `${dependency.capability}.v1`,
-      sourceExecution: dependency.sourceExecution ?? "default",
-      scope: dependency.scope ?? defaultLifetime,
+      sourceRuntime: dependency.sourceRuntime ?? targetRuntime,
       ...dependency.reason !== void 0 ? { reason: dependency.reason } : {},
       ...dependency.optional !== void 0 ? { optional: dependency.optional } : {}
     })),
@@ -2216,17 +2237,12 @@ function selectedUnit(manifest, execution, defaultLifetime) {
     contribution: manifest.contribution
   };
 }
-function dependenciesFor(manifest, execution) {
-  return dependenciesOfManifest(manifest, execution);
+function dependenciesFor(manifest, runtime) {
+  return dependenciesOfManifest(manifest, runtime);
 }
 function setupFor(manifest, unit, options) {
   return options.runtimeUnitImplementationRegistry?.get(manifest.id, unit.id);
 }
-function stableValue(value) {
-  if (Array.isArray(value)) return `[${value.map(stableValue).join(",")}]`;
-  if (!value || typeof value !== "object") return JSON.stringify(value);
-  return `{${Object.entries(value).sort(([left], [right]) => left.localeCompare(right)).map(([key, item]) => `${JSON.stringify(key)}:${stableValue(item)}`).join(",")}}`;
-}
 var StartupCapabilityError = class extends Error {
   details;
   constructor(details, phase = "startup") {
@@ -2244,6 +2260,7 @@ var StartupPluginError = class extends Error {
   }
 };
 function createPluginHost(options = {}) {
+  const runtimeKind = options.runtime;
   const listeners = /* @__PURE__ */ new Set();
   let versionCounter = 0;
   let hostDisposed = false;
@@ -2290,7 +2307,6 @@ function createPluginHost(options = {}) {
   let intentSnapshot = options.pluginIntentCoordinator?.snapshot();
   let removeConfigSubscription = () => void 0;
   let removeIntentSubscription = () => void 0;
-  let removeScopeSubscription = () => void 0;
   let reconcilePromise;
   const desiredEnabledFor = (pluginId, manifest) => {
     if (manifest?.meta.startup === "required" || manifest?.meta.canDisable === false) return true;
@@ -2300,8 +2316,10 @@ function createPluginHost(options = {}) {
     return configStore.read()[pluginId] ?? manifest?.meta.defaultEnabled ?? false;
   };
   const desiredRevisionFor = (pluginId) => intentSnapshot?.desiredRevision[pluginId];
-  const selected = (manifest) => selectedUnit(manifest, options.execution, options.defaultLifetime ?? "plugin-instance");
-  const graph = () => buildPluginGraph([...knownManifests.values()], { execution: options.execution, enabledPluginIds: enabledSet });
+  const selected = (manifest) => selectedUnit(manifest, runtimeKind);
+  const graph = () => buildPluginGraph([
+    ...knownManifests.values()
+  ], { runtime: runtimeKind, enabledPluginIds: enabledSet });
   const validateManifest = (manifest) => {
     if (!manifest || typeof manifest.id !== "string" || manifest.id.trim() === "") throw new Error("Plugin id must be a non-empty string");
     if (typeof manifest.name !== "string" || manifest.name.trim() === "") throw new Error(`Plugin "${manifest.id}" name must be a non-empty string`);
@@ -2312,12 +2330,17 @@ function createPluginHost(options = {}) {
       throw new Error(`Plugin "${manifest.id}" required startup metadata is inconsistent`);
     }
     if (manifest.units !== void 0 && !Array.isArray(manifest.units)) throw new Error(`Plugin "${manifest.id}" units must be an array`);
+    if ((manifest.units?.length ?? 0) > 1 && runtimeKind === void 0) {
+      throw new Error(`Plugin "${manifest.id}" runtime must be explicit for multi-unit manifests`);
+    }
     if (manifest.units && manifest.units.length > 0) {
       const ids = /* @__PURE__ */ new Set();
       for (const unit of manifest.units) {
         if (!unit.id || ids.has(unit.id)) throw new Error(`Plugin "${manifest.id}" has duplicate or empty unit id`);
         ids.add(unit.id);
-        if (!unit.execution || !unit.lifetime) throw new Error(`Plugin "${manifest.id}" unit "${unit.id}" must define execution and lifetime`);
+        if (unit.runtime !== "window-main" && unit.runtime !== "shared-worker") {
+          throw new Error(`Plugin "${manifest.id}" unit "${unit.id}" declares an unsupported Runtime`);
+        }
       }
     }
     options.manifestValidator?.(manifest);
@@ -2325,9 +2348,18 @@ function createPluginHost(options = {}) {
   const isRequired = (manifest) => manifest.meta.startup === "required" || manifest.meta.canDisable === false;
   const missingDependencies = (manifest) => {
     const missing = [];
-    for (const dependency of dependenciesFor(manifest, options.execution)) {
+    const selectedUnitForDependencies = selected(manifest);
+    const localRuntime = selectedUnitForDependencies?.runtime ?? runtimeKind;
+    for (const dependency of dependenciesFor(manifest, runtimeKind)) {
       if (dependency.optional) continue;
-      if (!capabilities.has(dependency.capability)) missing.push(dependency.capability);
+      const sourceRuntime = dependency.sourceRuntime ?? localRuntime;
+      const contractVersion = dependency.contractVersion ?? `${dependency.capability}.v1`;
+      if (sourceRuntime !== void 0 && sourceRuntime !== localRuntime) {
+        const available = options.remoteServiceReferences?.().some((reference) => reference.status === "ready" && reference.runtime === sourceRuntime && reference.capabilityId === dependency.capability && reference.contractVersion === contractVersion) ?? false;
+        if (!available) missing.push(dependency.capability);
+      } else if (!capabilities.has(dependency.capability)) {
+        missing.push(dependency.capability);
+      }
     }
     return [...new Set(missing)];
   };
@@ -2335,21 +2367,21 @@ function createPluginHost(options = {}) {
     const unit = selected(manifest);
     if (!unit) {
       const units = manifest.units ?? [];
-      if (units.length > 0 && options.execution !== void 0 && !units.some((item) => item.execution === options.execution)) {
+      if (units.length > 0 && runtimeKind !== void 0 && !units.some((item) => item.runtime === runtimeKind)) {
         const snapshots = runtimeSnapshots?.() ?? [];
         if (snapshots.some((item) => item.pluginId === manifest.id)) return `runtime:${manifest.id}:unknown`;
       }
       return units.length > 0 ? `runtime:${manifest.id}:unit-unavailable` : void 0;
     }
+    const unavailable = options.runtimeUnitAvailability?.({
+      pluginId: manifest.id,
+      unitId: unit.id,
+      runtime: unit.runtime
+    });
+    if (unavailable) return unavailable;
     if (!setupFor(manifest, unit, options)) return `runtime:${manifest.id}:${unit.id}:implementation-unavailable`;
     return void 0;
   };
-  const resolveScope = (record, unit) => {
-    const resolver = options.scopeResolver;
-    if (!resolver) return { available: true, parent: rootScope, attributes: rootAttributes, key: stableValue(rootAttributes) };
-    return resolver.resolve({ pluginId: record.manifest.id, unitId: unit.id, lifetime: unit.lifetime, manifest: record.manifest });
-  };
-  const scopeKeyForResolution = (resolution, unit) => resolution.key ?? `${resolution.parent?.identity.scopeId ?? "root"}:${unit.lifetime}:${stableValue(resolution.attributes ?? rootAttributes)}`;
   const revokeContributions = (record) => {
     for (const contribution of record.contributions) {
       if (!contribution.active) continue;
@@ -2677,19 +2709,25 @@ function createPluginHost(options = {}) {
         bumpVersion();
         return;
       }
-      const resolution = resolveScope(record, unit);
-      if (!resolution.available) {
-        record.state = "blocked";
-        record.blockedBy = [resolution.reason ?? `scope:${unit.lifetime}:unavailable`];
-        bumpVersion();
-        return;
-      }
       const instanceId = makeInstanceId(record.manifest.id, unit.id);
       let scope;
       try {
-        const parent = resolution.parent ?? rootScope;
-        const attributes = Object.freeze({ ...resolution.attributes ?? rootAttributes });
-        scope = parent.child(unit.lifetime || "plugin-instance", { pluginId: record.manifest.id, attributes });
+        const attributes = Object.freeze({
+          ...rootAttributes,
+          ...options.runtimeUnitAttributes?.({
+            pluginId: record.manifest.id,
+            unitId: unit.id,
+            runtime: unit.runtime,
+            manifest: record.manifest
+          }) ?? {}
+        });
+        const parent = options.runtimeUnitParentScope?.({
+          pluginId: record.manifest.id,
+          unitId: unit.id,
+          runtime: unit.runtime,
+          manifest: record.manifest
+        }) ?? rootScope;
+        scope = parent.child("runtime-unit", { pluginId: record.manifest.id, attributes });
       } catch (error) {
         record.state = "blocked";
         record.blockedBy = [errorMessage4(error)];
@@ -2701,7 +2739,6 @@ function createPluginHost(options = {}) {
       record.instanceId = instanceId;
       record.unitId = unit.id;
       instanceAttributes.set(instanceId, scope.identity.attributes);
-      record.scopeKey = scopeKeyForResolution(resolution, unit);
       record.error = void 0;
       record.blockedBy = void 0;
       bumpVersion();
@@ -2712,7 +2749,7 @@ function createPluginHost(options = {}) {
         const result = await setup(context);
         record.teardown = typeof result === "function" ? result : void 0;
         await registerContribution(record, unit, instanceId, scope);
-        const declared = providesOfManifest(record.manifest, options.execution);
+        const declared = providesOfManifest(record.manifest, runtimeKind);
         const missingDeclarations = declared.filter((key) => !record.capabilities.has(key));
         if (missingDeclarations.length > 0) {
           throw new Error(`Plugin "${record.manifest.id}" did not provide declared capabilities: ${missingDeclarations.join(", ")}`);
@@ -2743,7 +2780,13 @@ function createPluginHost(options = {}) {
         record.instanceId = void 0;
         record.unitId = void 0;
         bumpVersion();
-        throw new StartupPluginError({ pluginId: record.manifest.id, capabilities: providesOfManifest(record.manifest, options.execution), state: record.state, error: record.error });
+        throw new StartupPluginError({
+          pluginId: record.manifest.id,
+          unitId: unit.id,
+          capabilities: providesOfManifest(record.manifest, runtimeKind),
+          state: record.state,
+          error: record.error
+        });
       }
     })();
     starting.set(pluginId, task);
@@ -2780,32 +2823,29 @@ function createPluginHost(options = {}) {
     if (reconcilePromise) return reconcilePromise;
     reconcilePromise = (async () => {
       const manifests = [...knownManifests.values()];
-      const ordered = orderManifestsByDependencies(manifests, options.execution);
-      const rotationTargets = manifests.filter((manifest) => {
-        const record = records.get(manifest.id);
-        if (!record || !desiredEnabledFor(manifest.id, manifest) || record.state !== "enabled" && record.state !== "starting") return false;
-        const unit = selected(record.manifest);
-        if (!unit || !options.scopeResolver) return false;
-        const resolution = resolveScope(record, unit);
-        return !resolution.available || record.scopeKey !== scopeKeyForResolution(resolution, unit);
-      });
-      const rotationPlan = [];
-      const planned = /* @__PURE__ */ new Set();
-      for (const target of rotationTargets) {
-        for (const item of collectDisablePlan(target.id)) {
-          if (planned.has(item.manifest.id)) continue;
-          planned.add(item.manifest.id);
-          rotationPlan.push(item);
-        }
-      }
-      for (const item of rotationPlan) {
-        await stopPlugin(item, "scope resolution changed", true);
-      }
+      const ordered = orderManifestsByDependencies(manifests, runtimeKind);
       for (const manifest of ordered) {
         const record = records.get(manifest.id);
         if (!record) continue;
+        if (record && (record.state === "enabled" || record.state === "starting")) {
+          const missing = missingDependencies(manifest);
+          const unavailable = runtimeUnavailable(manifest);
+          if (missing.length > 0 || unavailable) {
+            await stopPlugin(
+              record,
+              "runtime dependency unavailable",
+              true,
+              [.../* @__PURE__ */ new Set([...missing, ...unavailable ? [unavailable] : []])]
+            );
+          }
+        }
         if (desiredEnabledFor(manifest.id, manifest) && record.state !== "enabled" && record.state !== "starting") {
-          await enable(manifest.id);
+          try {
+            await enable(manifest.id);
+          } catch (error) {
+            if (!isRequired(manifest)) continue;
+            throw error;
+          }
         }
       }
       for (const manifest of manifests) {
@@ -2819,10 +2859,14 @@ function createPluginHost(options = {}) {
     });
     return reconcilePromise;
   };
-  function orderManifestsByDependencies(manifests, execution) {
+  function orderManifestsByDependencies(manifests, runtime) {
     const byId = new Map(manifests.map((manifest) => [manifest.id, manifest]));
     const providers = /* @__PURE__ */ new Map();
-    for (const manifest of manifests) for (const capability of providesOfManifest(manifest, execution)) if (!providers.has(capability)) providers.set(capability, manifest.id);
+    for (const manifest of manifests) {
+      for (const capability of providesOfManifest(manifest, runtime)) {
+        if (!providers.has(capability)) providers.set(capability, manifest.id);
+      }
+    }
     const visited = /* @__PURE__ */ new Set();
     const visiting = /* @__PURE__ */ new Set();
     const ordered = [];
@@ -2830,7 +2874,7 @@ function createPluginHost(options = {}) {
       if (visited.has(manifest.id)) return;
       if (visiting.has(manifest.id)) return;
       visiting.add(manifest.id);
-      for (const dependency of dependenciesFor(manifest, execution)) {
+      for (const dependency of dependenciesFor(manifest, runtime)) {
         if (dependency.optional) continue;
         const provider = providers.get(dependency.capability);
         const providerManifest = provider ? byId.get(provider) : void 0;
@@ -2868,7 +2912,14 @@ function createPluginHost(options = {}) {
         ...record.unitId ? { unitId: record.unitId } : {},
         ...record.blockedBy ? { blockedBy: [...record.blockedBy] } : {},
         ...record.cleanup ? { cleanup: record.cleanup } : {},
-        units: unit ? [{ pluginId, unitId: unit.id, execution: unit.execution, kind: record.state, ...record.instanceId ? { instanceId: record.instanceId } : {}, ...record.error ? { error: record.error } : {} }] : []
+        units: unit ? [{
+          pluginId,
+          unitId: unit.id,
+          runtime: unit.runtime,
+          kind: record.state,
+          ...record.instanceId ? { instanceId: record.instanceId } : {},
+          ...record.error ? { error: record.error } : {}
+        }] : []
       };
     },
     scope: (pluginId) => records.get(pluginId)?.scope,
@@ -2889,7 +2940,14 @@ function createPluginHost(options = {}) {
     },
     validateManifestSet(manifests) {
       for (const manifest of manifests) validateManifest(manifest);
-      validatePluginGraph([...manifests], { execution: options.execution, builtinCapabilities: new Set(capabilities.keys()) });
+      validatePluginGraph([...manifests], {
+        runtime: runtimeKind,
+        builtinCapabilities: /* @__PURE__ */ new Set([
+          ...capabilities.keys(),
+          ...(options.remoteServiceReferences?.() ?? []).map((reference) => reference.capabilityId)
+        ]),
+        externalRuntimeDependencies: options.externalRuntimeDependencies
+      });
     },
     provide(key, value) {
       if (hostDisposed) throw new LifecycleScopeRevokedError("Plugin host is disposed");
@@ -2912,7 +2970,15 @@ function createPluginHost(options = {}) {
         validateManifest(manifest);
         if (knownManifests.has(manifest.id)) throw new Error(`Plugin "${manifest.id}" is already registered`);
       }
-      validatePluginGraph(current, { execution: options.execution, builtinCapabilities: new Set(capabilities.keys()), allowMissingDependencies: false });
+      validatePluginGraph(current, {
+        runtime: runtimeKind,
+        builtinCapabilities: /* @__PURE__ */ new Set([
+          ...capabilities.keys(),
+          ...(options.remoteServiceReferences?.() ?? []).map((reference) => reference.capabilityId)
+        ]),
+        allowMissingDependencies: false,
+        externalRuntimeDependencies: options.externalRuntimeDependencies
+      });
       for (const manifest of current) {
         knownManifests.set(manifest.id, manifest);
         records.set(manifest.id, { manifest, state: "registered", disposeCallbacks: [], capabilities: /* @__PURE__ */ new Set(), contributions: [] });
@@ -2984,6 +3050,13 @@ function createPluginHost(options = {}) {
       );
       return { ok: true };
     },
+    suspend: async (pluginId, reason = "runtime identity changed") => {
+      const record = records.get(pluginId);
+      if (!record) return;
+      if (record.state !== "enabled" && record.state !== "starting") return;
+      beginStop(record, reason, true);
+      await stopPlugin(record, reason, true);
+    },
     unregister: async (pluginId) => {
       const record = records.get(pluginId);
       if (!record) return;
@@ -2999,7 +3072,6 @@ function createPluginHost(options = {}) {
       hostDisposed = true;
       removeConfigSubscription();
       removeIntentSubscription();
-      removeScopeSubscription();
       disposePromise = (async () => {
         for (const record of [...records.values()].reverse()) {
           if (record.state === "enabled" || record.state === "starting") {
@@ -3049,13 +3121,6 @@ function createPluginHost(options = {}) {
     void reconcile().catch(() => void 0);
     bumpVersion();
   });
-  if (options.scopeResolver?.subscribe) {
-    removeScopeSubscription = options.scopeResolver.subscribe(() => {
-      void reconcile().catch(() => void 0);
-      resourceStore.refreshRuntimeBindings();
-      bumpVersion();
-    });
-  }
   return host;
 }
 
@@ -3082,161 +3147,6 @@ function createRuntimeUnitImplementationRegistry(implementations = []) {
   };
 }
 
-// src/lifecycle/pluginIntentController.ts
-function makeAuthorityInstanceId() {
-  try {
-    if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
-      return `authority:${crypto.randomUUID()}`;
-    }
-  } catch {
-  }
-  return `authority:${Date.now().toString(36)}:${Math.random().toString(36).slice(2)}`;
-}
-function cloneSnapshot(snapshot) {
-  return {
-    revision: snapshot.revision,
-    desiredEnabled: { ...snapshot.desiredEnabled },
-    desiredRevision: { ...snapshot.desiredRevision }
-  };
-}
-function normalizeSnapshot(initial) {
-  const revision = Number.isSafeInteger(initial?.revision) && (initial?.revision ?? 0) >= 0 ? initial.revision : 0;
-  const desiredEnabled = {};
-  for (const [pluginId, value] of Object.entries(initial?.desiredEnabled ?? {})) {
-    if (typeof value === "boolean") desiredEnabled[pluginId] = value;
-  }
-  const desiredRevision = {};
-  for (const [pluginId, value] of Object.entries(initial?.desiredRevision ?? {})) {
-    if (Number.isSafeInteger(value) && value >= 0) desiredRevision[pluginId] = value;
-  }
-  return { revision, desiredEnabled, desiredRevision };
-}
-function commandFingerprint(command) {
-  return [
-    command.authorityInstanceId,
-    command.expectedRevision,
-    command.pluginId,
-    command.desiredEnabled ? "true" : "false"
-  ].join("\0");
-}
-function commandError(message) {
-  return { status: "command-conflict", commandId: "", message };
-}
-function createPluginIntentController(options = {}) {
-  const authorityInstanceId = options.authorityInstanceId ?? makeAuthorityInstanceId();
-  const maxCommandRecords = Math.max(1, Math.floor(options.maxCommandRecords ?? 256));
-  let current = normalizeSnapshot(options.initial);
-  const commandRecords = /* @__PURE__ */ new Map();
-  const listeners = /* @__PURE__ */ new Set();
-  let queue = Promise.resolve();
-  const notify = () => {
-    const snapshot = cloneSnapshot(current);
-    for (const listener of [...listeners]) {
-      try {
-        listener(snapshot);
-      } catch {
-      }
-    }
-  };
-  const process = async (command) => {
-    const candidate = command;
-    const commandId = typeof candidate?.commandId === "string" ? candidate.commandId : "";
-    if (!candidate || typeof candidate.authorityInstanceId !== "string" || candidate.authorityInstanceId.length === 0 || typeof candidate.pluginId !== "string" || candidate.pluginId.length === 0 || typeof candidate.desiredEnabled !== "boolean" || !Number.isSafeInteger(candidate.expectedRevision) || (candidate.expectedRevision ?? -1) < 0 || commandId.length === 0) {
-      const result = commandError("commandId\u3001pluginId \u548C expectedRevision \u5FC5\u987B\u662F\u6709\u6548\u503C");
-      return { ...result, commandId };
-    }
-    if (command.authorityInstanceId !== authorityInstanceId) {
-      return {
-        status: "stale-authority",
-        commandId: command.commandId,
-        expectedAuthorityInstanceId: authorityInstanceId
-      };
-    }
-    const fingerprint = commandFingerprint(command);
-    const existing = commandRecords.get(command.commandId);
-    if (existing) {
-      if (existing.fingerprint !== fingerprint) {
-        return {
-          status: "command-conflict",
-          commandId: command.commandId,
-          message: "\u76F8\u540C commandId \u7684\u547D\u4EE4\u5185\u5BB9\u4E0D\u540C\uFF0C\u62D2\u7EDD\u8986\u76D6\u539F\u547D\u4EE4"
-        };
-      }
-      return {
-        status: "duplicate",
-        commandId: command.commandId,
-        snapshot: cloneSnapshot(existing.result.snapshot),
-        persisted: true
-      };
-    }
-    if (command.expectedRevision !== current.revision) {
-      return {
-        status: "revision-conflict",
-        commandId: command.commandId,
-        snapshot: cloneSnapshot(current)
-      };
-    }
-    const next = {
-      revision: current.revision + 1,
-      desiredEnabled: {
-        ...current.desiredEnabled,
-        [command.pluginId]: command.desiredEnabled
-      },
-      desiredRevision: {
-        ...current.desiredRevision,
-        [command.pluginId]: (current.desiredRevision[command.pluginId] ?? 0) + 1
-      }
-    };
-    try {
-      await options.persist?.(cloneSnapshot(next));
-    } catch (error) {
-      return {
-        status: "persistence-failed",
-        commandId: command.commandId,
-        message: error instanceof Error ? error.message : String(error),
-        snapshot: cloneSnapshot(current)
-      };
-    }
-    current = next;
-    const accepted = {
-      status: "accepted",
-      commandId: command.commandId,
-      snapshot: cloneSnapshot(current),
-      persisted: true
-    };
-    commandRecords.set(command.commandId, {
-      fingerprint,
-      result: accepted
-    });
-    while (commandRecords.size > maxCommandRecords) {
-      const oldest = commandRecords.keys().next().value;
-      if (oldest === void 0) break;
-      commandRecords.delete(oldest);
-    }
-    notify();
-    return {
-      status: "accepted",
-      commandId: accepted.commandId,
-      snapshot: cloneSnapshot(accepted.snapshot),
-      persisted: true
-    };
-  };
-  const controller = {
-    authorityInstanceId,
-    snapshot: () => cloneSnapshot(current),
-    submit(command) {
-      const result = queue.then(() => process(command));
-      queue = result.then(() => void 0, () => void 0);
-      return result;
-    },
-    subscribe(listener) {
-      listeners.add(listener);
-      return () => listeners.delete(listener);
-    }
-  };
-  return controller;
-}
-
 // src/transport/serviceBridge.ts
 function makeRequestId() {
   try {
@@ -3296,9 +3206,10 @@ function referenceKey(reference) {
   return [
     reference.capabilityId,
     reference.providerInstanceId,
-    reference.execution,
+    reference.runtime,
     reference.contractVersion,
     reference.authorityInstanceId,
+    reference.connectionId ?? "local",
     reference.scopeId,
     reference.handoverGeneration,
     stableAttributes(reference.attributes),
@@ -3310,7 +3221,7 @@ function referenceKey(reference) {
   ].join("\0");
 }
 function lookupMatches(reference, lookup) {
-  return reference.status === "ready" && reference.capabilityId === lookup.capabilityId && reference.contractVersion === lookup.contractVersion && (lookup.execution === void 0 || reference.execution === lookup.execution) && (lookup.scopeId === void 0 || reference.scopeId === lookup.scopeId);
+  return reference.status === "ready" && reference.capabilityId === lookup.capabilityId && reference.contractVersion === lookup.contractVersion && (lookup.runtime === void 0 || reference.runtime === lookup.runtime) && (lookup.scopeId === void 0 || reference.scopeId === lookup.scopeId);
 }
 function createServiceBridge(options) {
   let currentState = "disconnected";
@@ -3437,7 +3348,7 @@ function createServiceBridge(options) {
       }
       const next = /* @__PURE__ */ new Map();
       for (const reference of snapshot.services) {
-        if (reference.authorityInstanceId !== currentAuthorityInstanceId || reference.snapshotRevision !== snapshot.snapshotRevision) continue;
+        if (reference.authorityInstanceId !== currentAuthorityInstanceId || reference.connectionId !== void 0 && reference.connectionId !== snapshot.connectionId || reference.snapshotRevision !== snapshot.snapshotRevision) continue;
         next.set(referenceKey(reference), Object.freeze({ ...reference }));
       }
       references.clear();
@@ -3731,6 +3642,161 @@ function createMessagePortServiceTransport(options) {
   return transport;
 }
 
+// src/lifecycle/pluginIntentController.ts
+function makeAuthorityInstanceId() {
+  try {
+    if (typeof crypto !== "undefined" && typeof crypto.randomUUID === "function") {
+      return `authority:${crypto.randomUUID()}`;
+    }
+  } catch {
+  }
+  return `authority:${Date.now().toString(36)}:${Math.random().toString(36).slice(2)}`;
+}
+function cloneSnapshot(snapshot) {
+  return {
+    revision: snapshot.revision,
+    desiredEnabled: { ...snapshot.desiredEnabled },
+    desiredRevision: { ...snapshot.desiredRevision }
+  };
+}
+function normalizeSnapshot(initial) {
+  const revision = Number.isSafeInteger(initial?.revision) && (initial?.revision ?? 0) >= 0 ? initial.revision : 0;
+  const desiredEnabled = {};
+  for (const [pluginId, value] of Object.entries(initial?.desiredEnabled ?? {})) {
+    if (typeof value === "boolean") desiredEnabled[pluginId] = value;
+  }
+  const desiredRevision = {};
+  for (const [pluginId, value] of Object.entries(initial?.desiredRevision ?? {})) {
+    if (Number.isSafeInteger(value) && value >= 0) desiredRevision[pluginId] = value;
+  }
+  return { revision, desiredEnabled, desiredRevision };
+}
+function commandFingerprint(command) {
+  return [
+    command.authorityInstanceId,
+    command.expectedRevision,
+    command.pluginId,
+    command.desiredEnabled ? "true" : "false"
+  ].join("\0");
+}
+function commandError(message) {
+  return { status: "command-conflict", commandId: "", message };
+}
+function createPluginIntentController(options = {}) {
+  const authorityInstanceId = options.authorityInstanceId ?? makeAuthorityInstanceId();
+  const maxCommandRecords = Math.max(1, Math.floor(options.maxCommandRecords ?? 256));
+  let current = normalizeSnapshot(options.initial);
+  const commandRecords = /* @__PURE__ */ new Map();
+  const listeners = /* @__PURE__ */ new Set();
+  let queue = Promise.resolve();
+  const notify = () => {
+    const snapshot = cloneSnapshot(current);
+    for (const listener of [...listeners]) {
+      try {
+        listener(snapshot);
+      } catch {
+      }
+    }
+  };
+  const process = async (command) => {
+    const candidate = command;
+    const commandId = typeof candidate?.commandId === "string" ? candidate.commandId : "";
+    if (!candidate || typeof candidate.authorityInstanceId !== "string" || candidate.authorityInstanceId.length === 0 || typeof candidate.pluginId !== "string" || candidate.pluginId.length === 0 || typeof candidate.desiredEnabled !== "boolean" || !Number.isSafeInteger(candidate.expectedRevision) || (candidate.expectedRevision ?? -1) < 0 || commandId.length === 0) {
+      const result = commandError("commandId\u3001pluginId \u548C expectedRevision \u5FC5\u987B\u662F\u6709\u6548\u503C");
+      return { ...result, commandId };
+    }
+    if (command.authorityInstanceId !== authorityInstanceId) {
+      return {
+        status: "stale-authority",
+        commandId: command.commandId,
+        expectedAuthorityInstanceId: authorityInstanceId
+      };
+    }
+    const fingerprint = commandFingerprint(command);
+    const existing = commandRecords.get(command.commandId);
+    if (existing) {
+      if (existing.fingerprint !== fingerprint) {
+        return {
+          status: "command-conflict",
+          commandId: command.commandId,
+          message: "\u76F8\u540C commandId \u7684\u547D\u4EE4\u5185\u5BB9\u4E0D\u540C\uFF0C\u62D2\u7EDD\u8986\u76D6\u539F\u547D\u4EE4"
+        };
+      }
+      return {
+        status: "duplicate",
+        commandId: command.commandId,
+        snapshot: cloneSnapshot(existing.result.snapshot),
+        persisted: true
+      };
+    }
+    if (command.expectedRevision !== current.revision) {
+      return {
+        status: "revision-conflict",
+        commandId: command.commandId,
+        snapshot: cloneSnapshot(current)
+      };
+    }
+    const next = {
+      revision: current.revision + 1,
+      desiredEnabled: {
+        ...current.desiredEnabled,
+        [command.pluginId]: command.desiredEnabled
+      },
+      desiredRevision: {
+        ...current.desiredRevision,
+        [command.pluginId]: (current.desiredRevision[command.pluginId] ?? 0) + 1
+      }
+    };
+    try {
+      await options.persist?.(cloneSnapshot(next));
+    } catch (error) {
+      return {
+        status: "persistence-failed",
+        commandId: command.commandId,
+        message: error instanceof Error ? error.message : String(error),
+        snapshot: cloneSnapshot(current)
+      };
+    }
+    current = next;
+    const accepted = {
+      status: "accepted",
+      commandId: command.commandId,
+      snapshot: cloneSnapshot(current),
+      persisted: true
+    };
+    commandRecords.set(command.commandId, {
+      fingerprint,
+      result: accepted
+    });
+    while (commandRecords.size > maxCommandRecords) {
+      const oldest = commandRecords.keys().next().value;
+      if (oldest === void 0) break;
+      commandRecords.delete(oldest);
+    }
+    notify();
+    return {
+      status: "accepted",
+      commandId: accepted.commandId,
+      snapshot: cloneSnapshot(accepted.snapshot),
+      persisted: true
+    };
+  };
+  const controller = {
+    authorityInstanceId,
+    snapshot: () => cloneSnapshot(current),
+    submit(command) {
+      const result = queue.then(() => process(command));
+      queue = result.then(() => void 0, () => void 0);
+      return result;
+    },
+    subscribe(listener) {
+      listeners.add(listener);
+      return () => listeners.delete(listener);
+    }
+  };
+  return controller;
+}
+
 export { LIFECYCLE_ERROR_TEXT, LifecycleScopeRevokedError, PermissionDeniedError, PermissionLeaseRevokedError, PluginGraphValidationError, RESOURCE_OWNER, RESOURCE_REGISTRY_CAPABILITY, RUNTIME_MESSAGE_BUS, RemoteServiceUnavailableError, SCOPED_TASK_SCHEDULER_CAPABILITY, StartupCapabilityError, StartupPluginError, UpgradeGateRejectedError, buildPluginGraph, createCapabilityRegistry, createInMemoryPluginConfigStore, createLifecycleScope, createMessageBus, createMessagePortServiceTransport, createPermissionLease, createPluginHost, createPluginIntentController, createRemoteServiceBridge, createRemoteServiceMessageCodec, createResourceRegistry, createResourceScope, createResourceStore, createRuntimeUnitImplementationRegistry, createScopedMessageBus, createScopedTaskScheduler, createServiceBridge, dependenciesOfManifest, lifecycleErrorText, providesOfManifest, registerOwnedResource, reverseDependentsOf, validatePluginGraph, validateRuntimeUnitDependencyContracts };
-//# sourceMappingURL=chunk-KGNF36DZ.js.map
-//# sourceMappingURL=chunk-KGNF36DZ.js.map
+//# sourceMappingURL=chunk-URY3E6UH.js.map
+//# sourceMappingURL=chunk-URY3E6UH.js.map