@zhin.js/runtime 1.0.1 → 1.0.3

package/lib/slot-generation-preparer.js

@@ -24,17 +24,25 @@ export class SlotGenerationPreparer {
             for (const slot of replacements)
                 capabilities.set(slot.id, slot);
         }
-        const projected = await new FeatureProjector(this.model.providers.values()).project(current.generation + 1, {
+        // Capability-file HMR projects only the owning Features. The complete
+        // snapshot below is assembled by retaining every other projection.
+        const providers = [...selectedByFeature.keys()].map((feature) => {
+            const provider = this.model.providers.get(feature);
+            if (!provider)
+                throw new Error(`Missing Feature provider for ${feature}`);
+            return provider;
+        });
+        const projected = await new FeatureProjector(providers).project(current.generation + 1, {
             root: current.root,
             tree: current.tree,
             config: current.config,
             resources: current.resources,
             capabilities,
-        });
+        }, current.projections);
         try {
             const snapshot = createSnapshotView(current.generation + 1, projected.state);
             const ownership = SourceOwnershipIndex.fromGeneration(this.model.graph, snapshot, this.model.featureIdsByPackageRoot);
-            const assets = this.model.assets.fork(projected.disposers);
+            const assets = this.model.assets.replaceProjections(selectedByFeature.keys(), projected.disposers);
             return {
                 generation: {
                     snapshot: projected.state,
@@ -46,7 +54,7 @@ export class SlotGenerationPreparer {
             };
         }
         catch (error) {
-            await disposeProjections(projected.disposers, error);
+            await disposeProjections(projected.disposers.values(), error);
             throw error;
         }
     }

package/lib/source-ownership.js

@@ -42,6 +42,8 @@ export class SourceOwnershipIndex {
             }
         });
         for (const slot of snapshot.capabilities.values()) {
+            if (slot.origin === 'setup')
+                continue;
             index.add({
                 source: slot.source,
                 role: 'capability',

package/lib/subtree-generation-preparer.d.ts

@@ -1,6 +1,7 @@
 import { type PluginId, type RuntimeSnapshot } from '@zhin.js/plugin-runtime';
 import type { RuntimeEnvironment } from './environment.js';
 import type { EnvironmentLayers } from './environment-store.js';
+import type { RuntimeConfigDocument } from './config-composer.js';
 import type { IsolatedPluginRuntimePort } from './isolation.js';
 import type { ModuleRuntime } from './module-runtime.js';
 import { type PluginConfigResolver, type RootResourceInstaller } from './plugin-scope-assembler.js';
@@ -15,10 +16,11 @@ export declare class SubtreeGenerationPreparer {
     private readonly model;
     private readonly graph;
     private readonly configResolver;
+    private readonly primaryConfigDocument;
     private readonly environment;
     private readonly installResources?;
     private readonly environmentLayers;
     private readonly isolation?;
-    constructor(modules: ModuleRuntime, model: RuntimeGenerationModel, graph: ProjectGraph, configResolver: PluginConfigResolver, environment: RuntimeEnvironment, installResources?: RootResourceInstaller | undefined, environmentLayers?: EnvironmentLayers, isolation?: IsolatedPluginRuntimePort | undefined);
+    constructor(modules: ModuleRuntime, model: RuntimeGenerationModel, graph: ProjectGraph, configResolver: PluginConfigResolver, primaryConfigDocument: RuntimeConfigDocument, environment: RuntimeEnvironment, installResources?: RootResourceInstaller | undefined, environmentLayers?: EnvironmentLayers, isolation?: IsolatedPluginRuntimePort | undefined);
     prepare(current: RuntimeSnapshot, roots: readonly PluginId[]): Promise<PreparedRuntimeGeneration>;
 }

package/lib/subtree-generation-preparer.js

@@ -4,6 +4,7 @@ import { FeatureProjector, composeGenerationHandoffs } from './feature-projector
 import { NodeDiscoveryHost } from './node-discovery-host.js';
 import { PluginScopeAssembler, } from './plugin-scope-assembler.js';
 import { SourceOwnershipIndex } from './source-ownership.js';
+import { addCapabilitySlot, featureSetupAliases, mergeSetupCapabilities, } from './setup-capabilities.js';
 export class SubtreeTopologyChangedError extends Error {
     constructor(message) {
         super(message);
@@ -16,15 +17,17 @@ export class SubtreeGenerationPreparer {
     model;
     graph;
     configResolver;
+    primaryConfigDocument;
     environment;
     installResources;
     environmentLayers;
     isolation;
-    constructor(modules, model, graph, configResolver, environment, installResources, environmentLayers = {}, isolation) {
+    constructor(modules, model, graph, configResolver, primaryConfigDocument, environment, installResources, environmentLayers = {}, isolation) {
         this.modules = modules;
         this.model = model;
         this.graph = graph;
         this.configResolver = configResolver;
+        this.primaryConfigDocument = primaryConfigDocument;
         this.environment = environment;
         this.installResources = installResources;
         this.environmentLayers = environmentLayers;
@@ -33,14 +36,15 @@ export class SubtreeGenerationPreparer {
     async prepare(current, roots) {
         const nodes = indexGraph(this.graph);
         assertCompatibleTopology(indexGraph(this.model.graph), nodes, roots);
-        const plugins = new PluginScopeAssembler(this.modules, this.configResolver, this.environment, this.installResources, this.environmentLayers, {
+        const plugins = new PluginScopeAssembler(this.modules, this.configResolver, this.environment, this.primaryConfigDocument, this.installResources, this.environmentLayers, {
             scopes: this.model.scopes,
             tree: current.tree,
             config: current.config,
             resources: current.resources,
         }, this.isolation);
+        plugins.installSetupFeatureAliases(featureSetupAliases(this.model.providers.values()));
         plugins.removeSubtrees(roots);
-        const projectionDisposers = [];
+        const projectionDisposers = new Map();
         try {
             for (const root of roots) {
                 const node = nodes.get(root);
@@ -53,6 +57,7 @@ export class SubtreeGenerationPreparer {
                 if (roots.some((root) => isWithin(slot.owner, root)))
                     capabilities.delete(id);
             }
+            mergeSetupCapabilities(capabilities, plugins.setupCapabilities(), this.model.providers, this.model.rootsByFeature);
             const discovery = new FeatureDiscovery(new NodeDiscoveryHost(this.modules));
             for (const provider of this.model.providers.values()) {
                 const affectedRoots = (this.model.rootsByFeature.get(provider.id) ?? [])
@@ -61,7 +66,7 @@ export class SubtreeGenerationPreparer {
                     continue;
                 const slots = await discovery.discover(provider, affectedRoots);
                 for (const slot of slots)
-                    capabilities.set(slot.id, slot);
+                    addCapabilitySlot(capabilities, slot);
             }
             const projected = await new FeatureProjector(this.model.providers.values()).project(current.generation + 1, {
                 root: current.root,
@@ -70,7 +75,9 @@ export class SubtreeGenerationPreparer {
                 resources: plugins.resources,
                 capabilities,
             });
-            projectionDisposers.push(...projected.disposers);
+            for (const [feature, dispose] of projected.disposers) {
+                projectionDisposers.set(feature, dispose);
+            }
             const snapshot = createSnapshotView(current.generation + 1, projected.state);
             const ownership = SourceOwnershipIndex.fromGeneration(this.graph, snapshot, this.model.featureIdsByPackageRoot);
             const replacements = new Map(plugins.createdScopeDisposers());
@@ -93,7 +100,7 @@ export class SubtreeGenerationPreparer {
             };
         }
         catch (error) {
-            await rollback(plugins.createdScopeDisposers().map(([, dispose]) => dispose), projectionDisposers, error);
+            await rollback(plugins.createdScopeDisposers().map(([, dispose]) => dispose), [...projectionDisposers.values()], error);
             throw error;
         }
     }

package/lib/topology-generation-preparer.d.ts

@@ -1,6 +1,7 @@
 import { type RuntimeSnapshot } from '@zhin.js/plugin-runtime';
 import type { RuntimeEnvironment } from './environment.js';
 import type { EnvironmentLayers } from './environment-store.js';
+import type { RuntimeConfigDocument } from './config-composer.js';
 import type { IsolatedPluginRuntimePort } from './isolation.js';
 import type { ModuleRuntime } from './module-runtime.js';
 import { type PluginConfigResolver, type RootResourceInstaller } from './plugin-scope-assembler.js';
@@ -13,10 +14,11 @@ export declare class TopologyGenerationPreparer {
     private readonly model;
     private readonly graph;
     private readonly configResolver;
+    private readonly primaryConfigDocument;
     private readonly environment;
     private readonly installResources?;
     private readonly environmentLayers;
     private readonly isolation?;
-    constructor(modules: ModuleRuntime, model: RuntimeGenerationModel, graph: ProjectGraph, configResolver: PluginConfigResolver, environment: RuntimeEnvironment, installResources?: RootResourceInstaller | undefined, environmentLayers?: EnvironmentLayers, isolation?: IsolatedPluginRuntimePort | undefined);
+    constructor(modules: ModuleRuntime, model: RuntimeGenerationModel, graph: ProjectGraph, configResolver: PluginConfigResolver, primaryConfigDocument: RuntimeConfigDocument, environment: RuntimeEnvironment, installResources?: RootResourceInstaller | undefined, environmentLayers?: EnvironmentLayers, isolation?: IsolatedPluginRuntimePort | undefined);
     prepare(current: RuntimeSnapshot): Promise<PreparedRuntimeGeneration | undefined>;
 }

package/lib/topology-generation-preparer.js

@@ -6,6 +6,7 @@ import { FeatureProjector, composeGenerationHandoffs } from './feature-projector
 import { NodeDiscoveryHost } from './node-discovery-host.js';
 import { PluginScopeAssembler, } from './plugin-scope-assembler.js';
 import { SourceOwnershipIndex } from './source-ownership.js';
+import { addCapabilitySlot, featureSetupAliases, mergeSetupCapabilities, } from './setup-capabilities.js';
 import { TopologyTransactionPlanner, collapseRoots, graphNodes, graphOrder, isWithin, } from './topology-transaction.js';
 /** Prepares manifest topology changes without rebuilding stable Plugin Scopes. */
 export class TopologyGenerationPreparer {
@@ -13,15 +14,17 @@ export class TopologyGenerationPreparer {
     model;
     graph;
     configResolver;
+    primaryConfigDocument;
     environment;
     installResources;
     environmentLayers;
     isolation;
-    constructor(modules, model, graph, configResolver, environment, installResources, environmentLayers = {}, isolation) {
+    constructor(modules, model, graph, configResolver, primaryConfigDocument, environment, installResources, environmentLayers = {}, isolation) {
         this.modules = modules;
         this.model = model;
         this.graph = graph;
         this.configResolver = configResolver;
+        this.primaryConfigDocument = primaryConfigDocument;
         this.environment = environment;
         this.installResources = installResources;
         this.environmentLayers = environmentLayers;
@@ -39,12 +42,13 @@ export class TopologyGenerationPreparer {
         if (!plan.changed)
             return undefined;
         const featureTopology = await this.#loadFeatureTopology(plan);
-        const plugins = new PluginScopeAssembler(this.modules, this.configResolver, this.environment, this.installResources, this.environmentLayers, {
+        const plugins = new PluginScopeAssembler(this.modules, this.configResolver, this.environment, this.primaryConfigDocument, this.installResources, this.environmentLayers, {
             scopes: this.model.scopes,
             tree: current.tree,
             config: current.config,
             resources: current.resources,
         }, this.isolation);
+        plugins.installSetupFeatureAliases(featureSetupAliases(featureTopology.providers.values()));
         const setupRoots = collapseRoots([
             ...plan.addedPluginRoots,
             ...plan.replacedPluginRoots,
@@ -54,7 +58,7 @@ export class TopologyGenerationPreparer {
             ...plan.replacedPluginRoots,
         ]);
         plugins.removeSubtrees(removalRoots);
-        const projectionDisposers = [];
+        const projectionDisposers = new Map();
         try {
             for (const root of setupRoots) {
                 const node = nextNodes.get(root);
@@ -66,6 +70,7 @@ export class TopologyGenerationPreparer {
             // remove, move, or reorder operations.
             plugins.synchronizeTree(this.graph.root);
             const capabilities = await this.#prepareCapabilities(current, plan, setupRoots, featureTopology);
+            mergeSetupCapabilities(capabilities, plugins.setupCapabilities(), featureTopology.providers, featureTopology.rootsByFeature);
             const projected = await new FeatureProjector(featureTopology.providers.values()).project(current.generation + 1, {
                 root: current.root,
                 tree: plugins.tree,
@@ -73,7 +78,9 @@ export class TopologyGenerationPreparer {
                 resources: plugins.resources,
                 capabilities,
             });
-            projectionDisposers.push(...projected.disposers);
+            for (const [feature, dispose] of projected.disposers) {
+                projectionDisposers.set(feature, dispose);
+            }
             const snapshot = createSnapshotView(current.generation + 1, projected.state);
             const ownership = SourceOwnershipIndex.fromGeneration(this.graph, snapshot, featureTopology.featureIdsByPackageRoot);
             const replacements = new Map(plugins.createdScopeDisposers());
@@ -96,7 +103,7 @@ export class TopologyGenerationPreparer {
             };
         }
         catch (error) {
-            await rollback(plugins.createdScopeDisposers().map(([, dispose]) => dispose), projectionDisposers, error);
+            await rollback(plugins.createdScopeDisposers().map(([, dispose]) => dispose), [...projectionDisposers.values()], error);
             throw error;
         }
     }
@@ -175,7 +182,7 @@ export class TopologyGenerationPreparer {
             if (!provider)
                 throw new Error(`Missing Feature provider for ${feature}`);
             for (const slot of await discovery.discover(provider, selected)) {
-                capabilities.set(slot.id, slot);
+                addCapabilitySlot(capabilities, slot);
             }
         }
         return capabilities;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/runtime",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Static Plugin graph, generation transaction and HMR Root runtime for Zhin.js",
   "type": "module",
   "main": "./lib/index.js",
@@ -18,22 +18,22 @@
   "dependencies": {
     "ajv": "8.18.0",
     "semver": "7.8.5",
-    "@zhin.js/feature-kit": "1.0.1",
-    "@zhin.js/plugin-runtime": "1.0.1"
+    "@zhin.js/feature-kit": "1.0.3",
+    "@zhin.js/plugin-runtime": "1.1.1"
   },
   "devDependencies": {
     "@types/node": "^26.1.0",
     "typescript": "^6.0.3",
-    "@zhin.js/adapter": "1.0.1",
-    "@zhin.js/agent-feature": "1.0.1",
-    "@zhin.js/command": "1.0.1",
-    "@zhin.js/layout": "1.0.1",
-    "@zhin.js/mcp-feature": "1.0.1",
-    "@zhin.js/middleware": "1.0.1",
-    "@zhin.js/component": "1.0.1",
-    "@zhin.js/page": "1.0.1",
-    "@zhin.js/skill": "1.0.1",
-    "@zhin.js/tool": "1.0.1"
+    "@zhin.js/adapter": "1.1.1",
+    "@zhin.js/agent-feature": "1.0.3",
+    "@zhin.js/command": "1.0.3",
+    "@zhin.js/component": "1.0.3",
+    "@zhin.js/layout": "1.0.3",
+    "@zhin.js/mcp-feature": "1.0.3",
+    "@zhin.js/middleware": "1.0.3",
+    "@zhin.js/page": "1.0.3",
+    "@zhin.js/skill": "1.0.3",
+    "@zhin.js/tool": "1.0.3"
   },
   "repository": {
     "type": "git",