camstack 1.2.214 → 1.2.215

package/dist/{server-TZCZTLBW.js → server-7C635XXX.js}

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 import {
   ALL_CAPABILITY_DEFINITIONS,
+  ActionTargetSchema,
   AlarmArmModeSchema,
   AutomationRecipeSchema,
   DETECTOR_PERF,
@@ -18,7 +19,7 @@ import {
   prepareRecipeUnits,
   unitsForQuantity,
   validateRecipeBounds
-} from "./chunk-4Y3CBGOY.js";
+} from "./chunk-WGHOCSCW.js";
 import {
   IMAGE_TAG_BY_ACCELERATOR,
   MUST_NOT_OMIT,
@@ -602,16 +603,29 @@ var ActionAnswerSchema = z4.discriminatedUnion("kind", [
   z4.object({ kind: z4.literal("wait"), seconds: z4.number().min(0).max(300) }),
   z4.object({
     kind: z4.literal("cap"),
-    deviceId: z4.union([
-      z4.number().int().nonnegative(),
-      z4.array(z4.number().int().nonnegative()).min(1)
-    ]),
+    /** WHO the step acts on: named devices, or every device offering `actionId` (optionally in a room / of a type). */
+    target: ActionTargetSchema.optional(),
+    /** The vocabulary action (`cover.open`); required for a `domain` target. */
+    actionId: z4.string().min(1).optional(),
+    /** Shorthand for `target: { kind: 'devices', ids }`. */
+    deviceId: z4.union([z4.number().int().nonnegative(), z4.array(z4.number().int().nonnegative()).min(1)]).optional(),
     cap: z4.string().min(1),
     method: z4.string().min(1),
     /** A quantity argument is `{ value, unit }`; a bare number is stamped with the declared unit. */
     args: z4.record(z4.string(), z4.unknown()).optional()
+  }).refine((a) => a.target !== void 0 || a.deviceId !== void 0, {
+    message: "a cap step needs a target (or a deviceId)",
+    path: ["target"]
+  }).refine((a) => a.target?.kind !== "domain" || a.actionId !== void 0, {
+    message: "a domain target needs the vocabulary action it applies to (actionId)",
+    path: ["actionId"]
   })
 ]);
+function targetOfAnswer(a) {
+  if (a.target !== void 0) return a.target;
+  const ids = Array.isArray(a.deviceId) ? [...a.deviceId] : a.deviceId === void 0 ? [] : [a.deviceId];
+  return { kind: "devices", ids };
+}
 var AutomationTriggerAnswerSchema = z4.object({
   kind: z4.enum(["detection", "device-state", "schedule"]),
   // detection
@@ -661,7 +675,7 @@ var CONDITIONS_QUESTION = {
 };
 var ACTIONS_QUESTION = {
   field: "actions",
-  ask: 'What should it do? A list of steps, in order: { kind: "cap", deviceId, cap, method, args? } or { kind: "wait", seconds }. deviceId may be a list to run the same call on several devices.'
+  ask: 'What should it do? A list of steps, in order: { kind: "cap", target, actionId?, cap, method, args? } or { kind: "wait", seconds }. target is { kind: "devices", ids: [...] } to name devices, or { kind: "domain", roomId?, deviceType? } with the vocabulary actionId (for example "cover.open") to act on every device that offers it \u2014 resolved when the step runs, so a device added later is included. deviceId (a number or a list) is still accepted as shorthand for named devices.'
 };
 function fieldChoices(fields) {
   return fields.map((f) => {
@@ -949,7 +963,8 @@ async function checkActions(client, actions) {
   const cache = /* @__PURE__ */ new Map();
   for (const [idx, action] of actions.entries()) {
     if (action.kind !== "cap") continue;
-    const ids = Array.isArray(action.deviceId) ? action.deviceId : [action.deviceId];
+    const target = targetOfAnswer(action);
+    const ids = target.kind === "devices" ? target.ids : [];
     for (const id of ids) {
       let caps = cache.get(id);
       if (caps === void 0) {
@@ -987,7 +1002,8 @@ function toActions(actions) {
     if (a.kind === "wait") return { kind: "wait", seconds: a.seconds };
     return {
       kind: "cap",
-      deviceId: Array.isArray(a.deviceId) ? [...a.deviceId] : a.deviceId,
+      target: targetOfAnswer(a),
+      ...a.actionId !== void 0 ? { actionId: a.actionId } : {},
       cap: a.cap,
       method: a.method,
       ...a.args !== void 0 ? { args: a.args } : {}
@@ -1031,9 +1047,10 @@ function summarize(trigger, conditions, actions, cooldown) {
   for (const a of actions) {
     if (a.kind === "wait") lines.push(`  then wait ${a.seconds}s`);
     else {
-      const ids = Array.isArray(a.deviceId) ? a.deviceId.join(", ") : String(a.deviceId);
+      const t = targetOfAnswer(a);
+      const who = t.kind === "devices" ? `device ${t.ids.join(", ")}` : t.kind === "var" ? `device $${t.name}` : `every device that can ${a.actionId ?? a.method}${t.roomId === void 0 ? "" : ` in ${t.roomId}`}${t.deviceType === void 0 ? "" : ` of type ${t.deviceType}`}`;
       lines.push(
-        `  then ${a.cap}.${a.method} on device ${ids}${a.args ? ` with ${JSON.stringify(a.args)}` : ""}`
+        `  then ${a.cap}.${a.method} on ${who}${a.args ? ` with ${JSON.stringify(a.args)}` : ""}`
       );
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "camstack",
-  "version": "1.2.214",
+  "version": "1.2.215",
   "description": "CLI tool for managing and running CamStack server",
   "keywords": [
     "camstack",