iobroker.assistant 0.1.2 → 0.1.6

package/build/lib/credentials.js

@@ -1,7 +1,37 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readCentralKey = readCentralKey;
 exports.resolveApiKey = resolveApiKey;
@@ -20,18 +50,18 @@ exports.resolveVoiceCredentials = resolveVoiceCredentials;
  * js-controller >= 7.2 / a recent \@iobroker/adapter-core. We access it defensively so the
  * adapter still compiles and runs (in `manual` mode) on older controllers.
  */
-const credentials_1 = __importDefault(require("@iobroker/adapter-core/credentials"));
+const Credentials = __importStar(require("@iobroker/adapter-core/credentials"));
 /** Read and decrypt a single credential's key from the central store; '' (and a warning) on error. */
 async function readCentralKey(adapter, id) {
     if (!id) {
         return '';
     }
-    if (!credentials_1.default?.getCredentials) {
+    if (!Credentials?.getCredentials) {
         adapter.log.warn(`Cannot read credential "${id}": the central Credentials API needs js-controller >= 7.2`);
         return '';
     }
     try {
-        const cred = await credentials_1.default.getCredentials(adapter, id);
+        const cred = await Credentials.getCredentials(adapter, id);
         return (cred?.values?.key || '').trim();
     }
     catch (e) {
@@ -57,12 +87,12 @@ async function readCentralValues(adapter, id) {
     if (!id) {
         return {};
     }
-    if (!credentials_1.default?.getCredentials) {
+    if (!Credentials?.getCredentials) {
         adapter.log.warn(`Cannot read credential "${id}": the central Credentials API needs js-controller >= 7.2`);
         return {};
     }
     try {
-        const cred = await credentials_1.default.getCredentials(adapter, id);
+        const cred = await Credentials.getCredentials(adapter, id);
         return cred?.values || {};
     }
     catch (e) {

package/build/lib/credentials.js.map

@@ -1 +1 @@
-{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../src/lib/credentials.ts"],"names":[],"mappings":";;;;;AAkBA,wCAeC;AAOD,sCAWC;AAGD,8CAeC;AAqBD,0DAmCC;AA7HD;;;;;;;;;;;;GAYG;AACH,qFAA6D;AAI7D,sGAAsG;AAC/F,KAAK,UAAU,cAAc,CAAC,OAAyB,EAAE,EAAU;IACtE,IAAI,CAAC,EAAE,EAAE,CAAC;QACN,OAAO,EAAE,CAAC;IACd,CAAC;IACD,IAAI,CAAC,qBAAW,EAAE,cAAc,EAAE,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,2BAA2B,EAAE,2DAA2D,CAAC,CAAC;QAC3G,OAAO,EAAE,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,qBAAW,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC3D,OAAO,CAAE,IAAI,EAAE,MAAM,EAAE,GAAc,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACxD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,2BAA2B,EAAE,MAAO,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5E,OAAO,EAAE,CAAC;IACd,CAAC;AACL,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,aAAa,CAC/B,OAAyB,EACzB,MAAqB,EACrB,QAA4F;IAE5F,MAAM,IAAI,GAAG,QAAQ,EAAE,cAAc,IAAI,MAAM,CAAC,cAAc,IAAI,QAAQ,CAAC;IAC3E,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,MAAM,EAAE,GAAG,CAAC,QAAQ,EAAE,YAAY,IAAI,MAAM,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9E,OAAO,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,CAAC,QAAQ,EAAE,MAAM,IAAI,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AAC5D,CAAC;AAED,uGAAuG;AAChG,KAAK,UAAU,iBAAiB,CAAC,OAAyB,EAAE,EAAU;IACzE,IAAI,CAAC,EAAE,EAAE,CAAC;QACN,OAAO,EAAE,CAAC;IACd,CAAC;IACD,IAAI,CAAC,qBAAW,EAAE,cAAc,EAAE,CAAC;QAC/B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,2BAA2B,EAAE,2DAA2D,CAAC,CAAC;QAC3G,OAAO,EAAE,CAAC;IACd,CAAC;IACD,IAAI,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,qBAAW,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC3D,OAAO,IAAI,EAAE,MAAM,IAAI,EAAE,CAAC;IAC9B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,2BAA2B,EAAE,MAAO,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5E,OAAO,EAAE,CAAC;IACd,CAAC;AACL,CAAC;AAED,yFAAyF;AACzF,SAAS,GAAG,CAAC,CAAU;IACnB,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC;IACD,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,SAAS,EAAE,CAAC;QAClD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;IACD,OAAO,EAAE,CAAC;AACd,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,uBAAuB,CACzC,OAAyB,EACzB,MAAqB,EACrB,UAAkB;IAElB,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;IAEtE,IAAI,MAAM,CAAC,mBAAmB,KAAK,SAAS,EAAE,CAAC;QAC3C,MAAM,SAAS,GAAG,MAAM,CAAC,iBAAiB;YACtC,CAAC,CAAC,MAAM,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,iBAAiB,CAAC;YACzD,CAAC,CAAC,cAAc,CAAC;QACrB,MAAM,KAAK,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACzG,MAAM,GAAG,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,iBAAiB,CAAC,OAAO,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACnG,OAAO;YACH,SAAS;YACT,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC;YACxB,WAAW,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC;YAC9B,GAAG,EAAE;gBACD,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC;gBACjC,eAAe,EAAE,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC;gBACzC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC;aAC1B;SACJ,CAAC;IACN,CAAC;IAED,OAAO;QACH,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,cAAc;QACpD,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC;QACpC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC;QAC1C,GAAG,EAAE;YACD,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC;YACvC,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC;YAC/C,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC;SAChC;KACJ,CAAC;AACN,CAAC","sourcesContent":["/**\n * Resolve the LLM API key from the adapter config.\n *\n * Two modes (`config.credentialType`):\n *  - 'manual':  the key is stored directly in the (encrypted) adapter config (`config.apiKey`).\n *  - 'manager': the config only stores the ID of a credential in the central ioBroker\n *               credential store (`system.credentials.*`); the real key is resolved at runtime\n *               via the Credentials API.\n *\n * The central Credentials API (`Credentials.getCredentials`) is only available with\n * js-controller >= 7.2 / a recent \\@iobroker/adapter-core. We access it defensively so the\n * adapter still compiles and runs (in `manual` mode) on older controllers.\n */\nimport Credentials from '@iobroker/adapter-core/credentials';\nimport type { AdapterConfig } from '../types';\nimport type { VoiceCredentials } from './voice/engines';\n\n/** Read and decrypt a single credential's key from the central store; '' (and a warning) on error. */\nexport async function readCentralKey(adapter: ioBroker.Adapter, id: string): Promise<string> {\n    if (!id) {\n        return '';\n    }\n    if (!Credentials?.getCredentials) {\n        adapter.log.warn(`Cannot read credential \"${id}\": the central Credentials API needs js-controller >= 7.2`);\n        return '';\n    }\n    try {\n        const cred = await Credentials.getCredentials(adapter, id);\n        return ((cred?.values?.key as string) || '').trim();\n    } catch (e) {\n        adapter.log.warn(`Cannot read credential \"${id}\": ${(e as Error).message}`);\n        return '';\n    }\n}\n\n/**\n * Resolve the effective API key for the configured provider.\n * `overrideKey`/`overrideCredentialId` win over the stored config (used by the settings-dialog\n * Test button, where unsaved form values should be used).\n */\nexport async function resolveApiKey(\n    adapter: ioBroker.Adapter,\n    config: AdapterConfig,\n    override?: { credentialType?: 'manual' | 'manager'; apiKey?: string; credentialId?: string },\n): Promise<string> {\n    const mode = override?.credentialType || config.credentialType || 'manual';\n    if (mode === 'manager') {\n        const id = (override?.credentialId || config.credentialIdApiKey || '').trim();\n        return readCentralKey(adapter, id);\n    }\n    return (override?.apiKey || config.apiKey || '').trim();\n}\n\n/** Read and decrypt all fields of a credential from the central store; {} (and a warning) on error. */\nexport async function readCentralValues(adapter: ioBroker.Adapter, id: string): Promise<Record<string, unknown>> {\n    if (!id) {\n        return {};\n    }\n    if (!Credentials?.getCredentials) {\n        adapter.log.warn(`Cannot read credential \"${id}\": the central Credentials API needs js-controller >= 7.2`);\n        return {};\n    }\n    try {\n        const cred = await Credentials.getCredentials(adapter, id);\n        return cred?.values || {};\n    } catch (e) {\n        adapter.log.warn(`Cannot read credential \"${id}\": ${(e as Error).message}`);\n        return {};\n    }\n}\n\n/** Safe stringify of a credential/config field (values are strings/numbers/booleans). */\nfunction str(v: unknown): string {\n    if (typeof v === 'string') {\n        return v.trim();\n    }\n    if (typeof v === 'number' || typeof v === 'boolean') {\n        return String(v);\n    }\n    return '';\n}\n\n/**\n * Resolve the speech (STT/TTS) credentials for OpenAI, Azure and AWS.\n *  - 'manual':  the encrypted key/region config fields.\n *  - 'manager': the central credential store, keyed by the *CredentialId fields\n *               (azure values: { key, region }; aws values: { accessKeyId, secretAccessKey, region }).\n * `mainApiKey` is reused for OpenAI speech when no dedicated OpenAI speech credential is set and the\n * LLM provider is already OpenAI.\n */\nexport async function resolveVoiceCredentials(\n    adapter: ioBroker.Adapter,\n    config: AdapterConfig,\n    mainApiKey: string,\n): Promise<VoiceCredentials> {\n    const openaiFallback = config.provider === 'openai' ? mainApiKey : '';\n\n    if (config.voiceCredentialType === 'manager') {\n        const openaiKey = config.voiceCredentialId\n            ? await readCentralKey(adapter, config.voiceCredentialId)\n            : openaiFallback;\n        const azure = config.azureCredentialId ? await readCentralValues(adapter, config.azureCredentialId) : {};\n        const aws = config.awsCredentialId ? await readCentralValues(adapter, config.awsCredentialId) : {};\n        return {\n            openaiKey,\n            azureKey: str(azure.key),\n            azureRegion: str(azure.region),\n            aws: {\n                accessKeyId: str(aws.accessKeyId),\n                secretAccessKey: str(aws.secretAccessKey),\n                region: str(aws.region),\n            },\n        };\n    }\n\n    return {\n        openaiKey: str(config.voiceApiKey) || openaiFallback,\n        azureKey: str(config.azureSpeechKey),\n        azureRegion: str(config.azureSpeechRegion),\n        aws: {\n            accessKeyId: str(config.awsAccessKeyId),\n            secretAccessKey: str(config.awsSecretAccessKey),\n            region: str(config.awsRegion),\n        },\n    };\n}\n"]}
+{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../src/lib/credentials.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Resolve the LLM API key from the adapter config.\n *\n * Two modes (`config.credentialType`):\n *  - 'manual':  the key is stored directly in the (encrypted) adapter config (`config.apiKey`).\n *  - 'manager': the config only stores the ID of a credential in the central ioBroker\n *               credential store (`system.credentials.*`); the real key is resolved at runtime\n *               via the Credentials API.\n *\n * The central Credentials API (`Credentials.getCredentials`) is only available with\n * js-controller >= 7.2 / a recent \\@iobroker/adapter-core. We access it defensively so the\n * adapter still compiles and runs (in `manual` mode) on older controllers.\n */\nimport * as Credentials from '@iobroker/adapter-core/credentials';\nimport type { AdapterConfig } from '../types';\nimport type { VoiceCredentials } from './voice/engines';\n\n/** Read and decrypt a single credential's key from the central store; '' (and a warning) on error. */\nexport async function readCentralKey(adapter: ioBroker.Adapter, id: string): Promise<string> {\n    if (!id) {\n        return '';\n    }\n    if (!Credentials?.getCredentials) {\n        adapter.log.warn(`Cannot read credential \"${id}\": the central Credentials API needs js-controller >= 7.2`);\n        return '';\n    }\n    try {\n        const cred = await Credentials.getCredentials(adapter, id);\n        return ((cred?.values?.key as string) || '').trim();\n    } catch (e) {\n        adapter.log.warn(`Cannot read credential \"${id}\": ${(e as Error).message}`);\n        return '';\n    }\n}\n\n/**\n * Resolve the effective API key for the configured provider.\n * `overrideKey`/`overrideCredentialId` win over the stored config (used by the settings-dialog\n * Test button, where unsaved form values should be used).\n */\nexport async function resolveApiKey(\n    adapter: ioBroker.Adapter,\n    config: AdapterConfig,\n    override?: { credentialType?: 'manual' | 'manager'; apiKey?: string; credentialId?: string },\n): Promise<string> {\n    const mode = override?.credentialType || config.credentialType || 'manual';\n    if (mode === 'manager') {\n        const id = (override?.credentialId || config.credentialIdApiKey || '').trim();\n        return readCentralKey(adapter, id);\n    }\n    return (override?.apiKey || config.apiKey || '').trim();\n}\n\n/** Read and decrypt all fields of a credential from the central store; {} (and a warning) on error. */\nexport async function readCentralValues(adapter: ioBroker.Adapter, id: string): Promise<Record<string, unknown>> {\n    if (!id) {\n        return {};\n    }\n    if (!Credentials?.getCredentials) {\n        adapter.log.warn(`Cannot read credential \"${id}\": the central Credentials API needs js-controller >= 7.2`);\n        return {};\n    }\n    try {\n        const cred = await Credentials.getCredentials(adapter, id);\n        return cred?.values || {};\n    } catch (e) {\n        adapter.log.warn(`Cannot read credential \"${id}\": ${(e as Error).message}`);\n        return {};\n    }\n}\n\n/** Safe stringify of a credential/config field (values are strings/numbers/booleans). */\nfunction str(v: unknown): string {\n    if (typeof v === 'string') {\n        return v.trim();\n    }\n    if (typeof v === 'number' || typeof v === 'boolean') {\n        return String(v);\n    }\n    return '';\n}\n\n/**\n * Resolve the speech (STT/TTS) credentials for OpenAI, Azure and AWS.\n *  - 'manual':  the encrypted key/region config fields.\n *  - 'manager': the central credential store, keyed by the *CredentialId fields\n *               (azure values: { key, region }; aws values: { accessKeyId, secretAccessKey, region }).\n * `mainApiKey` is reused for OpenAI speech when no dedicated OpenAI speech credential is set and the\n * LLM provider is already OpenAI.\n */\nexport async function resolveVoiceCredentials(\n    adapter: ioBroker.Adapter,\n    config: AdapterConfig,\n    mainApiKey: string,\n): Promise<VoiceCredentials> {\n    const openaiFallback = config.provider === 'openai' ? mainApiKey : '';\n\n    if (config.voiceCredentialType === 'manager') {\n        const openaiKey = config.voiceCredentialId\n            ? await readCentralKey(adapter, config.voiceCredentialId)\n            : openaiFallback;\n        const azure = config.azureCredentialId ? await readCentralValues(adapter, config.azureCredentialId) : {};\n        const aws = config.awsCredentialId ? await readCentralValues(adapter, config.awsCredentialId) : {};\n        return {\n            openaiKey,\n            azureKey: str(azure.key),\n            azureRegion: str(azure.region),\n            aws: {\n                accessKeyId: str(aws.accessKeyId),\n                secretAccessKey: str(aws.secretAccessKey),\n                region: str(aws.region),\n            },\n        };\n    }\n\n    return {\n        openaiKey: str(config.voiceApiKey) || openaiFallback,\n        azureKey: str(config.azureSpeechKey),\n        azureRegion: str(config.azureSpeechRegion),\n        aws: {\n            accessKeyId: str(config.awsAccessKeyId),\n            secretAccessKey: str(config.awsSecretAccessKey),\n            region: str(config.awsRegion),\n        },\n    };\n}\n"]}

package/build/lib/nlu.js

@@ -16,6 +16,7 @@ exports.parseWeekdays = parseWeekdays;
 exports.parseDurationSeconds = parseDurationSeconds;
 exports.isStopCommand = isStopCommand;
 exports.normalize = normalize;
+exports.splitCommands = splitCommands;
 const TURN_ON = new Set([
     // de/en
     'an',
@@ -521,6 +522,63 @@ function wordInText(word, text) {
         return text.includes(stem);
     }
 }
+/**
+ * Directionless command verbs: they mark an imperative but carry no on/off/level of their own. A segment
+ * holding nothing but such a verb and a device name ("schalte das Licht" in "schalte das Licht und die
+ * Lampe an") may therefore borrow the action from its sibling segment.
+ */
+const NEUTRAL_VERBS = new Set([
+    // de
+    'schalte',
+    'schalt',
+    'schalten',
+    'stelle',
+    'stell',
+    'stellen',
+    'setze',
+    'setz',
+    'setzen',
+    'drehe',
+    'dreh',
+    'fahre',
+    'fahr',
+    'mache',
+    'machen',
+    // en
+    'set',
+    'put',
+    'turn',
+    'switch',
+    'change',
+    'adjust',
+    'make',
+    // ru
+    'поставь',
+    'установи',
+    'выстави',
+    'сделай',
+]);
+/** Conjunctions that join two commands in one utterance (de/en/ru). */
+const CONJUNCTIONS = 'und|sowie|dann|danach|and|then|plus|и|затем|потом';
+/**
+ * Separators between two commands: a run of conjunctions ("und dann"), a comma or a semicolon. A comma
+ * directly followed by a digit is NOT a separator (decimal values like "50,5 %").
+ */
+const SPLIT_RE = new RegExp(`\\s*[;,](?!\\d)\\s*|\\s+(?:${CONJUNCTIONS})(?:\\s+(?:${CONJUNCTIONS}))*\\s+`, 'giu');
+/**
+ * Split a combined command ("Schalte A an und setze B auf 30 %") into its parts; a single-element array
+ * when there is nothing to split.
+ */
+function splitCommands(text) {
+    return text
+        .split(SPLIT_RE)
+        .map(s => s.trim())
+        .filter(Boolean);
+}
+/** True when a segment states no action at all ("… und die Lampe") and may inherit its sibling's. */
+function isBare(f) {
+    return !f.action && f.level === null && !f.color && !f.isQuery;
+}
 class Nlu {
     rooms;
     devices;
@@ -550,52 +608,139 @@ class Nlu {
         }
         return out;
     }
-    /** Parse a command; returns a structured intent or null if nothing could be resolved confidently. */
+    /** Parse a single command; returns a structured intent or null if nothing could be resolved confidently. */
     parse(text) {
-        const raw = text;
+        const p = this.prepare(text);
+        return p ? this.parsePrepared(p, null) : null;
+    }
+    /**
+     * Parse a possibly **combined** command into the intents to execute, in order:
+     *  - several commands joined by a conjunction — "Schalte A an und setze B auf 30 %",
+     *  - one verb driving several devices — "Schalte A und B an", where the segment that names only a
+     *    device inherits its sibling's action.
+     * Falls back to the single-command reading unless the split produces at least two intents, so a device
+     * or room name containing "und"/"and" — or "1 Stunde und 30 Minuten" — still parses as one command.
+     */
+    parseAll(text) {
+        const combined = this.parseCombined(text);
+        if (combined.length > 1) {
+            return combined;
+        }
+        const single = this.parse(text);
+        return single ? [single] : [];
+    }
+    /** Segment-wise parse of a combined command; `[]` unless it yields at least two intents. */
+    parseCombined(text) {
+        const segments = splitCommands(text);
+        if (segments.length < 2) {
+            return [];
+        }
+        const parts = [];
+        for (const segment of segments) {
+            const p = this.prepare(segment);
+            if (p) {
+                parts.push(p);
+            }
+        }
+        if (parts.length < 2) {
+            return [];
+        }
+        const features = parts.map(p => this.extractFeatures(p));
+        const intents = [];
+        for (let i = 0; i < parts.length; i++) {
+            // A segment stating no action borrows the nearest sibling's — looking ahead first, because the
+            // verb usually comes last in this shape ("schalte A | und B **an**").
+            let inherited = null;
+            if (isBare(features[i])) {
+                inherited = features.slice(i + 1).find(f => !isBare(f)) || null;
+                for (let j = i - 1; !inherited && j >= 0; j--) {
+                    inherited = isBare(features[j]) ? null : features[j];
+                }
+            }
+            const intent = this.parsePrepared(parts[i], inherited);
+            if (intent) {
+                intents.push(intent);
+            }
+        }
+        return intents.length > 1 ? intents : [];
+    }
+    /** Normalized views of a command (aliases applied, filler dropped); null when nothing remains to match. */
+    prepare(text) {
         const norm = this.applyAliases(normalize(text.replace(STRIP, ' ')));
         const tokens = norm.split(/\s+/).filter(t => t && !FILLER.has(t));
         if (!tokens.length) {
             return null;
         }
-        const joined = tokens.join(' ');
-        const tokenSet = new Set(tokens);
+        return { raw: text, norm, tokens, joined: tokens.join(' '), tokenSet: new Set(tokens) };
+    }
+    /**
+     * Resolve one prepared command. Device-independent intents (timer/alarm/time/aggregate query) are tried
+     * first and never inherit anything; `inherited` supplies the action for a segment that names only a
+     * device (see {@link parseCombined}).
+     */
+    parsePrepared(p, inherited) {
         // Timer / alarm intents ("timer 5 minuten", "weck mich um 7 Uhr", "wie lange noch") — before
         // window/device matching, and device-independent.
-        const schedule = this.parseSchedule(raw, norm, joined);
+        const schedule = this.parseSchedule(p.raw, p.norm, p.joined);
         if (schedule) {
             return schedule;
         }
         // Time / date query ("what time is it", "which day is today") — device-independent, answered from
         // the host clock. After the schedule parse so a clock phrase with a timer/alarm keyword still wins.
-        const timeQuery = this.parseTimeQuery(joined);
+        const timeQuery = this.parseTimeQuery(p.joined);
         if (timeQuery) {
             return timeQuery;
         }
         // Aggregate query first ("which windows are open") — before single-device matching.
-        const windowsQuery = this.parseWindowsOpen(joined);
+        const windowsQuery = this.parseWindowsOpen(p.joined);
         if (windowsQuery) {
             return windowsQuery;
         }
-        const roomName = this.findRoom(joined);
-        const device = this.findDevice(joined, roomName);
+        const roomName = this.findRoom(p.joined);
+        const device = this.findDevice(p.joined, roomName);
         if (!device) {
             return null; // no device → let the LLM handle it
         }
-        const action = this.findAction(tokenSet); // 'on' | 'off' | null
-        const level = this.findLevel(norm); // number | null
-        const color = this.findColor(joined);
-        const isQuery = tokens.some(t => QUERY_WORDS.has(t)) || raw.trim().endsWith('?');
-        // A question ("ist das Licht an?") must never trigger a write — only the query branch below.
+        let features = this.extractFeatures(p);
+        if (inherited && this.namesOnly(p, device, roomName)) {
+            features = inherited;
+        }
+        return this.buildDeviceIntent(device, roomName, features);
+    }
+    /** The action half of a command: on/off, level, color, and whether it is a question. */
+    extractFeatures(p) {
+        return {
+            action: this.findAction(p.tokenSet), // 'on' | 'off' | null
+            level: this.findLevel(p.norm),
+            color: this.findColor(p.joined),
+            // A question ("ist das Licht an?") must never trigger a write — only the query branch does.
+            isQuery: p.tokens.some(t => QUERY_WORDS.has(t)) || p.raw.trim().endsWith('?'),
+            onOffQuery: ON_OFF_QUERY_WORDS.some(w => wordInText(w, p.joined)),
+        };
+    }
+    /**
+     * True when the segment holds nothing but the device name, its room and a directionless verb — the only
+     * case in which borrowing a sibling's action is safe. Any unmatched word ("mach die Musik *lauter*")
+     * means the segment carries an intent of its own that the rules do not cover: leave it to the LLM.
+     */
+    namesOnly(p, device, roomName) {
+        const known = [device.name, roomName]
+            .filter(Boolean)
+            .flatMap(n => normalize(n).split(/\s+/))
+            .filter(Boolean);
+        return p.tokens.every(t => NEUTRAL_VERBS.has(t) || known.some(w => wordInText(w, t) || wordInText(t, w)));
+    }
+    /** Turn a resolved device plus the command's action half into an intent (branches in priority order). */
+    buildDeviceIntent(device, roomName, f) {
         // 1. Set level (dimmer/blind …) — needs a numeric level-like control.
-        if (level !== null && !isQuery) {
+        if (f.level !== null && !f.isQuery) {
             const stateId = this.pickControl(device, ['level', 'brightness', 'dimmer'], true, 'number');
             if (stateId) {
                 const intent = {
                     action: 'level',
                     device,
                     stateId,
-                    value: level,
+                    value: f.level,
                     room: roomName,
                     confidence: 0.9,
                 };
@@ -604,30 +749,30 @@ class Nlu {
                 // unaffected. The switch is found by role/type, not by name (not every device names it ON_SET).
                 const sw = this.findSwitch(device, stateId);
                 if (sw) {
-                    intent.also = { stateId: sw, value: level > 0 };
+                    intent.also = { stateId: sw, value: f.level > 0 };
                 }
                 return intent;
             }
         }
         // 2. Set color — only a hex color on a color-capable device (warm/cold color-temp is out of scope for v1).
-        if (color && color.startsWith('#') && COLOR_TYPES.has(device.type) && !isQuery) {
+        if (f.color && f.color.startsWith('#') && COLOR_TYPES.has(device.type) && !f.isQuery) {
             const stateId = this.pickControl(device, ['rgb', 'color', 'hue', 'cie', 'ct'], true);
             if (stateId) {
-                return { action: 'color', device, stateId, value: color, room: roomName, confidence: 0.85 };
+                return { action: 'color', device, stateId, value: f.color, room: roomName, confidence: 0.85 };
             }
         }
         // 3. Turn on / off — prefer a writable boolean switch (never a metering state like CONSUMPTION).
-        if (action && !isQuery) {
+        if (f.action && !f.isQuery) {
             const stateId = this.pickControl(device, ['power', 'switch', 'on', 'level'], true, 'boolean');
             if (stateId) {
                 // If only a numeric (dimmer/level) control is available, on/off means full/zero level, not a
                 // boolean 1/0 (writing `true` to a 0–100 state would land on ~1%).
                 const numeric = this.valueTypeOf(device, stateId) === 'number';
                 return {
-                    action,
+                    action: f.action,
                     device,
                     stateId,
-                    value: numeric ? (action === 'on' ? 100 : 0) : action === 'on',
+                    value: numeric ? (f.action === 'on' ? 100 : 0) : f.action === 'on',
                     room: roomName,
                     confidence: 0.9,
                 };
@@ -635,10 +780,11 @@ class Nlu {
         }
         // 4. Status query — read the right control: an on/off question ("is the light on?") reads the
         //    boolean switch/feedback; a value question ("what temperature?") reads the actual value.
-        if (isQuery) {
-            const onOff = ON_OFF_QUERY_WORDS.some(w => wordInText(w, joined));
-            const order = onOff ? ['power', 'switch', 'on', 'actual', 'level'] : ['actual', 'value', 'level', 'power'];
-            const stateId = this.pickControl(device, order, false, onOff ? 'boolean' : undefined);
+        if (f.isQuery) {
+            const order = f.onOffQuery
+                ? ['power', 'switch', 'on', 'actual', 'level']
+                : ['actual', 'value', 'level', 'power'];
+            const stateId = this.pickControl(device, order, false, f.onOffQuery ? 'boolean' : undefined);
             if (stateId) {
                 return { action: 'query', device, stateId, room: roomName, confidence: 0.7 };
             }
@@ -844,7 +990,7 @@ class Nlu {
         return null;
     }
     findLevel(text) {
-        const m = text.match(/(\d+(?:[.,]\d+)?)\s*(?:prozent|процент\w*|%)/u);
+        const m = text.match(/(\d+(?:[.,]\d+)?)\s*(?:prozent|percent|процент\w*|%)/u);
         return m ? parseFloat(m[1].replace(',', '.')) : null;
     }
     findColor(text) {