devframe 0.9.1 → 0.9.2

package/dist/{_shared-DqbKCAew.d.mts → _shared-BAGBgTUO.d.mts}

@@ -1,4 +1,4 @@
-import { d as ConnectionMeta, l as McpRouteOptions, n as DevframeDefinition, r as DevframeDeploymentKind } from "./devframe-BlLEZR-x.mjs";
+import { d as ConnectionMeta, l as McpRouteOptions, n as DevframeDefinition, r as DevframeDeploymentKind } from "./devframe-mbfgpQQC.mjs";
 //#region src/adapters/_shared.d.ts
 /**
  * Resolve the mount base path for a devframe's SPA. Hosted adapters

package/dist/adapters/build.d.mts

@@ -1,4 +1,4 @@
-import { n as DevframeDefinition } from "../devframe-BlLEZR-x.mjs";
+import { n as DevframeDefinition } from "../devframe-mbfgpQQC.mjs";
 import { o as StaticAssetsSource } from "../remote-assets-Bg4gCUZ_.mjs";
 //#region src/adapters/build.d.ts
 interface CreateBuildOptions {

package/dist/adapters/build.mjs

@@ -1,11 +1,11 @@
 import { s as colors } from "../nostics-CzECRXpE.mjs";
 import { n as strictJsonStringify } from "../serialization-BGzEwAdr.mjs";
 import { DEVFRAME_CONNECTION_META_FILENAME, DEVFRAME_RPC_DUMP_DIRNAME, DEVFRAME_RPC_DUMP_MANIFEST_FILENAME } from "../constants.mjs";
-import { t as collectStaticRpcDump } from "../static-BPZ1_OPA.mjs";
+import { t as collectStaticRpcDump } from "../static-DV_qUSRS.mjs";
 import { n as structuredCloneStringify } from "../structured-clone-CbAV5rFI.mjs";
-import { t as diagnostics } from "../diagnostics-Di8ytitn.mjs";
-import { t as createHostContext } from "../context-Bdkakk8S.mjs";
-import { t as resolveStaticAssetsSource } from "../remote-assets-DRfY2RjX.mjs";
+import { t as diagnostics } from "../diagnostics-DI1HGj2I.mjs";
+import { t as createHostContext } from "../context-riPPHGiu.mjs";
+import { t as resolveStaticAssetsSource } from "../remote-assets-CqxiyltC.mjs";
 import { t as createH3DevframeHost } from "../host-h3-fRbF9yor.mjs";
 import process from "node:process";
 import { dirname, resolve } from "pathe";
@@ -34,7 +34,7 @@ async function createBuild(d, options = {}) {
 		origin: "http://localhost",
 		appName: d.id
 	});
-	const resolved = resolveStaticAssetsSource(distSource, host.getStorageDir("project"));
+	const resolved = resolveStaticAssetsSource(distSource, host.getStorageDir("project"), d.importMetaUrl);
 	if (typeof resolved === "string") {
 		console.log(colors.cyan`[devframe] copying SPA from ${resolved} -> ${outDir}`);
 		await fs$1.cp(resolved, outDir, { recursive: true });
@@ -45,11 +45,12 @@ async function createBuild(d, options = {}) {
 	const ctx = await createHostContext({
 		cwd: process.cwd(),
 		mode: "build",
-		host
+		host,
+		importMetaUrl: d.importMetaUrl
 	});
-	for (const input of d.services ?? []) ctx.services.install(input, { resolveFrom: d.packageName });
-	await d.setup(ctx);
+	for (const input of d.services ?? []) ctx.services.install(input, { resolveFrom: d.importMetaUrl });
 	await ctx.services.ready();
+	await d.setup(ctx);
 	await fs$1.mkdir(resolve(outDir, DEVFRAME_RPC_DUMP_DIRNAME), { recursive: true });
 	const jsonSerializableMethods = [];
 	for (const def of ctx.rpc.definitions.values()) if (def.jsonSerializable === true) jsonSerializableMethods.push(def.name);

package/dist/adapters/cac.d.mts

@@ -1,4 +1,4 @@
-import { Ft as CliFlagsSchema, It as InferCliFlags, Lt as defineCliFlags, Rt as parseCliFlags, n as DevframeDefinition } from "../devframe-BlLEZR-x.mjs";
+import { Ft as CliFlagsSchema, It as InferCliFlags, Lt as defineCliFlags, Rt as parseCliFlags, n as DevframeDefinition } from "../devframe-mbfgpQQC.mjs";
 import { CAC } from "cac";
 import { H3 } from "h3";
 //#region src/adapters/cac.d.ts

package/dist/adapters/cac.mjs

@@ -1,7 +1,7 @@
 import { s as colors } from "../nostics-CzECRXpE.mjs";
 import { r as resolveDevServerPort } from "../_shared-BM3PdYli.mjs";
 import { createBuild } from "./build.mjs";
-import { t as createDevServer } from "../dev-C8VHtuPP.mjs";
+import { t as createDevServer } from "../dev-BKm_HisC.mjs";
 import process from "node:process";
 import cac$1 from "cac";
 //#region src/adapters/flags.ts

package/dist/adapters/dev.d.mts

@@ -1,8 +1,8 @@
-import { _ as DevframeNodeRpcSession, c as DevframeWsOptions, l as McpRouteOptions, n as DevframeDefinition, s as DevframeSseOptions, u as DevframeAuthHandler } from "../devframe-BlLEZR-x.mjs";
+import { _ as DevframeNodeRpcSession, c as DevframeWsOptions, l as McpRouteOptions, n as DevframeDefinition, s as DevframeSseOptions, u as DevframeAuthHandler } from "../devframe-mbfgpQQC.mjs";
 import { d as DevframeRpcConnection, n as WsOriginRegistry, u as DevframeNodeRpcSessionMeta } from "../ws-server-D1d3QM9f.mjs";
 import { o as StaticAssetsSource } from "../remote-assets-Bg4gCUZ_.mjs";
-import { c as StartedServer } from "../instance-shell-0iw-cQ5V.mjs";
-import { a as resolveMcpConnectionMeta, i as resolveDevServerPort, t as ResolveDevServerPortOptions } from "../_shared-DqbKCAew.mjs";
+import { c as StartedServer } from "../instance-shell-mU5j5xWn.mjs";
+import { a as resolveMcpConnectionMeta, i as resolveDevServerPort, t as ResolveDevServerPortOptions } from "../_shared-BAGBgTUO.mjs";
 import { H3 } from "h3";
 //#region src/adapters/dev.d.ts
 interface CreateDevServerOptions {

package/dist/adapters/dev.mjs

@@ -1,3 +1,3 @@
 import { i as resolveMcpConnectionMeta, r as resolveDevServerPort } from "../_shared-BM3PdYli.mjs";
-import { t as createDevServer } from "../dev-C8VHtuPP.mjs";
+import { t as createDevServer } from "../dev-BKm_HisC.mjs";
 export { createDevServer, resolveDevServerPort, resolveMcpConnectionMeta };

package/dist/adapters/embedded.d.mts

@@ -1,4 +1,4 @@
-import { g as DevframeNodeContext, n as DevframeDefinition } from "../devframe-BlLEZR-x.mjs";
+import { g as DevframeNodeContext, n as DevframeDefinition } from "../devframe-mbfgpQQC.mjs";
 //#region src/adapters/embedded.d.ts
 interface CreateEmbeddedOptions {
   /** Target context the devframe is registered into. Required. */

package/dist/adapters/embedded.mjs

@@ -9,7 +9,8 @@
 * effective default follows the hosted rule of `def.basePath ?? '/__<id>/'`.
 */
 async function createEmbedded(d, options) {
-	for (const input of d.services ?? []) options.ctx.services.install(input, { resolveFrom: d.packageName });
+	for (const input of d.services ?? []) options.ctx.services.install(input, { resolveFrom: d.importMetaUrl });
+	await options.ctx.services.ready();
 	await d.setup(options.ctx);
 }
 //#endregion

package/dist/adapters/initiate.d.mts

@@ -1,7 +1,7 @@
-import { $ as DevframeStorageScope, _ as DevframeNodeRpcSession, c as DevframeWsOptions, d as ConnectionMeta, g as DevframeNodeContext, l as McpRouteOptions, n as DevframeDefinition, s as DevframeSseOptions, u as DevframeAuthHandler } from "../devframe-BlLEZR-x.mjs";
+import { $ as DevframeStorageScope, _ as DevframeNodeRpcSession, c as DevframeWsOptions, d as ConnectionMeta, g as DevframeNodeContext, l as McpRouteOptions, n as DevframeDefinition, s as DevframeSseOptions, u as DevframeAuthHandler } from "../devframe-mbfgpQQC.mjs";
 import { d as DevframeRpcConnection, n as WsOriginRegistry, u as DevframeNodeRpcSessionMeta } from "../ws-server-D1d3QM9f.mjs";
 import { o as StaticAssetsSource } from "../remote-assets-Bg4gCUZ_.mjs";
-import { c as StartedServer, f as DevframeInstanceRecord } from "../instance-shell-0iw-cQ5V.mjs";
+import { c as StartedServer, f as DevframeInstanceRecord } from "../instance-shell-mU5j5xWn.mjs";
 import { Buffer } from "node:buffer";
 import { IncomingMessage, Server, ServerResponse } from "node:http";
 import { Duplex } from "node:stream";

package/dist/adapters/initiate.mjs

@@ -1,2 +1,2 @@
-import { n as getInstanceInternals, r as initDevframe } from "../dev-C8VHtuPP.mjs";
+import { n as getInstanceInternals, r as initDevframe } from "../dev-BKm_HisC.mjs";
 export { getInstanceInternals, initDevframe };

package/dist/adapters/mcp.d.mts

@@ -1,4 +1,4 @@
-import { g as DevframeNodeContext, n as DevframeDefinition } from "../devframe-BlLEZR-x.mjs";
+import { g as DevframeNodeContext, n as DevframeDefinition } from "../devframe-mbfgpQQC.mjs";
 import { H3 } from "h3";
 import "@modelcontextprotocol/server";
 //#region src/adapters/mcp/build-server.d.ts

package/dist/adapters/mcp.mjs

@@ -1,2 +1,2 @@
-import { i as createMcpServer, n as mountMcpHttp, r as createMcpFetchHandler } from "../http-BbHCU5Zs.mjs";
+import { i as createMcpServer, n as mountMcpHttp, r as createMcpFetchHandler } from "../http-POepPnaQ.mjs";
 export { createMcpFetchHandler, createMcpServer, mountMcpHttp };

package/dist/cli/main.mjs

@@ -1,6 +1,6 @@
 import { t as Diagnostic } from "../nostics-CzECRXpE.mjs";
-import { t as diagnostics } from "../diagnostics-Di8ytitn.mjs";
-import { n as listLiveDevframeInstances, r as probeDevframeOrigin } from "../instance-registry-CHunhMi5.mjs";
+import { t as diagnostics } from "../diagnostics-DI1HGj2I.mjs";
+import { n as listLiveDevframeInstances, r as probeDevframeOrigin } from "../instance-registry-Dy28drtm.mjs";
 import { t as toAgentToolName } from "../agent-tool-name-EgfoFO8C.mjs";
 import process from "node:process";
 import { joinURL } from "ufo";

package/dist/client/index.d.mts

@@ -1,4 +1,4 @@
-import { E as DevframeRpcServerFunctions, H as DevframeSettings, J as ScopedServerFunctions, M as DevframeServiceMeta, Mt as EventEmitter, P as DevframeServiceScopeOf, R as DevframeServicesState, T as DevframeRpcClientFunctions, X as SettingsForNamespace, Y as ScopedSharedStates, b as RpcSharedStateGetOptions, d as ConnectionMeta, gt as SharedState, ot as StreamReader, q as ScopedRpcFn, st as StreamSink, x as RpcSharedStateHost } from "../devframe-BlLEZR-x.mjs";
+import { E as DevframeRpcServerFunctions, H as DevframeSettings, J as ScopedServerFunctions, M as DevframeServiceMeta, Mt as EventEmitter, P as DevframeServiceScopeOf, R as DevframeServicesState, T as DevframeRpcClientFunctions, X as SettingsForNamespace, Y as ScopedSharedStates, b as RpcSharedStateGetOptions, d as ConnectionMeta, gt as SharedState, ot as StreamReader, q as ScopedRpcFn, st as StreamSink, x as RpcSharedStateHost } from "../devframe-mbfgpQQC.mjs";
 import { f as RpcCacheManager, p as RpcCacheOptions } from "../index-tdrk1bzV.mjs";
 import { _ as RpcFunctionDefinition, w as RpcFunctionsCollector } from "../types-Djq7CBXh.mjs";
 import { t as SseRpcChannelOptions } from "../sse-client-CFBOIaUi.mjs";

package/dist/client/index.mjs

@@ -1,7 +1,7 @@
-import { t as hash } from "../hash-KtDZYXDN.mjs";
+import { t as hash } from "../hash-DdPnc4k3.mjs";
 import { colors } from "../utils/colors.mjs";
 import { createEventEmitter } from "../utils/events.mjs";
-import { t as createSharedState } from "../shared-state-fRRbRUtD.mjs";
+import { t as createSharedState } from "../shared-state-DoXutg_U.mjs";
 import { i as structuredCloneStringify, n as structuredCloneParse, t as structuredCloneDeserialize } from "../structured-clone-CgtQ61SA.mjs";
 import { createStreamReader, createStreamSink } from "../utils/streaming-channel.mjs";
 import { defineDiagnostics } from "nostics";

package/dist/{context-CXhjygJU.mjs → context-af2w_F0_.mjs}

@@ -1,5 +1,5 @@
 import { n as randomToken } from "./crypto-token-XCqTSMg9.mjs";
-import { t as createStorage } from "./storage-D4a99Ung.mjs";
+import { t as createStorage } from "./storage-BNqSAOxA.mjs";
 import { n as revokeAuthToken, t as revokeActiveConnectionsForToken } from "./revoke-3Q6aDKWk.mjs";
 import { join } from "pathe";
 //#region src/node/hub-internals/context.ts

package/dist/{context-dqyXS6o3.d.mts → context-al99DDJ8.d.mts}

@@ -1,4 +1,4 @@
-import { g as DevframeNodeContext, gt as SharedState } from "./devframe-BlLEZR-x.mjs";
+import { g as DevframeNodeContext, gt as SharedState } from "./devframe-mbfgpQQC.mjs";
 //#region src/node/hub-internals/context.d.ts
 interface InternalAnonymousAuthStorage {
   trusted: Record<string, {

package/dist/{context-Bdkakk8S.mjs → context-riPPHGiu.mjs}

@@ -4,10 +4,10 @@ import { RpcFunctionsCollectorBase } from "./rpc/index.mjs";
 import { defineRpcFunction } from "./index.mjs";
 import { t as DEVFRAME_EVENTS } from "./events-DKfSmoTj.mjs";
 import { DEVFRAME_SERVICES_STATE_KEY } from "./constants.mjs";
-import { t as diagnostics$1 } from "./diagnostics-Di8ytitn.mjs";
-import { r as createEventEmitter, t as DevframeAgentHost } from "./host-agent-BDdcOXhG.mjs";
-import { n as createDebug, t as resolveStaticAssetsSource } from "./remote-assets-DRfY2RjX.mjs";
-import { t as createStorage } from "./storage-D4a99Ung.mjs";
+import { t as diagnostics$1 } from "./diagnostics-DI1HGj2I.mjs";
+import { r as createEventEmitter, t as DevframeAgentHost } from "./host-agent-DVDLqjvj.mjs";
+import { n as createDebug, t as resolveStaticAssetsSource } from "./remote-assets-CqxiyltC.mjs";
+import { t as createStorage } from "./storage-BNqSAOxA.mjs";
 import { createRequire } from "node:module";
 import { createSharedState } from "devframe/utils/shared-state";
 import process from "node:process";
@@ -776,10 +776,10 @@ function toRequireBase(resolveFrom) {
 }
 /**
 * Normalize an `install()` `resolveFrom` into a resolution base. Paths and
-* file URLs pass through; a bare npm package name (the common case: the
-* declaring plugin's `packageName`) resolves to that package's location from
-* `cwd`, so a service it declares resolves against the plugin's own
-* dependencies. An unresolvable package name reads as no base (the caller's
+* file URLs pass through (the common case: the declaring plugin's
+* `importMetaUrl`, so a service it declares resolves against the plugin's own
+* dependencies); a bare npm package name resolves to that package's location
+* from `cwd`. An unresolvable package name reads as no base (the caller's
 * workspace fallbacks apply).
 */
 function expandResolveFrom(resolveFrom, cwd) {
@@ -880,14 +880,27 @@ function satisfiesVersionRange(version, range) {
 	if (alternatives.length === 0) return true;
 	return alternatives.some((alternative) => alternative.split(/\s+/).every((comparator) => satisfiesComparator(parsed, comparator)));
 }
+function isPlainObject(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+/** Deep-merge two values with the service option-set rules (see below). */
+function deepMergeTwo(a, b) {
+	if (Array.isArray(a) && Array.isArray(b)) return [.../* @__PURE__ */ new Set([...a, ...b])];
+	if (isPlainObject(a) && isPlainObject(b)) {
+		const out = { ...a };
+		for (const key of Object.keys(b)) out[key] = key in a ? deepMergeTwo(a[key], b[key]) : b[key];
+		return out;
+	}
+	return b;
+}
 /**
 * Default option-set merge when a service declares no `mergeOptions`:
-* shallow-merge plain objects in declaration order (later sets win); any
-* non-object set collapses the merge to "last one wins".
+* deep-merge in declaration order — objects recurse, arrays union-dedupe,
+* scalars take the later value. Covers the built-in services (`roots` /
+* `langs` union, `themes` per-key last-wins) without a custom hook.
 */
-function shallowMergeOptionSets(sets) {
-	if (sets.some((set) => typeof set !== "object" || set === null || Array.isArray(set))) return sets[sets.length - 1];
-	return Object.assign({}, ...sets);
+function deepMergeOptionSets(sets) {
+	return sets.reduce((merged, set) => deepMergeTwo(merged, set));
 }
 //#endregion
 //#region src/node/host-services.ts
@@ -1068,7 +1081,7 @@ var DevframeServicesHostImpl = class {
 			});
 		}
 		const sets = entries.map((entry) => entry.input.options).filter((options) => options !== void 0);
-		const options = def.mergeOptions ? def.mergeOptions(sets) : sets.length > 0 ? shallowMergeOptionSets(sets) : void 0;
+		const options = def.mergeOptions ? def.mergeOptions(sets) : sets.length > 0 ? deepMergeOptionSets(sets) : void 0;
 		if (!this.context) throw diagnostics$1.DF0070({
 			package: pkg,
 			reason: "this services host has no node context to install into"
@@ -1101,15 +1114,17 @@ var DevframeServicesHostImpl = class {
 //#region src/node/host-views.ts
 var DevframeViewHost = class {
 	context;
+	importMetaUrl;
 	/**
 	* @internal
 	*/
 	buildStaticDirs = [];
-	constructor(context) {
+	constructor(context, importMetaUrl) {
 		this.context = context;
+		this.importMetaUrl = importMetaUrl;
 	}
-	hostStatic(baseUrl, source) {
-		const resolved = resolveStaticAssetsSource(source, this.context.host.getStorageDir("project"));
+	hostStatic(baseUrl, source, defaultResolveFrom = this.importMetaUrl) {
+		const resolved = resolveStaticAssetsSource(source, this.context.host.getStorageDir("project"), defaultResolveFrom);
 		if (typeof resolved === "string" && !existsSync(resolved)) throw diagnostics$1.DF0008({ distDir: resolved });
 		this.buildStaticDirs.push({
 			baseUrl,
@@ -1301,7 +1316,7 @@ function createScopedNodeContext(context, namespace) {
 * `commands` when mounted into Vite DevTools.
 */
 async function createHostContext(options) {
-	const { cwd, workspaceRoot = cwd, mode, host, builtinRpcDeclarations = [] } = options;
+	const { cwd, workspaceRoot = cwd, mode, host, importMetaUrl, builtinRpcDeclarations = [] } = options;
 	const context = {
 		cwd,
 		workspaceRoot,
@@ -1316,7 +1331,7 @@ async function createHostContext(options) {
 		scope: void 0
 	};
 	const rpcHost = new RpcFunctionsHostImpl(context);
-	const viewsHost = new DevframeViewHost(context);
+	const viewsHost = new DevframeViewHost(context, importMetaUrl);
 	const diagnosticsHost = new DevframeDiagnosticsHost(context, [diagnostics$1, diagnostics]);
 	context.rpc = rpcHost;
 	context.views = viewsHost;

package/dist/{dev-C8VHtuPP.mjs → dev-BKm_HisC.mjs}

@@ -1,10 +1,10 @@
 import { DEVFRAME_CONNECTION_META_FILENAME } from "./constants.mjs";
-import { t as diagnostics } from "./diagnostics-Di8ytitn.mjs";
-import { t as createHostContext } from "./context-Bdkakk8S.mjs";
-import { t as resolveStaticAssetsSource } from "./remote-assets-DRfY2RjX.mjs";
+import { t as diagnostics } from "./diagnostics-DI1HGj2I.mjs";
+import { t as createHostContext } from "./context-riPPHGiu.mjs";
+import { t as resolveStaticAssetsSource } from "./remote-assets-CqxiyltC.mjs";
 import { i as resolveMcpConnectionMeta, n as resolveBasePath, r as resolveDevServerPort, t as normalizeBasePath } from "./_shared-BM3PdYli.mjs";
 import { t as createH3DevframeHost } from "./host-h3-fRbF9yor.mjs";
-import { i as normalizeHttpServerUrl, n as resolveInstanceRegister, t as createInstanceShell } from "./instance-shell-DbDoozNM.mjs";
+import { i as normalizeHttpServerUrl, n as resolveInstanceRegister, t as createInstanceShell } from "./instance-shell-GqTY93gC.mjs";
 import { open } from "./utils/open.mjs";
 import { mountStaticHandler } from "./utils/serve-static.mjs";
 import { createServer } from "node:http";
@@ -76,12 +76,13 @@ function initDevframe(def, options) {
 			const context = await createHostContext({
 				cwd: process.cwd(),
 				mode: "dev",
-				host: hostImpl
+				host: hostImpl,
+				importMetaUrl: def.importMetaUrl
 			});
 			const setupInfo = { flags: options.flags ?? {} };
-			for (const input of def.services ?? []) context.services.install(input, { resolveFrom: def.packageName });
-			await def.setup(context, setupInfo);
+			for (const input of def.services ?? []) context.services.install(input, { resolveFrom: def.importMetaUrl });
 			await context.services.ready();
+			await def.setup(context, setupInfo);
 			const mcpOption = options.mcp ?? def.cli?.mcp;
 			const mcpMeta = resolveMcpConnectionMeta(def, mcpOption);
 			let mcpDispose;
@@ -90,7 +91,7 @@ function initDevframe(def, options) {
 				const mcpPath = joinURL(base, mcpMeta.path);
 				let mountMcpHttp;
 				try {
-					({mountMcpHttp} = await import("./http-BbHCU5Zs.mjs").then((n) => n.t));
+					({mountMcpHttp} = await import("./http-POepPnaQ.mjs").then((n) => n.t));
 				} catch (error) {
 					const reason = error instanceof Error ? error.message : String(error);
 					throw diagnostics.DF0017({
@@ -115,7 +116,7 @@ function initDevframe(def, options) {
 		mount(context, meta) {
 			app.use(joinURL(base, DEVFRAME_CONNECTION_META_FILENAME), () => meta);
 			if (distDir) {
-				const source = resolveStaticAssetsSource(distDir, context.host.getStorageDir("project"));
+				const source = resolveStaticAssetsSource(distDir, context.host.getStorageDir("project"), def.importMetaUrl);
 				mountStaticHandler(app, base, typeof source === "string" ? resolve(source) : source);
 			}
 		}

package/dist/{devframe-BlLEZR-x.d.mts → devframe-mbfgpQQC.d.mts}

@@ -636,8 +636,15 @@ interface DevframeViewHost {
    *
    * Accepts a local dist directory, or a {@link StaticAssetsSource} remote
    * declaration served through devframe's caching CDN back-proxy.
+   *
+   * `defaultResolveFrom` overrides, for this call only, the context's own
+   * `importMetaUrl` as the default `resolveFrom` for a remote source that
+   * doesn't set one. A shared host that mounts assets on behalf of another
+   * devframe (a hub installing a plugin) passes that plugin's `importMetaUrl`
+   * so the assets resolve against the plugin's dependency graph rather than
+   * the host's.
    */
-  hostStatic: (baseUrl: string, source: StaticAssetsSource) => void;
+  hostStatic: (baseUrl: string, source: StaticAssetsSource, defaultResolveFrom?: string | null) => void;
 }
 //#endregion
 //#region src/types/scope.d.ts
@@ -981,33 +988,37 @@ interface DevframeServicesHost {
   /** Ids of every currently-provided service. */
   keys: () => string[];
   /**
-   * Install a **wire service** (see {@link DevframeServiceDefinition}).
-   * Before {@link DevframeServicesHost.ready} fires, installs are queued —
-   * option sets from every installer accumulate and each service is
-   * constructed **once** at the barrier with the merged options; the
-   * returned promise resolves with the service's node API then (or
-   * `undefined` when an optional descriptor's package can't be imported).
-   * After the barrier, installs construct immediately; installing an
-   * already-installed package returns the existing API (a warning is
-   * emitted when the late install carried options, since they're ignored).
+   * Install a **wire service** (see {@link DevframeServiceDefinition}). The
+   * common path is declarative — list services on `DevframeDefinition.services`
+   * (or `initHub({ services })`) and the adapter installs them for you before
+   * `setup` runs. Call `install()` directly only for the dynamic escape hatch:
+   * a service configured at runtime from data unknown until then.
+   *
+   * Before the pre-setup ready fires, installs are queued and their option
+   * sets deep-merged, constructing each service **once**. After it, an install
+   * constructs immediately; installing an already-installed package returns
+   * the existing API (a warning — `DF0066` — when the late install carried
+   * options, since they're ignored). The returned promise resolves with the
+   * node API (or `undefined` when an optional descriptor's package can't be
+   * imported).
    *
    * `resolveFrom` is where a descriptor's package resolves **from**: a path
-   * or file URL (e.g. `import.meta.url`), or an npm package name — typically
-   * the declaring plugin's `packageName`, so its declared services resolve
-   * against the plugin's own dependencies. Falls back to the context's
-   * `workspaceRoot`.
+   * or file URL (e.g. the declaring devframe's `importMetaUrl`), or an npm
+   * package name, so its declared services resolve against the declarer's own
+   * dependencies. Falls back to the context's `workspaceRoot` then `cwd`.
    */
   install: <API = unknown, Options = any>(input: DevframeServiceInput<API, Options>, options?: {
     resolveFrom?: string | null;
   }) => Promise<API | undefined>;
   /**
-   * Fire the collect-then-setup barrier: resolve every queued descriptor
-   * (importing its package), merge option sets per service, construct each
-   * service once, `provide()` its node API under the package name, and
-   * advertise it to clients via the `devframe:services` shared state.
-   * Idempotent — adapters call it once after every devframe's `setup` has
-   * run; a repeat returns the same promise. Rejects when a `required`
-   * service fails to import or misses its version range.
+   * Construct every queued service — importing descriptor packages, merging
+   * option sets, `provide()`-ing each node API under its package name, and
+   * advertising it to clients via the `devframe:services` shared state.
+   * Idempotent. **Internal**: the adapters call it once, before running any
+   * `setup`, so services are ready for `setup` to consume; application code
+   * uses declarative `services` (or `install()` for the dynamic case) and
+   * never calls this. Rejects when a `required` service fails to import or
+   * misses its version range.
    */
   ready: () => Promise<void>;
 }
@@ -1932,6 +1943,29 @@ interface DevframeDefinition {
   version: string;
   /** npm package name the devframe ships in (e.g. `@scope/my-tool`). */
   packageName: string;
+  /**
+   * `import.meta.url` of the module that defines this devframe. **Always
+   * provide it** (`importMetaUrl: import.meta.url`): it is the resolution base
+   * for the tool's own dependency graph, which lets the host resolve
+   * everything against the plugin's own installed packages rather than the
+   * consuming app's.
+   *
+   * - **Remote assets** — becomes the default `resolveFrom` for any remote
+   *   {@link StaticAssetsSource} the devframe hosts (its `cli.distDir`, and
+   *   every `ctx.views.hostStatic` call) that doesn't set one explicitly, so a
+   *   locally installed copy of the assets package is served with zero
+   *   network. A per-asset `resolveFrom` still wins, and an explicit
+   *   `resolveFrom: null` still opts out.
+   * - **Service dependencies** — becomes the base the host resolves declared
+   *   {@link DevframeServiceInput | services} from, so a plugin can ship a
+   *   service package as its own dependency instead of asking users to install
+   *   it.
+   *
+   * Optional for backward compatibility; omitting it falls back to
+   * runtime-directory resolution and disables the zero-network installed-copy
+   * fast paths above.
+   */
+  importMetaUrl?: string;
   /** Project homepage or documentation URL. */
   homepage: string;
   /** One-line summary of what the tool does. */

package/dist/{diagnostics-Di8ytitn.mjs → diagnostics-DI1HGj2I.mjs}

@@ -157,10 +157,6 @@ const diagnostics = defineDiagnostics({
 		DF0070: {
 			why: (p) => `Invalid service "${p.package}": ${p.reason}`,
 			fix: "A service package's default export must be a factory returning a `DevframeServiceDefinition` — an object with `package`, `version`, `scope`, and a `setup` function."
-		},
-		DF0071: {
-			why: (p) => `Deferred service installation failed while flushing on the first client connection: ${p.reason}`,
-			fix: "Call `ctx.services.ready()` explicitly after every devframe's setup has run (the first-party adapters do) so installation errors surface at startup instead of at connect time."
 		}
 	}
 });