@camstack/server 1.1.19 → 1.1.20

package/dist/api/core/notifications.router.js

@@ -4,64 +4,44 @@ exports.createNotificationsRouter = createNotificationsRouter;
 /**
  * Notifications router — fixed core API (not a capability).
  *
- * Routes events by category to registered outputs. The NotificationService
- * is a singleton from @camstack/system; individual outputs are still provided
- * by addons via the `notification-output` capability collection.
+ * Routes events by category to `(addonId, targetId)` notification targets.
+ * The NotificationService is a singleton from @camstack/system; the targets
+ * themselves are provided by addons via the `notification-output` capability
+ * collection (see the notifiers addon / HA addon). Target management + the
+ * test panel live on the cap surface (`api.notificationOutput.*`); this
+ * legacy router only exposes category→target routing.
  */
 const zod_1 = require("zod");
 const trpc_middleware_js_1 = require("../trpc/trpc.middleware.js");
-const NotificationOutputSchema = zod_1.z.object({
-    id: zod_1.z.string(),
-    name: zod_1.z.string(),
-    icon: zod_1.z.string(),
-});
-const SendTestResultSchema = zod_1.z.object({
-    success: zod_1.z.boolean(),
-    error: zod_1.z.string().optional(),
+const NotificationTargetRefSchema = zod_1.z.object({
+    addonId: zod_1.z.string(),
+    targetId: zod_1.z.string(),
 });
 function createNotificationsRouter(ns) {
     return (0, trpc_middleware_js_1.trpcRouter)({
-        listOutputs: trpc_middleware_js_1.protectedProcedure
-            .input(zod_1.z.void())
-            .output(zod_1.z.array(NotificationOutputSchema).readonly())
-            .query(() => {
-            if (!ns)
-                return [];
-            return ns.getOutputs();
-        }),
         getRouting: trpc_middleware_js_1.protectedProcedure
             .input(zod_1.z.void())
-            .output(zod_1.z.record(zod_1.z.string(), zod_1.z.array(zod_1.z.string())))
+            .output(zod_1.z.record(zod_1.z.string(), zod_1.z.array(NotificationTargetRefSchema)))
             .query(() => {
             if (!ns)
                 return {};
             const routing = ns.getRouting();
             const result = {};
-            for (const [category, outputIds] of routing) {
-                result[category] = [...outputIds];
+            for (const [category, targets] of routing) {
+                result[category] = [...targets];
             }
             return result;
         }),
         setRouting: trpc_middleware_js_1.adminProcedure
-            .input(zod_1.z.object({ category: zod_1.z.string(), outputIds: zod_1.z.array(zod_1.z.string()) }))
+            .input(zod_1.z.object({
+            category: zod_1.z.string(),
+            targets: zod_1.z.array(NotificationTargetRefSchema),
+        }))
             .output(zod_1.z.void())
             .mutation(({ input }) => {
             if (!ns)
                 throw new Error('Notification service unavailable');
-            ns.setRouting(input.category, input.outputIds);
-        }),
-        sendTest: trpc_middleware_js_1.adminProcedure
-            .input(zod_1.z.object({ outputId: zod_1.z.string() }))
-            .output(SendTestResultSchema)
-            .mutation(async ({ input }) => {
-            if (!ns)
-                return { success: false, error: 'Notification service unavailable' };
-            const output = ns.getOutput(input.outputId);
-            if (!output)
-                return { success: false, error: `Output "${input.outputId}" not found` };
-            if (!output.sendTest)
-                return { success: false, error: 'Output does not support test notifications' };
-            return output.sendTest();
+            ns.setRouting(input.category, input.targets);
         }),
     });
 }

package/dist/api/trpc/generated-cap-mounts.js

@@ -271,7 +271,16 @@ function mountAllCaps(services) {
                 return reg.getProviderByAddonId('notification-output', addonId);
             }
             const entries = reg.getCollectionEntries('notification-output');
-            return entries[0]?.[1] ?? null;
+            if (entries.length === 0)
+                return null;
+            const providers = entries.map(([, p]) => p);
+            const first = providers[0];
+            return {
+                ...first,
+                listTargetKinds: (0, cap_mount_helpers_js_1.concatCollection)(providers, 'listTargetKinds'),
+                listTargets: (0, cap_mount_helpers_js_1.concatCollection)(providers, 'listTargets'),
+                discoverTargets: (0, cap_mount_helpers_js_1.concatCollection)(providers, 'discoverTargets'),
+            };
         }, remoteCapProxy),
         notifier: (0, generated_cap_routers_js_1.createCapRouter_notifier)((_ctx) => (0, cap_mount_helpers_js_1.requireDeviceScoped)(reg, 'notifier'), remoteCapProxy),
         numericSensor: (0, generated_cap_routers_js_1.createCapRouter_numericSensor)((_ctx) => (0, cap_mount_helpers_js_1.requireDeviceScoped)(reg, 'numeric-sensor'), remoteCapProxy),

package/dist/api/trpc/generated-cap-routers.js

@@ -4469,6 +4469,33 @@ function createCapRouter_nodes(getProvider, _createRemoteProxy) {
 }
 function createCapRouter_notificationOutput(getProvider, createRemoteProxy) {
     return (0, trpc_middleware_js_1.trpcRouter)({
+        listTargetKinds: trpc_middleware_js_1.protectedProcedure
+            .input(types_68.notificationOutputCapability.methods.listTargetKinds.input.loose())
+            .output(types_68.notificationOutputCapability.methods.listTargetKinds.output)
+            .query(async ({ input, ctx }) => {
+            const { nodeId, addonId, ...methodInput } = input;
+            const p = resolveProvider('notification-output', nodeId, () => getProvider(ctx, addonId), createRemoteProxy);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
+            return p.listTargetKinds(methodInput);
+        }),
+        listTargets: trpc_middleware_js_1.protectedProcedure
+            .input(types_68.notificationOutputCapability.methods.listTargets.input.loose())
+            .output(types_68.notificationOutputCapability.methods.listTargets.output)
+            .query(async ({ input, ctx }) => {
+            const { nodeId, addonId, ...methodInput } = input;
+            const p = resolveProvider('notification-output', nodeId, () => getProvider(ctx, addonId), createRemoteProxy);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
+            return p.listTargets(methodInput);
+        }),
+        discoverTargets: trpc_middleware_js_1.protectedProcedure
+            .input(types_68.notificationOutputCapability.methods.discoverTargets.input.loose())
+            .output(types_68.notificationOutputCapability.methods.discoverTargets.output)
+            .query(async ({ input, ctx }) => {
+            const { nodeId, addonId, ...methodInput } = input;
+            const p = resolveProvider('notification-output', nodeId, () => getProvider(ctx, addonId), createRemoteProxy);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
+            return p.discoverTargets(methodInput);
+        }),
         send: trpc_middleware_js_1.protectedProcedure
             .input(types_68.notificationOutputCapability.methods.send.input.loose())
             .output(types_68.notificationOutputCapability.methods.send.output)
@@ -4478,12 +4505,41 @@ function createCapRouter_notificationOutput(getProvider, createRemoteProxy) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
             return p.send(methodInput);
         }),
-        sendTest: trpc_middleware_js_1.protectedProcedure
-            .input(zod_1.z.object({ nodeId: zod_1.z.string().optional(), addonId: zod_1.z.string().optional() }).optional())
-            .output(types_68.notificationOutputCapability.methods.sendTest.output)
+        testTarget: trpc_middleware_js_1.protectedProcedure
+            .input(types_68.notificationOutputCapability.methods.testTarget.input.loose())
+            .output(types_68.notificationOutputCapability.methods.testTarget.output)
+            .mutation(async ({ input, ctx }) => {
+            const { nodeId, addonId, ...methodInput } = input;
+            const p = resolveProvider('notification-output', nodeId, () => getProvider(ctx, addonId), createRemoteProxy);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
+            return p.testTarget(methodInput);
+        }),
+        upsertTarget: trpc_middleware_js_1.protectedProcedure
+            .input(types_68.notificationOutputCapability.methods.upsertTarget.input.loose())
+            .output(types_68.notificationOutputCapability.methods.upsertTarget.output)
+            .mutation(async ({ input, ctx }) => {
+            const { nodeId, addonId, ...methodInput } = input;
+            const p = resolveProvider('notification-output', nodeId, () => getProvider(ctx, addonId), createRemoteProxy);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
+            return p.upsertTarget(methodInput);
+        }),
+        deleteTarget: trpc_middleware_js_1.protectedProcedure
+            .input(types_68.notificationOutputCapability.methods.deleteTarget.input.loose())
+            .output(types_68.notificationOutputCapability.methods.deleteTarget.output)
             .mutation(async ({ input, ctx }) => {
-            const p = resolveProvider('notification-output', input?.nodeId, () => getProvider(ctx, input?.addonId), createRemoteProxy);
-            return p.sendTest();
+            const { nodeId, addonId, ...methodInput } = input;
+            const p = resolveProvider('notification-output', nodeId, () => getProvider(ctx, addonId), createRemoteProxy);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
+            return p.deleteTarget(methodInput);
+        }),
+        setTargetEnabled: trpc_middleware_js_1.protectedProcedure
+            .input(types_68.notificationOutputCapability.methods.setTargetEnabled.input.loose())
+            .output(types_68.notificationOutputCapability.methods.setTargetEnabled.output)
+            .mutation(async ({ input, ctx }) => {
+            const { nodeId, addonId, ...methodInput } = input;
+            const p = resolveProvider('notification-output', nodeId, () => getProvider(ctx, addonId), createRemoteProxy);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
+            return p.setTargetEnabled(methodInput);
         }),
     });
 }

package/dist/core/addon/addon-call-gateway.js

@@ -18,7 +18,11 @@ class AddonCallGateway {
         const onHub = resolved === 'hub' || resolved === this.deps.hubNodeId;
         if (onHub) {
             const childRegistry = this.deps.getChildRegistry();
-            if (childRegistry !== null && childRegistry.isChildKnown(addonId)) {
+            // Resolve to the runner child id: a grouped addon's UDS child is the
+            // group name, not the addon id. `isChildKnown(addonId)` would be false
+            // for a grouped addon and misclassify it as `in-process`.
+            const childId = this.deps.resolveChildId(addonId);
+            if (childRegistry !== null && childRegistry.isChildKnown(childId)) {
                 return { kind: 'hub-local-child' };
             }
             return { kind: 'in-process' };
@@ -48,7 +52,10 @@ class AddonCallGateway {
                 if (childRegistry === null) {
                     throw new Error(`AddonCallGateway: child registry unavailable for "${addonId}"`);
                 }
-                return childRegistry.callAddonOnChild(addonId, fullInput);
+                // Dispatch to the runner CHILD id (group when grouped, else addon id);
+                // the payload keeps the real `addonId` so the child fans out to the
+                // right co-located addon within the group.
+                return childRegistry.callAddonOnChild(this.deps.resolveChildId(addonId), fullInput);
             }
             case 'remote-agent':
                 return this.callRemoteAgent(addonId, dest.baseNodeId, fullInput);

package/dist/core/addon/addon-package.service.js

@@ -1674,8 +1674,9 @@ class AddonPackageService {
         this.notificationService
             .notify({
             title: 'Package Updated',
-            message: `${name} updated to v${version}`,
-            severity: 'info',
+            body: `${name} updated to v${version}`,
+            format: 'text',
+            priority: 3,
             category: 'system',
             timestamp: Date.now(),
         })

package/dist/core/addon/addon-registry.service.js

@@ -359,10 +359,15 @@ class AddonRegistryService {
                 // forked-vs-in-process is decided by `isChildKnown` in the gateway.
                 return entry ? this.broker.nodeID : 'hub';
             },
+            resolveChildId: (addonId) => this.childIdForAddon(addonId),
             getChildRegistry: () => this.moleculer.childRegistry,
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- moleculer types unresolvable; see `broker` getter docstring
             broker: this.moleculer.broker,
         });
+        // Hand the UDS registry a live addonId → runner-id resolver so its
+        // active-singleton preference can select a grouped addon (whose child id
+        // is its `execution.group`, not its own id). Identity for ungrouped addons.
+        this.moleculer.setRunnerIdResolver((addonId) => this.childIdForAddon(addonId));
         const settingsProvider = (0, addon_settings_provider_js_1.createAddonSettingsProvider)({
             getAddon: (addonId) => {
                 const entry = this.addonEntries.get(addonId);
@@ -869,6 +874,19 @@ class AddonRegistryService {
      * isn't a cap, but the child is UDS-reachable and has served its endpoints by
      * the time any of its caps register.
      */
+    /**
+     * The UDS runner/child id an addon is reachable under. For a solo addon
+     * (no `execution.group`) this is the addon id itself; for a grouped addon
+     * it is the shared group name (`resolveRunnerId`). The single authority for
+     * "which child hosts this addon" on the parent side — every gateway /
+     * route-mount / data-plane-mount lookup routes through here so a grouped
+     * addon (`execution.group`) is never misclassified as `in-process`.
+     * Falls back to the addon id when the declaration is not yet known.
+     */
+    childIdForAddon(addonId) {
+        const decl = this.addonEntries.get(addonId)?.declaration;
+        return decl ? (0, types_1.resolveRunnerId)(decl, addonId) : addonId;
+    }
     async mountAddonDataPlanes(addonId) {
         const registry = this.dataPlaneRegistry;
         if (!registry)
@@ -880,7 +898,7 @@ class AddonRegistryService {
         // data-plane yet).
         if (!entry || !this.isForkedAddonEntry(entry))
             return;
-        if (childRegistry === null || !childRegistry.isChildKnown(addonId))
+        if (childRegistry === null || !childRegistry.isChildKnown(this.childIdForAddon(addonId)))
             return;
         const raw = await this.addonCallGateway.callForked(addonId, { target: 'data-planes' });
         const endpoints = parseDataPlaneEndpoints(raw);
@@ -2168,7 +2186,7 @@ class AddonRegistryService {
         const entry = this.addonEntries.get(addonId);
         const childRegistry = this.moleculer.childRegistry;
         if (entry && this.isForkedAddonEntry(entry)) {
-            if (childRegistry !== null && childRegistry.isChildKnown(addonId)) {
+            if (childRegistry !== null && childRegistry.isChildKnown(this.childIdForAddon(addonId))) {
                 await this.mountForkedAddonRoutes(addonId, routeProvider, addonRouteRegistry);
                 return;
             }

package/dist/core/moleculer/moleculer.service.js

@@ -74,6 +74,23 @@ class MoleculerService {
      * handler, preventing subscriber leaks on shutdown.
      */
     udsEventBridgeDispose = null;
+    /**
+     * addonId → runner/child id resolver, injected late by
+     * `AddonRegistryService` (which owns the addon declarations). Lets the UDS
+     * `LocalChildRegistry` map the operator's active-singleton preference (an
+     * addonId) onto a candidate CHILD id — a grouped addon's child id is its
+     * `execution.group`, not its own id. Read live so a manifest change takes
+     * effect without rebuilding the registry. Null → identity (addonId ===
+     * childId), the correct default for every ungrouped addon.
+     */
+    runnerIdResolver = null;
+    /**
+     * Late-wire the addonId → runner-id resolver used by the UDS singleton
+     * preference. Called once by `AddonRegistryService` during boot.
+     */
+    setRunnerIdResolver(resolver) {
+        this.runnerIdResolver = resolver;
+    }
     get childRegistry() {
         return this.localChildRegistry;
     }
@@ -287,6 +304,11 @@ class MoleculerService {
                 // registry on every call so a runtime swap takes effect
                 // immediately without rebuilding the resolver snapshot.
                 getActiveSingletonAddonId: (capName) => this.capabilityService.getRegistry()?.getSingletonAddonId(capName) ?? null,
+                // Map the preferred addonId to its runner CHILD id (group when the
+                // addon declares `execution.group`, else its own id) so a grouped
+                // addon stays selectable as the active singleton. Identity until
+                // `AddonRegistryService` injects the resolver.
+                resolveChildIdForAddon: (addonId) => this.runnerIdResolver?.(addonId) ?? addonId,
             });
             await registry.start();
             // E1: apply child manifest + cleanup from the UDS lifecycle (hub-local children).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.1.19",
+  "version": "1.1.20",
   "private": false,
   "files": [
     "dist",
@@ -24,6 +24,7 @@
   "dependencies": {
     "@camstack/addon-admin-ui": "*",
     "@camstack/addon-advanced-notifier": "*",
+    "@camstack/addon-notifiers": "*",
     "@camstack/addon-pipeline": "*",
     "@camstack/addon-pipeline-orchestrator": "*",
     "@camstack/addon-post-analysis": "*",