@pikku/cli 0.12.145 → 0.12.152

package/dist/.pikku/schemas/schemas/FabricSecretsDeleteOutput.schema.json

@@ -1 +1 @@
-{ "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "name": { "type": "string" }, "runId": { "anyOf": [{ "type": "string" }, { "type": "null" }] }, "deploymentId": { "anyOf": [{ "type": "string" }, { "type": "null" }] } }, "required": ["name", "runId", "deploymentId"], "additionalProperties": false }
+{ "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "name": { "type": "string" }, "runId": { "type": ["string", "null"] }, "deploymentId": { "type": ["string", "null"] } }, "required": ["name", "runId", "deploymentId"], "additionalProperties": false }

package/dist/.pikku/schemas/schemas/FabricSecretsRotateOutput.schema.json

@@ -1 +1 @@
-{ "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "retiredKeyId": { "anyOf": [{ "type": "string" }, { "type": "null" }] } }, "required": ["retiredKeyId"], "additionalProperties": false }
+{ "$schema": "https://json-schema.org/draft/2020-12/schema", "type": "object", "properties": { "retiredKeyId": { "type": ["string", "null"] } }, "required": ["retiredKeyId"], "additionalProperties": false }

package/dist/.pikku/schemas/schemas/PikkuAnalyticsOutput.schema.json

@@ -0,0 +1 @@
+{ "$schema": "http://json-schema.org/draft-07/schema#", "type": "boolean", "enum": [false, true], "definitions": {} }

package/dist/.pikku/schemas/schemas/PikkuFeatureFlagsScaffoldOutput.schema.json

@@ -0,0 +1 @@
+{ "$schema": "http://json-schema.org/draft-07/schema#", "type": "boolean", "enum": [false, true], "definitions": {} }

package/dist/.pikku/schemas/schemas/PikkuFlagsInput.schema.json

@@ -0,0 +1 @@
+{ "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "properties": { "bootstrap": { "type": "boolean" } }, "additionalProperties": false, "definitions": {} }

package/dist/.pikku/scopes/index.d.ts

@@ -1,7 +1,8 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * Subpath entry — `#pikku/scopes` resolves here.
  */
 export * from './pikku-scope-types.gen.js';
+export * from './pikku-flags.gen.js';

package/dist/.pikku/scopes/index.js

@@ -1,7 +1,8 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * Subpath entry — `#pikku/scopes` resolves here.
  */
 export * from './pikku-scope-types.gen.js';
+export * from './pikku-flags.gen.js';

package/dist/.pikku/scopes/pikku-flags-meta.gen.json

@@ -0,0 +1 @@
+{}

package/dist/.pikku/scopes/pikku-flags.gen.d.ts

@@ -0,0 +1,41 @@
+/**
+ * This file was generated by @pikku/cli@0.12.152
+ */
+/**
+ * This file was generated by the @pikku/cli
+ */
+import type { DeclaredFlag } from '@pikku/core/flag';
+/** Every feature flag declared in this application. */
+export type FeatureFlagName = never;
+/**
+ * The declared flag set, for a FeatureFlagStore to sync into its store.
+ *
+ * Derived from the metadata sidecar rather than inlined, so the import above
+ * forces tsc to emit the .json alongside this file — an addon publishes only
+ * its compiled output, and a host reads that .json to merge the addon's flags
+ * into its own union.
+ *
+ * Additive on removal: a deleted declaration leaves the row marked
+ * `declared: false` rather than switching a feature off on deploy. Use
+ * `pikku flags prune` to remove them.
+ */
+export declare const FEATURE_FLAGS: DeclaredFlag[];
+/**
+ * Declared flags, keyed by name. Rendered by the console beside each switch.
+ *
+ * Keyed by `FeatureFlagName` so a misspelled lookup is a type error, which is
+ * the whole point of generating the union. The assertion is what
+ * `Object.fromEntries` costs — it returns an index signature — and it is
+ * sound here because both this object and the union are built from
+ * `FEATURE_FLAGS`, so every key of the union is present.
+ */
+export declare const FEATURE_FLAGS_META: Record<FeatureFlagName, DeclaredFlag>;
+/**
+ * What a flag source falls back to when its backing store cannot be read: every
+ * declared flag on, no rollout, no overrides.
+ *
+ * Failing open is deliberate. A flag store is not an authorization boundary —
+ * `scopes:` is — so an unreadable config must not take the product down with
+ * it.
+ */
+export declare const FEATURE_FLAGS_FALLBACK: import("@pikku/core/flag").FlagConfigSnapshot;

package/dist/.pikku/scopes/pikku-flags.gen.js

@@ -0,0 +1,34 @@
+import { compiledFallbackSnapshot, flattenFeatureFlagDefinitions, } from '@pikku/core/flag';
+import definitions from './pikku-flags-meta.gen.json' with { type: 'json' };
+/**
+ * The declared flag set, for a FeatureFlagStore to sync into its store.
+ *
+ * Derived from the metadata sidecar rather than inlined, so the import above
+ * forces tsc to emit the .json alongside this file — an addon publishes only
+ * its compiled output, and a host reads that .json to merge the addon's flags
+ * into its own union.
+ *
+ * Additive on removal: a deleted declaration leaves the row marked
+ * `declared: false` rather than switching a feature off on deploy. Use
+ * `pikku flags prune` to remove them.
+ */
+export const FEATURE_FLAGS = flattenFeatureFlagDefinitions(Object.values(definitions));
+/**
+ * Declared flags, keyed by name. Rendered by the console beside each switch.
+ *
+ * Keyed by `FeatureFlagName` so a misspelled lookup is a type error, which is
+ * the whole point of generating the union. The assertion is what
+ * `Object.fromEntries` costs — it returns an index signature — and it is
+ * sound here because both this object and the union are built from
+ * `FEATURE_FLAGS`, so every key of the union is present.
+ */
+export const FEATURE_FLAGS_META = Object.fromEntries(FEATURE_FLAGS.map((flag) => [flag.name, flag]));
+/**
+ * What a flag source falls back to when its backing store cannot be read: every
+ * declared flag on, no rollout, no overrides.
+ *
+ * Failing open is deliberate. A flag store is not an authorization boundary —
+ * `scopes:` is — so an unreadable config must not take the product down with
+ * it.
+ */
+export const FEATURE_FLAGS_FALLBACK = compiledFallbackSnapshot(FEATURE_FLAGS);

package/dist/.pikku/scopes/pikku-personas.gen.js

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * This file was generated by the @pikku/cli

package/dist/.pikku/scopes/pikku-roles.gen.d.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * This file was generated by the @pikku/cli

package/dist/.pikku/scopes/pikku-scope-types.gen.d.ts

@@ -1,5 +1,6 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 export { defineScope } from '@pikku/core/scope';
 export { defineSystemRole } from '@pikku/core/role';
+export { defineFeatureFlags } from '@pikku/core/flag';

package/dist/.pikku/scopes/pikku-scope-types.gen.js

@@ -1,5 +1,6 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 export { defineScope } from '@pikku/core/scope';
 export { defineSystemRole } from '@pikku/core/role';
+export { defineFeatureFlags } from '@pikku/core/flag';

package/dist/.pikku/scopes/pikku-scopes.gen.d.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * This file was generated by the @pikku/cli

package/dist/.pikku/secrets/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * Subpath entry — `#pikku/secrets` resolves here.

package/dist/.pikku/secrets/index.js

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * Subpath entry — `#pikku/secrets` resolves here.

package/dist/.pikku/secrets/pikku-secret-types.gen.d.ts

@@ -1,4 +1,4 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 export { defineSecret } from '@pikku/core/secret';

package/dist/.pikku/secrets/pikku-secret-types.gen.js

@@ -1,4 +1,4 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 export { defineSecret } from '@pikku/core/secret';

package/dist/.pikku/secrets/pikku-secrets.gen.d.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 import { TypedSecretService as CoreTypedSecretService } from '@pikku/core/services';
 import type { SecretService } from '@pikku/core/services';

package/dist/.pikku/secrets/pikku-secrets.gen.js

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 import { TypedSecretService as CoreTypedSecretService } from '@pikku/core/services';
 /**

package/dist/.pikku/services/pikku-meta-service.gen.d.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 import { LocalMetaService } from '@pikku/core/services/local-meta';
 export declare class PikkuMetaService extends LocalMetaService {

package/dist/.pikku/services/pikku-meta-service.gen.js

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 import { LocalMetaService } from '@pikku/core/services/local-meta';
 export class PikkuMetaService extends LocalMetaService {

package/dist/.pikku/setup/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * Subpath entry — `#pikku/setup` resolves here.

package/dist/.pikku/setup/index.js

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * Subpath entry — `#pikku/setup` resolves here.

package/dist/.pikku/setup/pikku-setup-types.gen.d.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * Config and service factory definitions, declared once per application
@@ -41,7 +41,7 @@ export declare const pikkuConfig: (func: (variables?: any, ...args: any[]) => Pr
  * })
  * ```
  */
-export declare const pikkuServices: (func: (config: Config, existingServices: Partial<SingletonServices>) => Promise<Partial<Omit<RequiredSingletonServices, "auth">>>) => (config: Config, existingServices?: Partial<SingletonServices>) => Promise<RequiredSingletonServices>;
+export declare const pikkuServices: (func: (config: Config, existingServices: Partial<SingletonServices>) => Promise<Partial<Omit<RequiredSingletonServices, 'auth'>>>) => (config: Config, existingServices?: Partial<SingletonServices>) => Promise<RequiredSingletonServices>;
 /**
  * Creates a Pikku wire services factory.
  * Use this to define services that are created per-request/session.

package/dist/.pikku/setup/pikku-setup-types.gen.js

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * Config and service factory definitions, declared once per application

package/dist/.pikku/trigger/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * Subpath entry — `#pikku/trigger` resolves here.

package/dist/.pikku/trigger/index.js

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * Subpath entry — `#pikku/trigger` resolves here.

package/dist/.pikku/trigger/pikku-trigger-types.gen.d.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * Trigger-specific type definitions for tree-shaking optimization

package/dist/.pikku/trigger/pikku-trigger-types.gen.js

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * Trigger-specific type definitions for tree-shaking optimization

package/dist/.pikku/variables/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * Subpath entry — `#pikku/variables` resolves here.

package/dist/.pikku/variables/index.js

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * Subpath entry — `#pikku/variables` resolves here.

package/dist/.pikku/variables/pikku-variable-types.gen.d.ts

@@ -1,4 +1,4 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 export { defineVariable } from '@pikku/core/variable';

package/dist/.pikku/variables/pikku-variable-types.gen.js

@@ -1,4 +1,4 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 export { defineVariable } from '@pikku/core/variable';

package/dist/.pikku/variables/pikku-variables.gen.d.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 import { TypedVariablesService as CoreTypedVariablesService } from '@pikku/core/services';
 import type { VariablesService } from '@pikku/core/services';

package/dist/.pikku/variables/pikku-variables.gen.js

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 import { TypedVariablesService as CoreTypedVariablesService, } from '@pikku/core/services';
 /**

package/dist/.pikku/workflow/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * Subpath entry — `#pikku/workflow` resolves here.

package/dist/.pikku/workflow/index.js

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 /**
  * Subpath entry — `#pikku/workflow` resolves here.

package/dist/.pikku/workflow/meta/allWorkflow.gen.json

@@ -29,9 +29,15 @@
         "Bootstrap roles": {
             "nodeId": "Bootstrap roles",
             "rpcName": "pikkuRoles",
-            "next": "Bootstrap personas",
+            "next": "Bootstrap flags",
             "stepHash": "90dda4d88b2d"
         },
+        "Bootstrap flags": {
+            "nodeId": "Bootstrap flags",
+            "rpcName": "pikkuFlags",
+            "next": "Bootstrap personas",
+            "stepHash": "62d654700c85"
+        },
         "Bootstrap personas": {
             "nodeId": "Bootstrap personas",
             "rpcName": "pikkuPersonas",
@@ -148,9 +154,15 @@
         "Scope definition types": {
             "nodeId": "Scope definition types",
             "rpcName": "pikkuScopeDefinitionTypes",
-            "next": "Variable definition types",
+            "next": "Analytics definition types",
             "stepHash": "578ebaf38e55"
         },
+        "Analytics definition types": {
+            "nodeId": "Analytics definition types",
+            "rpcName": "pikkuAnalyticsDefinitionTypes",
+            "next": "Variable definition types",
+            "stepHash": "420bf91d2b6f"
+        },
         "Variable definition types": {
             "nodeId": "Variable definition types",
             "rpcName": "pikkuVariableDefinitionTypes",
@@ -285,9 +297,21 @@
         "Public RPC": {
             "nodeId": "Public RPC",
             "rpcName": "pikkuPublicRPC",
-            "next": "Console functions",
+            "next": "Analytics ingest",
             "stepHash": "4f8cc6772ba9"
         },
+        "Analytics ingest": {
+            "nodeId": "Analytics ingest",
+            "rpcName": "pikkuAnalytics",
+            "next": "Feature flag wire",
+            "stepHash": "aafe41b4c8a7"
+        },
+        "Feature flag wire": {
+            "nodeId": "Feature flag wire",
+            "rpcName": "pikkuFeatureFlagsScaffold",
+            "next": "Console functions",
+            "stepHash": "d48757aadd38"
+        },
         "Console functions": {
             "nodeId": "Console functions",
             "rpcName": "pikkuConsoleFunctions",
@@ -345,9 +369,15 @@
         "Roles": {
             "nodeId": "Roles",
             "rpcName": "pikkuRoles",
-            "next": "Personas",
+            "next": "Flags",
             "stepHash": "fa13d3597a32"
         },
+        "Flags": {
+            "nodeId": "Flags",
+            "rpcName": "pikkuFlags",
+            "next": "Personas",
+            "stepHash": "db3b4c10e7f4"
+        },
         "Personas": {
             "nodeId": "Personas",
             "rpcName": "pikkuPersonas",
@@ -386,9 +416,15 @@
         "Variables (post-scaffold)": {
             "nodeId": "Variables (post-scaffold)",
             "rpcName": "pikkuVariables",
-            "next": "Schemas",
+            "next": "Middleware (post-scaffold)",
             "stepHash": "047ea7a92357"
         },
+        "Middleware (post-scaffold)": {
+            "nodeId": "Middleware (post-scaffold)",
+            "rpcName": "pikkuMiddleware",
+            "next": "Schemas",
+            "stepHash": "49deeac0de2a"
+        },
         "Schemas": {
             "nodeId": "Schemas",
             "rpcName": "pikkuSchemas",
@@ -663,5 +699,5 @@
     "entryNodeIds": [
         "Bootstrap inspect"
     ],
-    "graphHash": "86e8e93c80a5"
+    "graphHash": "bb527409aef4"
 }

package/dist/.pikku/workflow/pikku-workflow-types.gen.d.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 import { WorkflowCancelledException } from '@pikku/core/workflow';
 import type { PikkuWorkflowGraphConfig, PikkuWorkflowGraphResult } from '@pikku/core/workflow';

package/dist/.pikku/workflow/pikku-workflow-types.gen.js

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 import { WorkflowCancelledException } from '@pikku/core/workflow';
 import { pikkuWorkflowGraph as corePikkuWorkflowGraph } from '@pikku/core/workflow';

package/dist/.pikku/workflow/pikku-workflow-wirings-meta.gen.js

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 import { pikkuState } from '@pikku/core/state';
 import allWorkflowMeta from './meta/allWorkflow.gen.json' with { type: 'json' };

package/dist/.pikku/workflow/pikku-workflow-wirings.gen.js

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.12.145
+ * This file was generated by @pikku/cli@0.12.152
  */
 import { addWorkflow } from '@pikku/core/workflow';
 import './pikku-workflow-wirings-meta.gen.js';

package/dist/bin/pikku-bin.mjs

@@ -11,8 +11,8 @@ async function checkForUpdate() {
     })
     if (!res.ok) return
     const { version: latest } = await res.json()
-    if (latest !== '0.12.145') {
-      process.stderr.write(`\n  Update available  0.12.145 → ${latest}\n  brew upgrade pikku  or  npm install -g @pikku/cli\n\n`)
+    if (latest !== '0.12.152') {
+      process.stderr.write(`\n  Update available  0.12.152 → ${latest}\n  brew upgrade pikku  or  npm install -g @pikku/cli\n\n`)
     }
   } catch {}
 }

package/dist/src/deploy/analyzer/analyzer.d.ts

@@ -38,7 +38,7 @@ export interface AnalyzerOptions {
     /**
      * Sourced from `pikku.config.json` → `deploy.grouping`. Decides how many
      * deployment units the `role: 'function'` units collapse into. Omitted
-     * means one unit per function.
+     * means one unit per distinct service combination.
      */
     grouping?: GroupingConfig;
 }

package/dist/src/deploy/analyzer/analyzer.js

@@ -6,7 +6,7 @@
  * Gateways (MCP, agents, channels) dispatch to function units via RPC.
  * Workflow orchestrators dispatch to step units via queue or RPC (inline).
  */
-import { resolveDeployTarget, } from '@pikku/inspector';
+import { incompatibleServicesFor, resolveDeployTarget, } from '@pikku/inspector';
 import { relative } from 'node:path';
 import { isScenarioFunction, withoutScenarios, withoutScenarioWorkflows, } from '../../functions/wirings/scenarios/scenario-partition.js';
 import { toSafeKebab } from './naming.js';
@@ -40,8 +40,23 @@ export function analyzeDeployment(state, options) {
             prefixed(r.route),
         ]),
         tagsForFunction: tagsFor,
+        servicesForFunction: (funcId) => functionsMeta[funcId]?.services?.services ?? [],
+        targetForFunction: (funcId) => {
+            const funcMeta = functionsMeta[funcId];
+            return funcMeta
+                ? resolveDeployTarget(funcMeta, serverlessIncompatible, funcId, defaultTarget)
+                : defaultTarget;
+        },
     });
     const addFunctionUnit = (unit) => {
+        // Set here rather than at each call site: a unit is created from six
+        // places (functions, channels, agents, MCP, workflow orchestrators, steps)
+        // and a unit missing its key reads as one the strategy never named.
+        if (!unit.servicesKey) {
+            const key = resolver.serviceKeyForUnit(unit.name);
+            if (key)
+                unit.servicesKey = key;
+        }
         const existing = units.find((u) => u.name === unit.name);
         if (!existing) {
             units.push(unit);
@@ -76,6 +91,15 @@ export function analyzeDeployment(state, options) {
                 existing.tags.push(tag);
             }
         }
+        if (unit.targetForcedBy?.length) {
+            const forcedBy = existing.targetForcedBy ?? [];
+            for (const svc of unit.targetForcedBy) {
+                if (!forcedBy.includes(svc)) {
+                    forcedBy.push(svc);
+                }
+            }
+            existing.targetForcedBy = forcedBy;
+        }
         for (const handler of unit.handlers) {
             if (handler.type === 'fetch') {
                 const fetchHandler = existing.handlers.find((h) => h.type === 'fetch');
@@ -210,8 +234,11 @@ export function analyzeDeployment(state, options) {
             continue;
         }
         const invokedAgents = collectInvokedAgents(state, funcId);
+        const unitName = unitFor(funcId);
+        const groupedBy = resolver.ruleForUnit(unitName);
+        const forcedBy = incompatibleServicesFor(funcMeta, serverlessIncompatible);
         addFunctionUnit({
-            name: unitFor(funcId),
+            name: unitName,
             role: 'function',
             target: resolveDeployTarget(funcMeta, serverlessIncompatible, funcId, defaultTarget),
             functionIds: [funcId],
@@ -220,6 +247,8 @@ export function analyzeDeployment(state, options) {
             handlers,
             tags: tagsFor(funcId),
             ...(invokedAgents.length > 0 && { invokedAgents }),
+            ...(groupedBy && { groupedBy }),
+            ...(forcedBy.length > 0 && { targetForcedBy: forcedBy }),
         });
     }
     // ── Step 1b: Addon units ───────────────────────────────────────────
@@ -230,10 +259,12 @@ export function analyzeDeployment(state, options) {
             continue;
         }
         const unitName = resolver.forAddon(namespace);
+        const addonGroupedBy = resolver.ruleForUnit(unitName);
         const addonIncompatible = new Set(state.addonServerlessIncompatible?.get(namespace) ?? []);
         const routes = [];
         const functionIds = [];
         const services = [];
+        const addonForcedBy = [];
         let target = defaultTarget;
         for (const [funcName, funcMeta] of exposed) {
             const rpcName = `${namespace}:${funcName}`;
@@ -254,6 +285,11 @@ export function analyzeDeployment(state, options) {
                     services.push(service);
                 }
             }
+            for (const svc of incompatibleServicesFor(funcMeta, addonIncompatible)) {
+                if (!addonForcedBy.includes(svc)) {
+                    addonForcedBy.push(svc);
+                }
+            }
             if (resolveDeployTarget(funcMeta, addonIncompatible, rpcName, defaultTarget) === 'server') {
                 target = 'server';
             }
@@ -267,6 +303,8 @@ export function analyzeDeployment(state, options) {
             dependsOn: [],
             handlers: [{ type: 'fetch', routes }],
             tags: [],
+            ...(addonGroupedBy && { groupedBy: addonGroupedBy }),
+            ...(addonForcedBy.length > 0 && { targetForcedBy: addonForcedBy }),
         });
     }
     // ── Step 2: Agent gateways ─────────────────────────────────────────