@frontmcp/sdk 0.4.1 → 0.5.0

package/src/prompt/prompt.utils.js

@@ -0,0 +1,136 @@
+"use strict";
+// file: libs/sdk/src/prompt/prompt.utils.ts
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.qualifiedNameOf = exports.ownerKeyOf = exports.ensureMaxLen = exports.shortHash = exports.normalizeOwnerPath = exports.normalizeProviderId = exports.normalizeSegment = exports.sepFor = exports.toCase = exports.splitWords = void 0;
+exports.collectPromptMetadata = collectPromptMetadata;
+exports.normalizePrompt = normalizePrompt;
+exports.promptDiscoveryDeps = promptDiscoveryDeps;
+exports.buildParsedPromptResult = buildParsedPromptResult;
+const common_1 = require("../common");
+const token_utils_1 = require("../utils/token.utils");
+const metadata_utils_1 = require("../utils/metadata.utils");
+// Re-export shared naming utilities
+var naming_utils_1 = require("../utils/naming.utils");
+Object.defineProperty(exports, "splitWords", { enumerable: true, get: function () { return naming_utils_1.splitWords; } });
+Object.defineProperty(exports, "toCase", { enumerable: true, get: function () { return naming_utils_1.toCase; } });
+Object.defineProperty(exports, "sepFor", { enumerable: true, get: function () { return naming_utils_1.sepFor; } });
+Object.defineProperty(exports, "normalizeSegment", { enumerable: true, get: function () { return naming_utils_1.normalizeSegment; } });
+Object.defineProperty(exports, "normalizeProviderId", { enumerable: true, get: function () { return naming_utils_1.normalizeProviderId; } });
+Object.defineProperty(exports, "normalizeOwnerPath", { enumerable: true, get: function () { return naming_utils_1.normalizeOwnerPath; } });
+Object.defineProperty(exports, "shortHash", { enumerable: true, get: function () { return naming_utils_1.shortHash; } });
+Object.defineProperty(exports, "ensureMaxLen", { enumerable: true, get: function () { return naming_utils_1.ensureMaxLen; } });
+// Re-export shared lineage utilities
+var lineage_utils_1 = require("../utils/lineage.utils");
+Object.defineProperty(exports, "ownerKeyOf", { enumerable: true, get: function () { return lineage_utils_1.ownerKeyOf; } });
+Object.defineProperty(exports, "qualifiedNameOf", { enumerable: true, get: function () { return lineage_utils_1.qualifiedNameOf; } });
+/**
+ * Collect metadata from a class decorated with @FrontMcpPrompt
+ */
+function collectPromptMetadata(cls) {
+    return Object.entries(common_1.FrontMcpPromptTokens).reduce((metadata, [key, token]) => {
+        const value = (0, metadata_utils_1.getMetadata)(token, cls);
+        if (value !== undefined) {
+            return Object.assign(metadata, {
+                [key]: value,
+            });
+        }
+        return metadata;
+    }, {});
+}
+/**
+ * Normalize any prompt input (class or function) to a PromptRecord.
+ *
+ * @param item - The prompt input to normalize. Accepts:
+ *   - A class decorated with @FrontMcpPrompt
+ *   - A function returned from prompt() builder
+ *   The `any` type is intentional to handle both decorator patterns and provide
+ *   meaningful error messages for invalid inputs.
+ */
+function normalizePrompt(item) {
+    // Function-style decorator: prompt({ name: '...' })(handler)
+    if (item &&
+        typeof item === 'function' &&
+        item[common_1.FrontMcpPromptTokens.type] === 'function-prompt' &&
+        item[common_1.FrontMcpPromptTokens.metadata]) {
+        return {
+            kind: common_1.PromptKind.FUNCTION,
+            provide: item(),
+            metadata: item[common_1.FrontMcpPromptTokens.metadata],
+        };
+    }
+    // Class-style decorator: @FrontMcpPrompt({ name: '...' })
+    if ((0, token_utils_1.isClass)(item)) {
+        const metadata = collectPromptMetadata(item);
+        return { kind: common_1.PromptKind.CLASS_TOKEN, provide: item, metadata };
+    }
+    const name = item?.name ?? String(item);
+    throw new Error(`Invalid prompt '${name}'. Expected a class or a prompt function.`);
+}
+/**
+ * Get dependency tokens for graph/cycle detection
+ */
+function promptDiscoveryDeps(rec) {
+    switch (rec.kind) {
+        case common_1.PromptKind.FUNCTION:
+            return (0, token_utils_1.depsOfFunc)(rec.provide, 'discovery');
+        case common_1.PromptKind.CLASS_TOKEN:
+            return (0, token_utils_1.depsOfClass)(rec.provide, 'discovery');
+        default: {
+            // Exhaustive check: ensures all PromptKind values are handled
+            const _exhaustive = rec;
+            throw new Error(`Unhandled prompt kind: ${_exhaustive.kind}`);
+        }
+    }
+}
+/**
+ * Build a parsed prompt result from raw output
+ */
+function buildParsedPromptResult(raw, metadata) {
+    // If already in GetPromptResult format
+    if (raw && typeof raw === 'object' && 'messages' in raw && Array.isArray(raw.messages)) {
+        const rawObj = raw;
+        return {
+            description: rawObj.description ?? metadata.description,
+            messages: rawObj.messages,
+        };
+    }
+    // If raw is a string, convert to single user message
+    if (typeof raw === 'string') {
+        return {
+            description: metadata.description,
+            messages: [{ role: 'user', content: { type: 'text', text: raw } }],
+        };
+    }
+    // If raw is an array of messages
+    if (Array.isArray(raw)) {
+        return {
+            description: metadata.description,
+            messages: raw.map(normalizePromptMessage),
+        };
+    }
+    // Default: wrap in user message as JSON
+    return {
+        description: metadata.description,
+        messages: [{ role: 'user', content: { type: 'text', text: JSON.stringify(raw) } }],
+    };
+}
+/**
+ * Normalize a single message to PromptMessage format
+ */
+function normalizePromptMessage(msg) {
+    // If already in correct format with valid role and content
+    if (msg &&
+        typeof msg === 'object' &&
+        'role' in msg &&
+        'content' in msg &&
+        typeof msg['role'] === 'string' &&
+        typeof msg['content'] === 'object') {
+        return msg;
+    }
+    // Assume user message with text content
+    return {
+        role: 'user',
+        content: { type: 'text', text: typeof msg === 'string' ? msg : JSON.stringify(msg) },
+    };
+}
+//# sourceMappingURL=prompt.utils.js.map

package/src/prompt/prompt.utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompt.utils.js","sourceRoot":"","sources":["../../../src/prompt/prompt.utils.ts"],"names":[],"mappings":"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","sourcesContent":["// file: libs/sdk/src/prompt/prompt.utils.ts\n\nimport {\n  PromptMetadata,\n  FrontMcpPromptTokens,\n  PromptType,\n  Token,\n  PromptRecord,\n  PromptKind,\n  Type,\n  PromptEntry,\n} from '../common';\nimport { depsOfClass, depsOfFunc, isClass } from '../utils/token.utils';\nimport { getMetadata } from '../utils/metadata.utils';\nimport { GetPromptResult, PromptMessage } from '@modelcontextprotocol/sdk/types.js';\n\n// Re-export shared naming utilities\nexport {\n  splitWords,\n  toCase,\n  sepFor,\n  normalizeSegment,\n  normalizeProviderId,\n  normalizeOwnerPath,\n  shortHash,\n  ensureMaxLen,\n} from '../utils/naming.utils';\n\n// Re-export shared lineage utilities\nexport { ownerKeyOf, qualifiedNameOf } from '../utils/lineage.utils';\n\n/**\n * Collect metadata from a class decorated with @FrontMcpPrompt\n */\nexport function collectPromptMetadata(cls: PromptType): PromptMetadata {\n  return Object.entries(FrontMcpPromptTokens).reduce((metadata, [key, token]) => {\n    const value = getMetadata(token, cls);\n    if (value !== undefined) {\n      return Object.assign(metadata, {\n        [key]: value,\n      });\n    }\n    return metadata;\n  }, {} as PromptMetadata);\n}\n\n/**\n * Normalize any prompt input (class or function) to a PromptRecord.\n *\n * @param item - The prompt input to normalize. Accepts:\n *   - A class decorated with @FrontMcpPrompt\n *   - A function returned from prompt() builder\n *   The `any` type is intentional to handle both decorator patterns and provide\n *   meaningful error messages for invalid inputs.\n */\nexport function normalizePrompt(item: any): PromptRecord {\n  // Function-style decorator: prompt({ name: '...' })(handler)\n  if (\n    item &&\n    typeof item === 'function' &&\n    item[FrontMcpPromptTokens.type] === 'function-prompt' &&\n    item[FrontMcpPromptTokens.metadata]\n  ) {\n    return {\n      kind: PromptKind.FUNCTION,\n      provide: item(),\n      metadata: item[FrontMcpPromptTokens.metadata] as PromptMetadata,\n    };\n  }\n\n  // Class-style decorator: @FrontMcpPrompt({ name: '...' })\n  if (isClass(item)) {\n    const metadata = collectPromptMetadata(item as PromptType);\n    return { kind: PromptKind.CLASS_TOKEN, provide: item as Type<PromptEntry>, metadata };\n  }\n\n  const name = (item as any)?.name ?? String(item);\n  throw new Error(`Invalid prompt '${name}'. Expected a class or a prompt function.`);\n}\n\n/**\n * Get dependency tokens for graph/cycle detection\n */\nexport function promptDiscoveryDeps(rec: PromptRecord): Token[] {\n  switch (rec.kind) {\n    case PromptKind.FUNCTION:\n      return depsOfFunc(rec.provide, 'discovery');\n    case PromptKind.CLASS_TOKEN:\n      return depsOfClass(rec.provide, 'discovery');\n    default: {\n      // Exhaustive check: ensures all PromptKind values are handled\n      const _exhaustive: never = rec;\n      throw new Error(`Unhandled prompt kind: ${(_exhaustive as PromptRecord).kind}`);\n    }\n  }\n}\n\n/**\n * Build a parsed prompt result from raw output\n */\nexport function buildParsedPromptResult(raw: unknown, metadata: PromptMetadata): GetPromptResult {\n  // If already in GetPromptResult format\n  if (raw && typeof raw === 'object' && 'messages' in raw && Array.isArray(raw.messages)) {\n    const rawObj = raw as { description?: string; messages: unknown[] };\n    return {\n      description: rawObj.description ?? metadata.description,\n      messages: rawObj.messages as PromptMessage[],\n    };\n  }\n\n  // If raw is a string, convert to single user message\n  if (typeof raw === 'string') {\n    return {\n      description: metadata.description,\n      messages: [{ role: 'user', content: { type: 'text', text: raw } }],\n    };\n  }\n\n  // If raw is an array of messages\n  if (Array.isArray(raw)) {\n    return {\n      description: metadata.description,\n      messages: raw.map(normalizePromptMessage),\n    };\n  }\n\n  // Default: wrap in user message as JSON\n  return {\n    description: metadata.description,\n    messages: [{ role: 'user', content: { type: 'text', text: JSON.stringify(raw) } }],\n  };\n}\n\n/**\n * Normalize a single message to PromptMessage format\n */\nfunction normalizePromptMessage(msg: unknown): PromptMessage {\n  // If already in correct format with valid role and content\n  if (\n    msg &&\n    typeof msg === 'object' &&\n    'role' in msg &&\n    'content' in msg &&\n    typeof (msg as Record<string, unknown>)['role'] === 'string' &&\n    typeof (msg as Record<string, unknown>)['content'] === 'object'\n  ) {\n    return msg as PromptMessage;\n  }\n\n  // Assume user message with text content\n  return {\n    role: 'user',\n    content: { type: 'text', text: typeof msg === 'string' ? msg : JSON.stringify(msg) },\n  };\n}\n"]}

package/src/provider/provider.registry.d.ts

@@ -1,9 +1,9 @@
 import 'reflect-metadata';
-import { ProviderInterface, ProviderType, ProviderScope, Token, ProviderRegistryInterface, ProviderRecord, ProviderInjectedRecord, RegistryKind, RegistryType, ProviderEntry, FrontMcpServer } from '../common';
+import { ProviderInterface, ProviderType, ProviderScope, Token, ProviderRegistryInterface, ProviderRecord, ProviderInjectedRecord, ScopeEntry, RegistryKind, RegistryType, ProviderEntry, FrontMcpServer } from '../common';
 import { RegistryAbstract, RegistryBuildMapResult } from '../regsitry';
 import { ProviderViews } from './provider.types';
 import { Scope } from '../scope';
-import HookRegistry from "../hooks/hook.registry";
+import HookRegistry from '../hooks/hook.registry';
 export default class ProviderRegistry extends RegistryAbstract<ProviderEntry, ProviderRecord, ProviderType[], ProviderRegistry | undefined> implements ProviderRegistryInterface {
     private readonly parentProviders?;
     /** used to track which registry provided which token */
@@ -32,7 +32,8 @@ export default class ProviderRegistry extends RegistryAbstract<ProviderEntry, Pr
     getAllSingletons(): ReadonlyMap<Token, unknown>;
     discoveryDeps(rec: ProviderRecord): Token[];
     invocationTokens(_token: Token, rec: ProviderRecord): Token[];
-    getScope(rec: ProviderRecord): ProviderScope;
+    getProviderScope(rec: ProviderRecord): ProviderScope;
+    getScope(): ScopeEntry;
     private withTimeout;
     private resolveFactoryArg;
     /** Build a single DEFAULT-scoped singleton (used by incremental instantiating). */
@@ -40,7 +41,7 @@ export default class ProviderRegistry extends RegistryAbstract<ProviderEntry, Pr
     private buildIntoStore;
     private resolveManagedForClass;
     get<T>(token: Token<T>): T;
-    addRegistry(type: RegistryKind, value: RegistryType): void;
+    addRegistry<T extends RegistryKind>(type: T, value: RegistryType[T]): void;
     getRegistries<T extends RegistryKind>(type: T): RegistryType[T][];
     getHooksRegistry(): HookRegistry;
     getScopeRegistry(): import("../common").ScopeRegistryInterface;
@@ -67,9 +68,15 @@ export default class ProviderRegistry extends RegistryAbstract<ProviderEntry, Pr
         instance: ProviderEntry;
     };
     injectProvider(injected: Omit<ProviderInjectedRecord, 'kind'>): void;
-    addDynamicProviders(dynamicProviders: ProviderRecord[]): Promise<void[]>;
+    addDynamicProviders(dynamicProviders: ProviderType[]): Promise<void[]>;
     private getWithParents;
     getActiveScope(): Scope;
     getActiveServer(): FrontMcpServer;
+    /**
+     * Build provider instance views for different scopes
+     * NOTE: This is currently a stub implementation returning empty maps.
+     * Actual view building logic is planned as part of the session management refactoring.
+     * See the ProviderRegistryInterface TODO for fixing the session type.
+     */
     buildViews(session: string): Promise<ProviderViews>;
 }

package/src/provider/provider.registry.js

@@ -40,7 +40,7 @@ class ProviderRegistry extends regsitry_1.RegistryAbstract {
         if (!found)
             throw new Error(`Cannot resolve token ${(0, token_utils_1.tokenName)(token)}: not registered in hierarchy.`);
         const { registry, rec } = found;
-        const sc = registry.getScope(rec);
+        const sc = registry.getProviderScope(rec);
         if (sc !== common_1.ProviderScope.GLOBAL) {
             const scName = common_1.ProviderScope[sc];
             throw new Error(`Dependency ${(0, token_utils_1.tokenName)(token)} is scoped (${scName}) in ${registry.constructor.name}; cannot use as DEFAULT.`);
@@ -76,8 +76,8 @@ class ProviderRegistry extends regsitry_1.RegistryAbstract {
                     throw new Error(`Provider ${(0, token_utils_1.tokenName)(token)} depends on ${(0, token_utils_1.tokenName)(d)}, which is not registered (local or parent).`);
                 }
                 const depRec = isLocal ? this.defs.get(d) : up.rec;
-                const depScope = isLocal ? this.getScope(depRec) : up.registry.getScope(depRec);
-                if (this.getScope(rec) === common_1.ProviderScope.GLOBAL && depScope !== common_1.ProviderScope.GLOBAL) {
+                const depScope = isLocal ? this.getProviderScope(depRec) : up.registry.getProviderScope(depRec);
+                if (this.getProviderScope(rec) === common_1.ProviderScope.GLOBAL && depScope !== common_1.ProviderScope.GLOBAL) {
                     throw new Error(`Invalid dependency: DEFAULT-scoped provider ${(0, token_utils_1.tokenName)(token)} cannot depend on scoped provider ${(0, token_utils_1.tokenName)(d)}.`);
                 }
                 // Only wire local -> local edges in our local graph; parent deps are external to this DAG.
@@ -122,7 +122,7 @@ class ProviderRegistry extends regsitry_1.RegistryAbstract {
         const only = opts?.onlyTokens ? new Set(opts.onlyTokens) : null;
         for (const token of this.order) {
             const rec = this.defs.get(token);
-            if (this.getScope(rec) !== common_1.ProviderScope.GLOBAL)
+            if (this.getProviderScope(rec) !== common_1.ProviderScope.GLOBAL)
                 continue;
             if (only && !only.has(token))
                 continue;
@@ -136,7 +136,8 @@ class ProviderRegistry extends regsitry_1.RegistryAbstract {
             }
             catch (e) {
                 const msg = e?.message ?? e;
-                console.error(`Failed instantiating`, e);
+                // Use safe logging to avoid Node.js 24 util.inspect bug with Zod errors
+                console.error(`Failed instantiating:`, msg);
                 throw new Error(`Failed constructing ${(0, token_utils_1.tokenName)(token)}: ${msg}`);
             }
         }
@@ -146,136 +147,18 @@ class ProviderRegistry extends regsitry_1.RegistryAbstract {
     getAllSingletons() {
         return this.instances; // exposed as ReadonlyMap in the type
     }
-    // /** Get (or create) the mutable session store for a sessionId. */
-    // sessionMap(sessionId: string): Map<Token, unknown> {
-    //   let store = this.scoped.get(sessionId);
-    //   if (!store) {
-    //     store = new Map<Token, unknown>();
-    //     this.scoped.set(sessionId, store);
-    //   }
-    //   return store;
-    // }
-    // /** Try to build SessionProvider from registered DI definition (CLASS/FACTORY/etc.). */
-    // private async tryBuildRegisteredSessionProvider(
-    //   sessionId: string,
-    //   requestId?: string | number,
-    // ): Promise<SessionProvider | undefined> {
-    //   // Prefer local def; otherwise look up in hierarchy
-    //   const found = this.lookupDefInHierarchy(SessionProvider as unknown as Token);
-    //   const rec = found?.rec;
-    //   const reg = found?.registry;
-    //
-    //   if (!rec) return undefined;
-    //
-    //   const sc = (rec as any).scope ?? ProviderScope.GLOBAL;
-    //   if (sc === ProviderScope.GLOBAL) {
-    //     // If someone registered a DEFAULT-scoped SessionProvider, use the singleton instance (from the owning registry)
-    //     if (!reg!.instances.has(SessionProvider)) {
-    //       throw new Error(
-    //         `Registered ${tokenName(SessionProvider)} (DEFAULT) not instantiated at bootstrap`,
-    //       );
-    //     }
-    //     return reg!.instances.get(SessionProvider) as SessionProvider;
-    //   }
-    //
-    //   // Build into the session store using the owning registry's factory (so its metadata/defs are used)
-    //   const store = this.sessionMap(sessionId);
-    //   await reg!.buildIntoStore(
-    //     SessionProvider as unknown as Token,
-    //     rec,
-    //     store,
-    //     sessionId,
-    //     [sessionId, requestId],
-    //   );
-    //   const sp = store.get(SessionProvider as unknown as Token) as SessionProvider | undefined;
-    //
-    //   // Ensure request id is set/updated, if setter exists
-    //   if (sp && requestId && typeof sp.setRequestId === 'function') sp.setRequestId(requestId);
-    //   return sp;
-    // }
-    // /** Ensure a SessionProvider is present in the session map (registered or anonymous).
-    //  * @deprecated
-    //  */
-    // async ensureSessionProvider(sessionId: string, requestId?: string | number): Promise<SessionProvider> {
-    //   const store = this.sessionMap(sessionId);
-    //
-    //   // already present
-    //   if (store.has(SessionProvider)) {
-    //     const sp = store.get(SessionProvider) as SessionProvider;
-    //     if (requestId && typeof sp.setRequestId === 'function') sp.setRequestId(requestId);
-    //     return sp;
-    //   }
-    //
-    //   // try registered provider first (local or parent)
-    //   const registered = await this.tryBuildRegisteredSessionProvider(sessionId, requestId);
-    //   return registered as SessionProvider;
-    //
-    // }
-    // /**
-    //  * Create (or get) an authenticated session store, seed SessionProvider if missing.
-    //  * @deprecated
-    //  * */
-    // bootstrapSession(sessionId: string, requestId?: string): Map<Token, unknown> {
-    //   let store = this.scoped.get(sessionId);
-    //   if (!store) {
-    //     store = new Map<Token, unknown>();
-    //     this.scoped.set(sessionId, store);
-    //   }
-    //   if (!store.has(SessionProvider)) {
-    //     store.set(SessionProvider, {}); // new SessionProvider(sessionId, requestId ?? '', false));
-    //   } else if (requestId) {
-    //     (store.get(SessionProvider) as SessionProvider).setRequestId(requestId);
-    //   }
-    //   return store;
-    // }
-    // /**
-    //  * Returns all tokens that are registered as session-scoped (including SessionProvider).
-    //  * @deprecated
-    //  */
-    // listSessionScopedTokens(): Token[] {
-    //   const out: Token[] = [];
-    //   // Only local scoped tokens are known here; parent-scoped tokens will be pulled on demand.
-    //   for (const [tok, rec] of this.defs.entries()) {
-    //     if (this.getScope(rec) === ProviderScope.SESSION) out.push(tok);
-    //   }
-    //   return out;
-    // }
-    // /** Eager build selected session providers into the given session store. */
-    // private async buildSelectedSessionProviders(sessionId: string, requestId?: string | number): Promise<void> {
-    //   const store = this.sessionMap(sessionId);
-    //   await this.ensureSessionProvider(sessionId, requestId);
-    //
-    //   // Iterate over all session-scoped tokens (local list). Parent-scoped will resolve on demand.
-    //   for (const tok of this.listSessionScopedTokens()) {
-    //     if (tok === (SessionProvider as any)) continue;
-    //
-    //     if (store.has(tok)) continue; // already built
-    //
-    //     const rec = this.defs.get(tok);
-    //     if (!rec) continue; // should not happen
-    //
-    //     // Recursively build into this session store (handles scoped/default deps)
-    //     await this.buildIntoStore(tok, rec, store, sessionId);
-    //   }
-    // }
-    // /** Convenience: build all three maps you can pass straight into an invoke ctx. */
-    // async buildViews(sessionId: string, requestId?: string | number): Promise<ProviderViews> {
-    //   await this.buildSelectedSessionProviders(sessionId, requestId);
-    //   return {
-    //     global: this.getAllSingletons(),
-    //     session: this.sessionMap(sessionId),
-    //     request: new Map<Token, unknown>(),
-    //   };
-    // }
     discoveryDeps(rec) {
         return (0, provider_utils_1.providerDiscoveryDeps)(rec, this.tokens, (k, phase) => (0, token_utils_1.depsOfClass)(k, phase));
     }
     invocationTokens(_token, rec) {
         return (0, provider_utils_1.providerInvocationTokens)(rec, (k, phase) => (0, token_utils_1.depsOfClass)(k, phase));
     }
-    getScope(rec) {
+    getProviderScope(rec) {
         return rec.metadata?.scope ?? common_1.ProviderScope.GLOBAL;
     }
+    getScope() {
+        return this.getActiveScope();
+    }
     /* -------------------- Instantiation -------------------- */
     async withTimeout(p, ms, label) {
         if (ms <= 0 || !Number.isFinite(ms))
@@ -297,7 +180,7 @@ class ProviderRegistry extends regsitry_1.RegistryAbstract {
         // Local def?
         const rec = this.defs.get(t);
         if (rec) {
-            const sc = this.getScope(rec);
+            const sc = this.getProviderScope(rec);
             if (sc === common_1.ProviderScope.GLOBAL) {
                 if (!this.instances.has(t)) {
                     throw new Error(`Dependency ${(0, token_utils_1.tokenName)(t)} (DEFAULT scope) is not instantiated`);
@@ -312,7 +195,7 @@ class ProviderRegistry extends regsitry_1.RegistryAbstract {
         // Parent def?
         const up = this.lookupDefInHierarchy(t);
         if (up) {
-            const sc = up.registry.getScope(up.rec);
+            const sc = up.registry.getProviderScope(up.rec);
             if (sc === common_1.ProviderScope.GLOBAL) {
                 const inst = up.registry.instances.get(t);
                 if (inst === undefined) {
@@ -485,7 +368,8 @@ class ProviderRegistry extends regsitry_1.RegistryAbstract {
         }
         catch (e) {
             const msg = e?.message ?? e;
-            console.error(`Failed constructing`, e);
+            // Use safe logging to avoid Node.js 24 util.inspect bug with Zod errors
+            console.error(`Failed constructing:`, msg);
             throw new Error(`Failed constructing (scoped) ${(0, token_utils_1.tokenName)(token)}: ${msg}`);
         }
     }
@@ -500,7 +384,7 @@ class ProviderRegistry extends regsitry_1.RegistryAbstract {
         // Local DI?
         const depRec = this.defs.get(d);
         if (depRec) {
-            const sc = this.getScope(depRec);
+            const sc = this.getProviderScope(depRec);
             if (sc === common_1.ProviderScope.GLOBAL) {
                 const v = this.instances.get(d);
                 if (v === undefined)
@@ -515,7 +399,7 @@ class ProviderRegistry extends regsitry_1.RegistryAbstract {
         // Parent DI?
         const up = this.lookupDefInHierarchy(d);
         if (up) {
-            const sc = up.registry.getScope(up.rec);
+            const sc = up.registry.getProviderScope(up.rec);
             if (sc === common_1.ProviderScope.GLOBAL) {
                 const v = up.registry.instances.get(d);
                 if (v === undefined)
@@ -533,8 +417,8 @@ class ProviderRegistry extends regsitry_1.RegistryAbstract {
         if (this.instances.has(token))
             return this.instances.get(token);
         const rec = this.defs.get(token);
-        if (rec && this.getScope(rec) !== common_1.ProviderScope.GLOBAL) {
-            const scName = common_1.ProviderScope[this.getScope(rec)];
+        if (rec && this.getProviderScope(rec) !== common_1.ProviderScope.GLOBAL) {
+            const scName = common_1.ProviderScope[this.getProviderScope(rec)];
             throw new Error(`Provider ${(0, token_utils_1.tokenName)(token)} is scoped (${scName}). Use getScoped(token, key).`);
         }
         // bubble to parent
@@ -552,7 +436,7 @@ class ProviderRegistry extends regsitry_1.RegistryAbstract {
         registry.add(value);
     }
     getRegistries(type) {
-        return [...this.registries.get(type) ?? []];
+        return [...(this.registries.get(type) ?? [])];
     }
     getHooksRegistry() {
         return this.getRegistries('HookRegistry')[0];
@@ -570,7 +454,7 @@ class ProviderRegistry extends regsitry_1.RegistryAbstract {
         const found = this.lookupDefInHierarchy(t);
         if (found) {
             const { registry, rec } = found;
-            const sc = registry.getScope(rec);
+            const sc = registry.getProviderScope(rec);
             if (sc !== common_1.ProviderScope.GLOBAL)
                 throw new Error(`Plugin dependency ${(0, token_utils_1.tokenName)(t)} must be DEFAULT-scoped at bootstrap`);
             const v = registry.instances.get(t);
@@ -591,7 +475,7 @@ class ProviderRegistry extends regsitry_1.RegistryAbstract {
         const found = this.lookupDefInHierarchy(cls);
         if (found) {
             const { registry, rec } = found;
-            const sc = registry.getScope(rec);
+            const sc = registry.getProviderScope(rec);
             if (sc !== common_1.ProviderScope.GLOBAL) {
                 const scName = common_1.ProviderScope[sc];
                 throw new Error(`Provider ${(0, token_utils_1.tokenName)(cls)} is scoped (${scName}). Use getScoped(token, key) or buildViews(...).`);
@@ -649,7 +533,9 @@ class ProviderRegistry extends regsitry_1.RegistryAbstract {
         this.instances.set(rec.provide, rec.value);
     }
     async addDynamicProviders(dynamicProviders) {
-        return Promise.all(dynamicProviders.map((rec) => this.initiateOne(rec.provide, rec)));
+        // Normalize ProviderType[] to ProviderRecord[] before instantiation
+        const normalized = dynamicProviders.map((p) => (0, provider_utils_1.normalizeProvider)(p));
+        return Promise.all(normalized.map((rec) => this.initiateOne(rec.provide, rec)));
     }
     getWithParents(token) {
         if (this.instances.has(token)) {
@@ -667,6 +553,12 @@ class ProviderRegistry extends regsitry_1.RegistryAbstract {
     getActiveServer() {
         return this.getWithParents(common_1.FrontMcpServer);
     }
+    /**
+     * Build provider instance views for different scopes
+     * NOTE: This is currently a stub implementation returning empty maps.
+     * Actual view building logic is planned as part of the session management refactoring.
+     * See the ProviderRegistryInterface TODO for fixing the session type.
+     */
     async buildViews(session) {
         return {
             global: new Map(),