@h-rig/kernel-seed 0.0.6-alpha.155 → 0.0.6-alpha.157

package/dist/src/index.js

@@ -30,9 +30,15 @@ async function assertJournalConformance(journal, runId = CONFORMANCE_RUN_ID) {
 }
 // packages/kernel-seed/src/pluginAbi.ts
 function loadedPluginId(plugin) {
-  return plugin.meta.id;
+  return plugin.name;
 }
 // packages/kernel-seed/src/resolveCapability.ts
+function replacementMatches(spec, capability, providerId) {
+  if (typeof spec === "string")
+    return spec === `${capability}@${providerId}`;
+  return spec.capability === capability && spec.providerPluginId === providerId;
+}
+
 class AmbiguousCapabilityError extends Error {
   capability;
   providers;
@@ -53,15 +59,10 @@ class CapabilityProviderMissingError extends Error {
   }
 }
 function capabilityValue(plugin, capability) {
-  const direct = plugin.runtime.capabilities?.[capability];
-  const value = direct ?? (capability === "kernel" ? plugin.runtime.kernel : undefined) ?? plugin.runtime;
-  return value;
-}
-function replacementTarget(capability, providerId) {
-  return `${capability}@${providerId}`;
+  return plugin.capabilityProviders?.[capability];
 }
 function capabilityProviders(plugins, capability) {
-  return plugins.filter((plugin) => plugin.provides.has(capability));
+  return plugins.filter((plugin) => (plugin.provides ?? []).includes(capability));
 }
 function byPrecedence(providers, precedence) {
   if (!precedence || precedence.length === 0)
@@ -79,13 +80,10 @@ function providersAfterReplacement(capability, providers) {
   const replaced = new Set;
   for (const provider of providers) {
     for (const replacement of provider.replaces ?? []) {
-      const separator = replacement.indexOf("@");
-      if (separator <= 0)
-        continue;
-      const replacementCapability = replacement.slice(0, separator);
-      const replacementProviderId = replacement.slice(separator + 1);
-      if (replacementCapability === capability && providerIds.has(replacementProviderId)) {
-        replaced.add(replacementProviderId);
+      for (const candidateId of providerIds) {
+        if (replacementMatches(replacement, capability, candidateId)) {
+          replaced.add(candidateId);
+        }
       }
     }
   }
@@ -124,7 +122,7 @@ function resolveCapability(plugins, capability, config = {}) {
   throw new AmbiguousCapabilityError(capability, afterReplacement.providers.map(loadedPluginId).sort());
 }
 function declaresReplacement(plugin, capability, providerId) {
-  return (plugin.replaces ?? []).includes(replacementTarget(capability, providerId));
+  return (plugin.replaces ?? []).some((spec) => replacementMatches(spec, capability, providerId));
 }
 // packages/kernel-seed/src/seed.ts
 class BootIncoherent extends Error {
@@ -239,11 +237,11 @@ async function boot(config) {
     kernel: composed,
     plugins,
     capabilityProviderIds: {
-      kernel: kernelResolution.plugin.meta.id,
-      "stage-runner": stageRunnerResolution.plugin.meta.id,
-      journal: journalResolution.plugin.meta.id,
-      "loader-policy": loaderPolicyResolution.plugin.meta.id,
-      transport: transportResolution.plugin.meta.id
+      kernel: kernelResolution.plugin.name,
+      "stage-runner": stageRunnerResolution.plugin.name,
+      journal: journalResolution.plugin.name,
+      "loader-policy": loaderPolicyResolution.plugin.name,
+      transport: transportResolution.plugin.name
     }
   };
 }

package/dist/src/pluginAbi.d.ts

@@ -1,29 +1,17 @@
-import type { CapabilityTag, KernelCapability } from "@rig/contracts";
-export type PluginMeta = {
-    readonly id: string;
-    readonly name?: string;
+import type { CapabilityReplacementSpec, CapabilityTag, KernelCapability } from "@rig/contracts";
+export type CapabilityProviderPlugin = {
+    readonly name: string;
     readonly version?: string;
-};
-export type CapabilityReplacement = `${CapabilityTag}@${string}`;
-export type PluginContributions = Readonly<Record<string, unknown>>;
-export type PluginRuntimeChannel = {
-    readonly capabilities?: Readonly<Record<string, unknown>>;
-    readonly kernel?: KernelCapability;
-    readonly [key: string]: unknown;
-};
-export type LoadedPlugin = {
-    readonly meta: PluginMeta;
-    readonly provides: ReadonlySet<CapabilityTag>;
+    readonly provides?: readonly CapabilityTag[];
     readonly requires?: readonly CapabilityTag[];
-    readonly replaces?: readonly CapabilityReplacement[];
-    readonly contributes: PluginContributions;
-    readonly runtime: PluginRuntimeChannel;
+    readonly replaces?: readonly CapabilityReplacementSpec[];
+    readonly capabilityProviders?: Partial<Record<CapabilityTag, unknown>>;
 };
 export type CapabilityPrecedence = Partial<Record<CapabilityTag, readonly string[]>>;
 export type CapabilityProviderIds = Readonly<Record<CapabilityTag, string>>;
 export type ResolvedBootConfig = {
-    readonly plugins?: readonly LoadedPlugin[];
-    readonly loadPlugins?: () => Promise<readonly LoadedPlugin[]> | readonly LoadedPlugin[];
+    readonly plugins?: readonly CapabilityProviderPlugin[];
+    readonly loadPlugins?: () => Promise<readonly CapabilityProviderPlugin[]> | readonly CapabilityProviderPlugin[];
     readonly capabilityPrecedence?: CapabilityPrecedence;
     /**
      * When true, boot runs the behavioral journal-append conformance probe
@@ -36,7 +24,7 @@ export type ResolvedBootConfig = {
 };
 export type BootResult = {
     readonly kernel: KernelCapability;
-    readonly plugins: readonly LoadedPlugin[];
+    readonly plugins: readonly CapabilityProviderPlugin[];
     readonly capabilityProviderIds: CapabilityProviderIds;
 };
-export declare function loadedPluginId(plugin: LoadedPlugin): string;
+export declare function loadedPluginId(plugin: CapabilityProviderPlugin): string;

package/dist/src/pluginAbi.js

@@ -1,7 +1,7 @@
 // @bun
 // packages/kernel-seed/src/pluginAbi.ts
 function loadedPluginId(plugin) {
-  return plugin.meta.id;
+  return plugin.name;
 }
 export {
   loadedPluginId

package/dist/src/resolveCapability.d.ts

@@ -1,8 +1,8 @@
 import type { CapabilityTag } from "@rig/contracts";
-import type { CapabilityPrecedence, LoadedPlugin } from "./pluginAbi";
+import type { CapabilityPrecedence, CapabilityProviderPlugin } from "./pluginAbi";
 export type CapabilityResolution<T> = {
     readonly capability: CapabilityTag;
-    readonly plugin: LoadedPlugin;
+    readonly plugin: CapabilityProviderPlugin;
     readonly value: T;
     readonly selectedBy: "sole-provider" | "precedence" | "replaces";
     readonly replacedProviders: readonly string[];
@@ -18,7 +18,7 @@ export declare class CapabilityProviderMissingError extends Error {
     readonly name = "CapabilityProviderMissingError";
     constructor(capability: CapabilityTag);
 }
-export declare function resolveCapability<T>(plugins: readonly LoadedPlugin[], capability: CapabilityTag, config?: {
+export declare function resolveCapability<T>(plugins: readonly CapabilityProviderPlugin[], capability: CapabilityTag, config?: {
     readonly capabilityPrecedence?: CapabilityPrecedence;
 }): CapabilityResolution<T> | null;
-export declare function declaresReplacement(plugin: LoadedPlugin, capability: CapabilityTag, providerId: string): boolean;
+export declare function declaresReplacement(plugin: CapabilityProviderPlugin, capability: CapabilityTag, providerId: string): boolean;

package/dist/src/resolveCapability.js

@@ -1,10 +1,16 @@
 // @bun
 // packages/kernel-seed/src/pluginAbi.ts
 function loadedPluginId(plugin) {
-  return plugin.meta.id;
+  return plugin.name;
 }
 
 // packages/kernel-seed/src/resolveCapability.ts
+function replacementMatches(spec, capability, providerId) {
+  if (typeof spec === "string")
+    return spec === `${capability}@${providerId}`;
+  return spec.capability === capability && spec.providerPluginId === providerId;
+}
+
 class AmbiguousCapabilityError extends Error {
   capability;
   providers;
@@ -25,15 +31,10 @@ class CapabilityProviderMissingError extends Error {
   }
 }
 function capabilityValue(plugin, capability) {
-  const direct = plugin.runtime.capabilities?.[capability];
-  const value = direct ?? (capability === "kernel" ? plugin.runtime.kernel : undefined) ?? plugin.runtime;
-  return value;
-}
-function replacementTarget(capability, providerId) {
-  return `${capability}@${providerId}`;
+  return plugin.capabilityProviders?.[capability];
 }
 function capabilityProviders(plugins, capability) {
-  return plugins.filter((plugin) => plugin.provides.has(capability));
+  return plugins.filter((plugin) => (plugin.provides ?? []).includes(capability));
 }
 function byPrecedence(providers, precedence) {
   if (!precedence || precedence.length === 0)
@@ -51,13 +52,10 @@ function providersAfterReplacement(capability, providers) {
   const replaced = new Set;
   for (const provider of providers) {
     for (const replacement of provider.replaces ?? []) {
-      const separator = replacement.indexOf("@");
-      if (separator <= 0)
-        continue;
-      const replacementCapability = replacement.slice(0, separator);
-      const replacementProviderId = replacement.slice(separator + 1);
-      if (replacementCapability === capability && providerIds.has(replacementProviderId)) {
-        replaced.add(replacementProviderId);
+      for (const candidateId of providerIds) {
+        if (replacementMatches(replacement, capability, candidateId)) {
+          replaced.add(candidateId);
+        }
       }
     }
   }
@@ -96,7 +94,7 @@ function resolveCapability(plugins, capability, config = {}) {
   throw new AmbiguousCapabilityError(capability, afterReplacement.providers.map(loadedPluginId).sort());
 }
 function declaresReplacement(plugin, capability, providerId) {
-  return (plugin.replaces ?? []).includes(replacementTarget(capability, providerId));
+  return (plugin.replaces ?? []).some((spec) => replacementMatches(spec, capability, providerId));
 }
 export {
   resolveCapability,

package/dist/src/seed.js

@@ -31,10 +31,16 @@ async function assertJournalConformance(journal, runId = CONFORMANCE_RUN_ID) {
 
 // packages/kernel-seed/src/pluginAbi.ts
 function loadedPluginId(plugin) {
-  return plugin.meta.id;
+  return plugin.name;
 }
 
 // packages/kernel-seed/src/resolveCapability.ts
+function replacementMatches(spec, capability, providerId) {
+  if (typeof spec === "string")
+    return spec === `${capability}@${providerId}`;
+  return spec.capability === capability && spec.providerPluginId === providerId;
+}
+
 class AmbiguousCapabilityError extends Error {
   capability;
   providers;
@@ -55,12 +61,10 @@ class CapabilityProviderMissingError extends Error {
   }
 }
 function capabilityValue(plugin, capability) {
-  const direct = plugin.runtime.capabilities?.[capability];
-  const value = direct ?? (capability === "kernel" ? plugin.runtime.kernel : undefined) ?? plugin.runtime;
-  return value;
+  return plugin.capabilityProviders?.[capability];
 }
 function capabilityProviders(plugins, capability) {
-  return plugins.filter((plugin) => plugin.provides.has(capability));
+  return plugins.filter((plugin) => (plugin.provides ?? []).includes(capability));
 }
 function byPrecedence(providers, precedence) {
   if (!precedence || precedence.length === 0)
@@ -78,13 +82,10 @@ function providersAfterReplacement(capability, providers) {
   const replaced = new Set;
   for (const provider of providers) {
     for (const replacement of provider.replaces ?? []) {
-      const separator = replacement.indexOf("@");
-      if (separator <= 0)
-        continue;
-      const replacementCapability = replacement.slice(0, separator);
-      const replacementProviderId = replacement.slice(separator + 1);
-      if (replacementCapability === capability && providerIds.has(replacementProviderId)) {
-        replaced.add(replacementProviderId);
+      for (const candidateId of providerIds) {
+        if (replacementMatches(replacement, capability, candidateId)) {
+          replaced.add(candidateId);
+        }
       }
     }
   }
@@ -236,11 +237,11 @@ async function boot(config) {
     kernel: composed,
     plugins,
     capabilityProviderIds: {
-      kernel: kernelResolution.plugin.meta.id,
-      "stage-runner": stageRunnerResolution.plugin.meta.id,
-      journal: journalResolution.plugin.meta.id,
-      "loader-policy": loaderPolicyResolution.plugin.meta.id,
-      transport: transportResolution.plugin.meta.id
+      kernel: kernelResolution.plugin.name,
+      "stage-runner": stageRunnerResolution.plugin.name,
+      journal: journalResolution.plugin.name,
+      "loader-policy": loaderPolicyResolution.plugin.name,
+      transport: transportResolution.plugin.name
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@h-rig/kernel-seed",
-  "version": "0.0.6-alpha.155",
+  "version": "0.0.6-alpha.157",
   "type": "module",
   "description": "Irreducible Rig bootstrap seed, plugin ABI, and capability resolver.",
   "license": "UNLICENSED",
@@ -33,6 +33,6 @@
   "module": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",
   "dependencies": {
-    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.155"
+    "@rig/contracts": "npm:@h-rig/contracts@0.0.6-alpha.157"
   }
 }