@maudecode/talaria-web 1.18.0 → 1.19.0

package/dist/tools/memory-masks.js

@@ -0,0 +1,256 @@
+/**
+ * TAL-886: the memory page shows MEMORY.md, USER.md and SOUL.md through `redactString`, so a save submits masks
+ * (`ghp_Ab...6789`, `***`) where the file holds secrets. `restoreMasks` puts each secret back: a mask on a line the save
+ * left unchanged keeps its own value, and one moved or copied elsewhere is mapped back by its text. A mask whose text
+ * stands for more than one value, or one the save edited, is refused rather than written over its secret.
+ */
+import { HttpFailure } from '../sessions/service.js';
+/** Past this many token edits, or tokens, the save is treated as a rewrite: its masks are then found by their text alone. */
+const MAX_EDITS = 1_000;
+const MAX_TOKENS = 20_000;
+const tokens = (text) => text.match(/\s+|\S+/g) ?? [];
+/** Myers' shortest edit script from `a` to `b` (`=` keeps, `-` deletes, `+` inserts), or null past `MAX_EDITS`. */
+function myers(a, b) {
+    const n = a.length;
+    const m = b.length;
+    if (n + m > MAX_TOKENS)
+        return null;
+    const off = n + m + 1;
+    const v = new Int32Array(2 * off + 1);
+    const trace = [];
+    for (let d = 0; d <= Math.min(n + m, MAX_EDITS); d += 1) {
+        trace.push(v.slice(off - d - 1, off + d + 2));
+        for (let k = -d; k <= d; k += 2) {
+            let x = k === -d || (k !== d && v[off + k - 1] < v[off + k + 1]) ? v[off + k + 1] : v[off + k - 1] + 1;
+            let y = x - k;
+            while (x < n && y < m && a[x] === b[y]) {
+                x += 1;
+                y += 1;
+            }
+            v[off + k] = x;
+            if (x >= n && y >= m)
+                return backtrack(trace, n, m);
+        }
+    }
+    return null;
+}
+function backtrack(trace, n, m) {
+    const ops = [];
+    let x = n;
+    let y = m;
+    for (let d = trace.length - 1; d > 0; d -= 1) {
+        const at = (k) => trace[d][k + d + 1];
+        const k = x - y;
+        const prevK = k === -d || (k !== d && at(k - 1) < at(k + 1)) ? k + 1 : k - 1;
+        const prevX = at(prevK);
+        const prevY = prevX - prevK;
+        while (x > prevX && y > prevY) {
+            x -= 1;
+            y -= 1;
+            ops.push(['=', x, y]);
+        }
+        if (x === prevX)
+            ops.push(['+', -1, y - 1]);
+        else
+            ops.push(['-', x - 1, -1]);
+        x = prevX;
+        y = prevY;
+    }
+    while (x > 0 && y > 0) {
+        x -= 1;
+        y -= 1;
+        ops.push(['=', x, y]);
+    }
+    return ops.reverse();
+}
+/** The edit script from `a` to `b`; a common head and tail are kept without searching. */
+function diffTokens(a, b) {
+    let head = 0;
+    while (head < a.length && head < b.length && a[head] === b[head])
+        head += 1;
+    let tail = 0;
+    while (tail < a.length - head && tail < b.length - head && a[a.length - 1 - tail] === b[b.length - 1 - tail])
+        tail += 1;
+    const midA = a.slice(head, a.length - tail);
+    const midB = b.slice(head, b.length - tail);
+    const mid = myers(midA, midB) ?? [...midA.map((_, i) => ['-', i, -1]), ...midB.map((_, j) => ['+', -1, j])];
+    const shift = (op) => (op[0] === '=' ? ['=', op[1] + head, op[2] + head] : op[0] === '-' ? ['-', op[1] + head, -1] : ['+', -1, op[2] + head]);
+    return [
+        ...a.slice(0, head).map((_, i) => ['=', i, i]),
+        ...mid.map(shift),
+        ...a.slice(a.length - tail).map((_, i) => ['=', a.length - tail + i, b.length - tail + i]),
+    ];
+}
+const escapeRe = (text) => text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+/** What marks a mask inside other text: the redactor's `***` or private-key marker, else its `abcdef...wxyz` preview. */
+const markerOf = (mask) => ['[REDACTED PRIVATE KEY]', '***'].find((m) => mask.includes(m)) ?? /\S{6}\.\.\.\S{4}/.exec(mask)?.[0] ?? mask.trim();
+/** Whether `a` is within `limit` single-character edits of `b`. */
+function within(a, b, limit) {
+    if (Math.abs(a.length - b.length) > limit)
+        return false;
+    let prev = Array.from({ length: b.length + 1 }, (_, j) => j);
+    for (let i = 1; i <= a.length; i += 1) {
+        const row = [i];
+        for (let j = 1; j <= b.length; j += 1)
+            row[j] = Math.min(prev[j] + 1, row[j - 1] + 1, prev[j - 1] + (a[i - 1] === b[j - 1] ? 0 : 1));
+        prev = row;
+    }
+    return prev[b.length] <= limit;
+}
+/** Masks longer than this are compared exactly, so the edit check stays cheap on a long token. */
+const MAX_NEAR = 64;
+/** A typed token that reads as an edit of `mask` (or its marker) rather than a new value: a few characters off, or bare asterisks. */
+function nearMask(token, mask) {
+    const marker = markerOf(mask);
+    if (marker === '***' && /^\*+$/.test(token))
+        return true;
+    return [marker, mask.trim()].some((text) => (text.length > MAX_NEAR ? token === text : within(token, text, Math.max(1, text.length >> 2))));
+}
+const edited = (found) => new HttpFailure(422, `"${found}" hides a value the memory page does not show, and this save edits the text around it. Put it back as it was, or type the value.`, { code: 'memory_mask_edited', mask: found });
+/**
+ * `submitted` with every mask `redactString` put into `shown` restored to the `original` text it hides. A save of an
+ * unchanged page is `original` itself.
+ */
+export function restoreMasks(original, shown, submitted) {
+    if (shown === original)
+        return submitted;
+    if (submitted === shown)
+        return original;
+    const a = tokens(original);
+    const b = tokens(shown);
+    // Each run of edits from the file to the page is one mask. A run that only drops file text (`RSA ` when the page's
+    // `[REDACTED PRIVATE KEY]` aligns its `PRIVATE`) joins the run before it, or after it, so its text stays with a mask.
+    const fileToPage = diffTokens(a, b);
+    const runs = [];
+    fileToPage.forEach(([kind], n) => {
+        if (kind === '=')
+            return;
+        const last = runs.at(-1);
+        if (last?.[1] === n)
+            last[1] = n + 1;
+        else
+            runs.push([n, n + 1]);
+    });
+    const hasInsert = ([start, end]) => fileToPage.slice(start, end).some(([kind]) => kind === '+');
+    for (let n = 0; n < runs.length && runs.length > 1;) {
+        if (hasInsert(runs[n])) {
+            n += 1;
+            continue;
+        }
+        const at = n > 0 ? n - 1 : n;
+        runs.splice(at, 2, [runs[at][0], runs[at + 1][1]]);
+        n = at;
+    }
+    const hunks = [];
+    const hunkOf = new Int32Array(b.length).fill(-1);
+    for (const [start, end] of runs) {
+        const hunk = { original: '', mask: '', first: -1, last: -1 };
+        for (const [kind, i, j] of fileToPage.slice(start, end)) {
+            if (kind !== '+')
+                hunk.original += a[i];
+            if (kind === '-')
+                continue;
+            hunk.mask += b[j];
+            if (hunk.first < 0)
+                hunk.first = j;
+            hunk.last = j;
+            hunkOf[j] = hunks.length;
+        }
+        hunks.push(hunk);
+    }
+    const meanings = new Map();
+    for (const hunk of hunks)
+        if (hunk.mask.trim())
+            meanings.set(hunk.mask, (meanings.get(hunk.mask) ?? new Set()).add(hunk.original));
+    // A mask that may also be literal text never maps back by its text: a `***` (what a Markdown rule is typed as), or one the
+    // page also shows as literal text.
+    const literal = b.map((token, j) => (hunkOf[j] >= 0 ? '\u0000' : token)).join('');
+    for (const [mask, values] of meanings)
+        if (markerOf(mask) === '***' || new RegExp(`(?<!\\S)${escapeRe(mask)}(?!\\S)`).test(literal))
+            values.add(mask);
+    const c = tokens(submitted);
+    const pageToSave = diffTokens(b, c);
+    const keptAt = new Int32Array(b.length).fill(-1);
+    for (const [kind, j, k] of pageToSave)
+        if (kind === '=')
+            keptAt[j] = k;
+    // A mask is in place when its whole line is, token for token: a mask moved to another entry, even one that shows the same
+    // `***`, is not.
+    const lineBreak = (j) => b[j].includes('\n');
+    const inPlace = hunks.map((hunk) => {
+        if (hunk.first < 0)
+            return false;
+        let from = hunk.first;
+        while (from > 0 && !lineBreak(from) && !lineBreak(from - 1))
+            from -= 1;
+        let to = hunk.last;
+        while (to < b.length - 1 && !lineBreak(to) && !lineBreak(to + 1))
+            to += 1;
+        const start = keptAt[from];
+        if (start < 0)
+            return false;
+        for (let j = from; j <= to; j += 1)
+            if (keptAt[j] !== start + j - from)
+                return false;
+        return true;
+    });
+    const markers = new Set(hunks.map((hunk) => markerOf(hunk.mask)).filter(Boolean));
+    const byLength = (x, y) => y.length - x.length;
+    const alternatives = (list) => [...list].sort(byLength).map(escapeRe).join('|');
+    const maskRe = meanings.size ? new RegExp(`(?<!\\S)(${alternatives(meanings.keys())})(?!\\S)|${alternatives(markers)}`, 'g') : null;
+    // Text the user moved, copied or typed: a whole mask maps back by its text alone; a mask inside an edited word cannot.
+    const restoreLoose = (text) => (maskRe ? text.replace(maskRe, (found, whole) => {
+        const values = whole === undefined ? [] : [...meanings.get(whole)];
+        if (values.length === 1)
+            return values[0];
+        if (values.length > 1)
+            throw new HttpFailure(422, `The memory page shows "${found}" in place of a hidden value, and this save puts it where the server cannot tell which value, if any, it stands for. Put it back where it was, or type the value.`, { code: 'memory_mask_ambiguous', mask: found });
+        throw edited(found);
+    }) : text);
+    // A mask the save replaced with text like it (`**` for `***`) was edited, not replaced by a new value: refuse it.
+    let removed = [];
+    let typed = [];
+    const settle = () => {
+        const distinct = [...new Set(typed)];
+        for (const hunk of removed)
+            if (distinct.some((token) => nearMask(token, hunk.mask)))
+                throw edited(markerOf(hunk.mask));
+        removed = [];
+        typed = [];
+    };
+    let out = '';
+    let loose = '';
+    const flush = () => { out += restoreLoose(loose); loose = ''; };
+    for (const [kind, j, k] of pageToSave) {
+        if (kind === '-') {
+            const hunk = hunks[hunkOf[j]];
+            if (hunk && !removed.includes(hunk))
+                removed.push(hunk);
+            continue;
+        }
+        if (kind === '+') {
+            loose += c[k];
+            if (c[k].trim())
+                typed.push(c[k]);
+            continue;
+        }
+        settle();
+        const hunk = hunkOf[j];
+        if (hunk >= 0 && inPlace[hunk]) {
+            if (j === hunks[hunk].first) {
+                flush();
+                out += hunks[hunk].original;
+            }
+        }
+        else if (hunk >= 0 || !b[j].trim())
+            loose += b[j];
+        else {
+            flush();
+            out += b[j];
+        }
+    }
+    settle();
+    flush();
+    return out;
+}
+//# sourceMappingURL=memory-masks.js.map

package/dist/tools/memory-masks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"memory-masks.js","sourceRoot":"","sources":["../../src/tools/memory-masks.ts"],"names":[],"mappings":"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"}

package/dist/tools/memory.d.ts

@@ -2,12 +2,38 @@ import { type Config, type Dict } from '../config/agent-config.js';
 /** Python `_project_context_candidates` + `_read_active_project_context`. */
 export declare function readProjectContext(workspace: string | null): Dict;
 export declare function externalNotesEnabled(env: Record<string, string | undefined>, config: Config): boolean;
-export declare function readMemory(profileHome: string, config: Config, workspace: string | null, env: Record<string, string | undefined>, redact: boolean): Dict;
-export declare function writeMemory(profileHome: string, config: Config, section: string, content: string): {
+/**
+ * TAL-784: a memory page file's revision. Keyed by the server's signing key, so the page cannot test guesses at a secret it
+ * shows masked against the file's plain hash.
+ */
+export declare const memoryRevision: (key: Buffer, raw: Buffer) => string;
+export declare function readMemory(profileHome: string, config: Config, workspace: string | null, env: Record<string, string | undefined>, redact: boolean, key: Buffer): Dict;
+/**
+ * What a memory save needs beyond the file: the revision key, the Agent's reading of a MEMORY.md / USER.md body, and the
+ * sidecar's compare-and-write, which replaces the file only while its bytes still hash (SHA-256) to `base`.
+ */
+export interface MemoryWriteDeps {
+    key: Buffer;
+    check: (target: 'memory' | 'user', content: string) => Promise<{
+        count: number;
+        limit: number;
+    }>;
+    write: (section: 'memory' | 'user' | 'soul', base: string, content: string) => Promise<{
+        written: boolean;
+    }>;
+}
+/**
+ * TAL-886: the page shows each file through `redactString`, so the masks it submits are restored to the secrets they hide,
+ * and a MEMORY.md / USER.md body over the Agent store's char limit is refused (the Agent's memory tool cannot add,
+ * replace or remove anything in such a file). A refusal leaves the file untouched; SOUL.md stays free-form.
+ * TAL-784: `revision` is the file's revision the edit started from. A file changed since, by the Agent's memory tool or
+ * another page, is a 409 conflict rather than overwritten; the sidecar re-checks it under the Agent's lock as it writes.
+ */
+export declare function writeMemory(profileHome: string, config: Config, section: string, submitted: string, revision: string, deps: MemoryWriteDeps): Promise<{
     ok: true;
     section: string;
     path: string;
-};
+}>;
 export interface SavedPrompt {
     id: string;
     label: string;

package/dist/tools/memory.js

@@ -1,12 +1,14 @@
 /** Memory panel files and saved prompts (Python `_handle_memory_read`, `_handle_memory_write`, saved prompts helpers). */
-import { closeSync, constants as fsConstants, existsSync, fstatSync, ftruncateSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, statSync, writeFileSync } from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
-import { randomUUID } from 'node:crypto';
+import { closeSync, constants as fsConstants, existsSync, fstatSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, statSync } from 'node:fs';
+import { basename, dirname, join, resolve } from 'node:path';
+import { createHash, createHmac, randomUUID } from 'node:crypto';
 import { spawnSync } from 'node:child_process';
 import { dict, isDict } from '../config/agent-config.js';
 import { HttpFailure } from '../sessions/service.js';
+import { SidecarError } from '../sidecar/client.js';
 import { redactString } from '../redact.js';
 import { atomicWriteText } from '../fs/atomic.js';
+import { restoreMasks } from './memory-masks.js';
 import { str } from '../util.js';
 const HERMES_NAMES = ['.hermes.md', 'HERMES.md'];
 const CWD_NAMES = ['AGENTS.md', 'agents.md', 'CLAUDE.md', 'claude.md', '.cursorrules'];
@@ -94,17 +96,23 @@ export function externalNotesEnabled(env, config) {
         return truthy(envValue);
     return truthy(config.webui_external_notes_sources ?? config.external_notes_sources ?? config.notes_sources_drawer);
 }
+const NO_BYTES = Buffer.alloc(0);
 function readText(path) {
     if (!path || !existsSync(path))
-        return ['', null];
+        return [NO_BYTES, null];
     try {
-        return [readFileSync(path, 'utf8'), statSync(path).mtimeMs / 1000];
+        return [readFileSync(path), statSync(path).mtimeMs / 1000];
     }
     catch {
-        return ['', null];
+        return [NO_BYTES, null];
     }
 }
-export function readMemory(profileHome, config, workspace, env, redact) {
+/**
+ * TAL-784: a memory page file's revision. Keyed by the server's signing key, so the page cannot test guesses at a secret it
+ * shows masked against the file's plain hash.
+ */
+export const memoryRevision = (key, raw) => createHmac('sha256', key).update('memory-revision\0').update(raw).digest('hex');
+export function readMemory(profileHome, config, workspace, env, redact, key) {
     const mem = dict(config.memory);
     const memoryEnabled = mem.memory_enabled === undefined ? true : truthy(mem.memory_enabled);
     const userEnabled = mem.user_profile_enabled === undefined ? true : truthy(mem.user_profile_enabled);
@@ -116,14 +124,47 @@ export function readMemory(profileHome, config, workspace, env, redact) {
     const [user, userMtime] = readText(userFile);
     const [soul, soulMtime] = readText(soulFile);
     const context = readProjectContext(workspace);
-    const r = (t) => redactString(t, redact);
+    const r = (t) => redactString(t.toString(), redact);
     return {
         memory: r(memory), user: r(user), soul: r(soul), project_context: r(str(context.content)),
+        memory_revision: memoryRevision(key, memory), user_revision: memoryRevision(key, user), soul_revision: memoryRevision(key, soul),
         memory_path: memFile ?? '', user_path: userFile ?? '', soul_path: soulFile, project_context_path: str(context.path), project_context_name: str(context.name), project_context_workspace: str(context.workspace),
         memory_mtime: memoryMtime, user_mtime: userMtime, soul_mtime: soulMtime, project_context_mtime: context.mtime ?? null, project_context_shadowed: context.shadowed, external_notes_enabled: externalNotesEnabled(env, config),
     };
 }
-export function writeMemory(profileHome, config, section, content) {
+/** The bytes of the regular file at `target` without following a link; none when it does not exist yet. */
+function readCurrent(target) {
+    let fd;
+    try {
+        fd = openSync(target, fsConstants.O_RDONLY | (fsConstants.O_NOFOLLOW ?? 0));
+    }
+    catch (error) {
+        const code = error.code;
+        if (code === 'ENOENT')
+            return NO_BYTES;
+        if (code === 'ELOOP')
+            throw new HttpFailure(400, 'Cannot write to a symlinked memory file');
+        if (code === 'EACCES' || code === 'EPERM')
+            throw new HttpFailure(403, `${basename(target)} is not readable: ${target}. Run chmod 644 on the file or fix ownership on the shared volume.`);
+        throw error;
+    }
+    try {
+        if (!fstatSync(fd).isFile())
+            throw new HttpFailure(400, 'Cannot write to a non-regular memory file');
+        return readFileSync(fd);
+    }
+    finally {
+        closeSync(fd);
+    }
+}
+/**
+ * TAL-886: the page shows each file through `redactString`, so the masks it submits are restored to the secrets they hide,
+ * and a MEMORY.md / USER.md body over the Agent store's char limit is refused (the Agent's memory tool cannot add,
+ * replace or remove anything in such a file). A refusal leaves the file untouched; SOUL.md stays free-form.
+ * TAL-784: `revision` is the file's revision the edit started from. A file changed since, by the Agent's memory tool or
+ * another page, is a 409 conflict rather than overwritten; the sidecar re-checks it under the Agent's lock as it writes.
+ */
+export async function writeMemory(profileHome, config, section, submitted, revision, deps) {
     const mem = dict(config.memory);
     if (section === 'memory' && !(mem.memory_enabled === undefined || truthy(mem.memory_enabled)))
         throw new HttpFailure(403, 'Memory is disabled by configuration (memory_enabled: false)');
@@ -148,34 +189,35 @@ export function writeMemory(profileHome, config, section, content) {
         if (error instanceof HttpFailure)
             throw error;
     }
-    try {
-        // `O_NOFOLLOW` on the open itself: a link swapped in after the check above is refused, not followed.
-        const fd = openSync(target, fsConstants.O_WRONLY | fsConstants.O_CREAT | (fsConstants.O_NOFOLLOW ?? 0), 0o644);
-        try {
-            if (!fstatSync(fd).isFile())
-                throw new HttpFailure(400, 'Cannot write to a non-regular memory file');
-            ftruncateSync(fd, 0);
-            writeFileSync(fd, content, 'utf8');
-        }
-        finally {
-            closeSync(fd);
+    const raw = readCurrent(target);
+    const conflict = () => new HttpFailure(409, `${basename(target)} changed after you opened it. Not saved.`, { code: 'memory_conflict' });
+    if (memoryRevision(deps.key, raw) !== revision)
+        throw conflict();
+    const current = raw.toString();
+    // Masks are rebuilt as redaction shows them even when it is off now: the page may have loaded while it was on.
+    const content = restoreMasks(current, redactString(current), submitted);
+    if (section !== 'soul') {
+        const { count, limit } = await deps.check(section, content);
+        if (count > limit) {
+            throw new HttpFailure(422, `${basename(target)} would hold ${count.toLocaleString('en-US')} characters, over its ${limit.toLocaleString('en-US')}-character limit. Shorten or remove entries, then save.`, { code: 'memory_char_limit', char_limit: { count, limit } });
         }
     }
+    let written;
+    try {
+        ({ written } = await deps.write(section, createHash('sha256').update(raw).digest('hex'), content));
+    }
     catch (error) {
-        if (error instanceof HttpFailure)
-            throw error;
-        const code = error.code;
-        if (code === 'ELOOP')
-            throw new HttpFailure(400, 'Cannot write to a symlinked memory file');
-        if (code !== 'EACCES' && code !== 'EPERM' && code !== 'EROFS')
+        if (!(error instanceof SidecarError && error.condition === 'memory_not_writable'))
             throw error;
         let hint = '';
         try {
             hint = ` (mode ${(statSync(target).mode & 0o777).toString(8)})`;
         }
         catch { /* none */ }
-        throw new HttpFailure(403, `${target.split('/').pop() ?? ''} is not writable${hint}: ${target}. Run chmod 644 on the file or fix ownership on the shared volume.`);
+        throw new HttpFailure(403, `${basename(target)} is not writable${hint}: ${target}. The save replaces the file, so its folder must be writable too; fix ownership on the shared volume.`);
     }
+    if (!written)
+        throw conflict();
     return { ok: true, section, path: target };
 }
 const promptsPath = (profileHome) => join(profileHome, 'webui', 'saved_prompts.json');

package/dist/tools/memory.js.map

@@ -1 +1 @@
-{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/tools/memory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/tools/memory.ts"],"names":[],"mappings":"AAAA,0HAA0H;AAC1H,OAAO,EAAE,SAAS,EAAE,SAAS,IAAI,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AACzJ,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAC5D,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,EAA0B,MAAM,2BAA2B,CAAA;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAA;AAEhC,MAAM,YAAY,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;AAChD,MAAM,SAAS,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,cAAc,CAAC,CAAA;AACtF,MAAM,iBAAiB,GAAG,MAAM,CAAA;AAEhC,MAAM,MAAM,GAAG,CAAC,CAAU,EAAW,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAA;AAExG,SAAS,OAAO,CAAC,GAAW;IAC1B,MAAM,CAAC,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,iBAAiB,CAAC,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;IAC1H,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;AAC5E,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAe;IACvC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC;QAAE,OAAO,OAAO,CAAA;IAC9C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;IACtC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,KAAK;QAAE,OAAO,OAAO,CAAA;IAC9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACzC,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAA;QAC1B,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,KAAK;YAAE,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IACxF,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,kBAAkB,CAAC,SAAwB;IACzD,MAAM,OAAO,GAAS,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;IACtG,IAAI,CAAC,SAAS;QAAE,OAAO,OAAO,CAAA;IAC9B,IAAI,GAAW,CAAA;IACf,IAAI,CAAC;QACH,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;QACxB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE;YAAE,OAAO,OAAO,CAAA;IAClD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,OAAO,CAAA;IAChB,CAAC;IACD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAA;IAClC,MAAM,UAAU,GAAa,EAAE,CAAA;IAC/B,IAAI,GAAG,GAAG,GAAG,CAAA;IACb,SAAS,CAAC;QACR,KAAK,MAAM,IAAI,IAAI,YAAY;YAAE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAA;QACjE,IAAI,GAAG,KAAK,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG;YAAE,MAAK;QACjD,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;IACpB,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,SAAS;QAAE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAA;IAC9D,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAC3C,UAAU,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5G,CAAC;IAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC;IACtB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAA;IAC9B,MAAM,QAAQ,GAAqE,EAAE,CAAA;IACrF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE;gBAAE,SAAQ;YAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAA;YAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;YAC9B,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,SAAQ;YAC3B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YACb,IAAI,OAAO,GAAG,gBAAgB,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAA;YAC1D,IAAI,OAAO,CAAC,MAAM,GAAG,iBAAiB;gBAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAA;YACrF,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;gBAAE,SAAQ;YAC7B,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,GAAG,IAAI,EAAE,CAAC,CAAA;QACnH,CAAC;QAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC;IACxB,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IAC1B,IAAI,CAAC,MAAM;QAAE,OAAO,OAAO,CAAA;IAC3B,OAAO;QACL,GAAG,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI;QAC9F,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,CAAC,IAAI,EAAE,gBAAgB,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;KAClJ,CAAA;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAuC,EAAE,MAAc;IAC1F,MAAM,QAAQ,GAAG,GAAG,CAAC,mCAAmC,IAAI,EAAE,CAAA;IAC9D,IAAI,QAAQ;QAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAA;IACrC,OAAO,MAAM,CAAC,MAAM,CAAC,4BAA4B,IAAI,MAAM,CAAC,sBAAsB,IAAI,MAAM,CAAC,oBAAoB,CAAC,CAAA;AACpH,CAAC;AAED,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;AAEhC,SAAS,QAAQ,CAAC,IAAmB;IACnC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IACvD,IAAI,CAAC;QAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,CAAA;IAAC,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAAC,CAAC;AACtG,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,GAAW,EAAU,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;AAEnJ,MAAM,UAAU,UAAU,CAAC,WAAmB,EAAE,MAAc,EAAE,SAAwB,EAAE,GAAuC,EAAE,MAAe,EAAE,GAAW;IAC7J,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAC/B,MAAM,aAAa,GAAG,GAAG,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;IAC1F,MAAM,WAAW,GAAG,GAAG,CAAC,oBAAoB,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;IACpG,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;IAC5C,MAAM,OAAO,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAChE,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAC7D,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;IAC7C,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAA;IAC/C,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC5C,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAA;IAC5C,MAAM,OAAO,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAA;IAC7C,MAAM,CAAC,GAAG,CAAC,CAAkB,EAAU,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAA;IAC5E,OAAO;QACL,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACzF,eAAe,EAAE,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,aAAa,EAAE,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,aAAa,EAAE,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC;QAChI,WAAW,EAAE,OAAO,IAAI,EAAE,EAAE,SAAS,EAAE,QAAQ,IAAI,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,oBAAoB,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,oBAAoB,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,yBAAyB,EAAE,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC;QAC/M,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,qBAAqB,EAAE,OAAO,CAAC,KAAK,IAAI,IAAI,EAAE,wBAAwB,EAAE,OAAO,CAAC,QAAQ,EAAE,sBAAsB,EAAE,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC;KAC7N,CAAA;AACH,CAAC;AAYD,2GAA2G;AAC3G,SAAS,WAAW,CAAC,MAAc;IACjC,IAAI,EAAU,CAAA;IACd,IAAI,CAAC;QACH,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,QAAQ,GAAG,CAAC,WAAW,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,CAAA;IAC7E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,GAAI,KAA+B,CAAC,IAAI,CAAA;QAClD,IAAI,IAAI,KAAK,QAAQ;YAAE,OAAO,QAAQ,CAAA;QACtC,IAAI,IAAI,KAAK,OAAO;YAAE,MAAM,IAAI,WAAW,CAAC,GAAG,EAAE,yCAAyC,CAAC,CAAA;QAC3F,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,OAAO;YAAE,MAAM,IAAI,WAAW,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,qBAAqB,MAAM,oEAAoE,CAAC,CAAA;QACzL,MAAM,KAAK,CAAA;IACb,CAAC;IACD,IAAI,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE;YAAE,MAAM,IAAI,WAAW,CAAC,GAAG,EAAE,2CAA2C,CAAC,CAAA;QACpG,OAAO,YAAY,CAAC,EAAE,CAAC,CAAA;IACzB,CAAC;YAAS,CAAC;QACT,SAAS,CAAC,EAAE,CAAC,CAAA;IACf,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,WAAmB,EAAE,MAAc,EAAE,OAAe,EAAE,SAAiB,EAAE,QAAgB,EAAE,IAAqB;IAChJ,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAC/B,IAAI,OAAO,KAAK,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,cAAc,KAAK,SAAS,IAAI,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAAE,MAAM,IAAI,WAAW,CAAC,GAAG,EAAE,6DAA6D,CAAC,CAAA;IACxL,IAAI,OAAO,KAAK,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,oBAAoB,KAAK,SAAS,IAAI,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAAE,MAAM,IAAI,WAAW,CAAC,GAAG,EAAE,yEAAyE,CAAC,CAAA;IAC9M,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;IAC5C,SAAS,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACtC,IAAI,MAAc,CAAA;IAClB,IAAI,OAAO,KAAK,QAAQ;QAAE,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;SACvD,IAAI,OAAO,KAAK,MAAM;QAAE,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;SACxD,IAAI,OAAO,KAAK,MAAM;QAAE,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;;QAC7D,MAAM,IAAI,WAAW,CAAC,GAAG,EAAE,6CAA6C,CAAC,CAAA;IAC9E,IAAI,CAAC;QAAC,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC,cAAc,EAAE;YAAE,MAAM,IAAI,WAAW,CAAC,GAAG,EAAE,yCAAyC,CAAC,CAAA;IAAC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAAC,IAAI,KAAK,YAAY,WAAW;YAAE,MAAM,KAAK,CAAA;IAAC,CAAC;IACrL,MAAM,GAAG,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;IAC/B,MAAM,QAAQ,GAAG,GAAgB,EAAE,CAAC,IAAI,WAAW,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,0CAA0C,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAA;IACpJ,IAAI,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,QAAQ;QAAE,MAAM,QAAQ,EAAE,CAAA;IAChE,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAA;IAC9B,+GAA+G;IAC/G,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAA;IACvE,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;QACvB,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC3D,IAAI,KAAK,GAAG,KAAK,EAAE,CAAC;YAClB,MAAM,IAAI,WAAW,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,eAAe,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,yBAAyB,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,yDAAyD,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;QACzQ,CAAC;IACH,CAAC;IACD,IAAI,OAAgB,CAAA;IACpB,IAAI,CAAC;QACH,CAAC,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC,CAAA;IACpG,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,CAAC,KAAK,YAAY,YAAY,IAAI,KAAK,CAAC,SAAS,KAAK,qBAAqB,CAAC;YAAE,MAAM,KAAK,CAAA;QAC9F,IAAI,IAAI,GAAG,EAAE,CAAA;QACb,IAAI,CAAC;YAAC,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAA;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC;QAC5F,MAAM,IAAI,WAAW,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,mBAAmB,IAAI,KAAK,MAAM,uGAAuG,CAAC,CAAA;IAC1L,CAAC;IACD,IAAI,CAAC,OAAO;QAAE,MAAM,QAAQ,EAAE,CAAA;IAC9B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAA;AAC5C,CAAC;AAMD,MAAM,WAAW,GAAG,CAAC,WAAmB,EAAU,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAA;AAErG,MAAM,UAAU,WAAW,CAAC,WAAmB;IAC7C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,CAAY,CAAA;QACjF,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAC9L,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,WAAmB,EAAE,OAAsB;IACrE,MAAM,IAAI,GAAG,WAAW,CAAC,WAAW,CAAC,CAAA;IACrC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC7C,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;AACzD,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,WAAmB,EAAE,OAAe,EAAE,QAAgB,EAAE,GAAW;IAC9F,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,EAAE,CAAA;IAC3B,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAA;IAC7B,IAAI,CAAC,IAAI;QAAE,MAAM,IAAI,WAAW,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAA;IACzD,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI;QAAE,MAAM,IAAI,WAAW,CAAC,GAAG,EAAE,gCAAgC,CAAC,CAAA;IACpF,MAAM,OAAO,GAAG,WAAW,CAAC,WAAW,CAAC,CAAA;IACxC,IAAI,OAAO,CAAC,MAAM,IAAI,GAAG;QAAE,MAAM,IAAI,WAAW,CAAC,GAAG,EAAE,uCAAuC,CAAC,CAAA;IAC9F,MAAM,MAAM,GAAG,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,CAAA;IAC9H,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACpB,WAAW,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IACjC,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,WAAmB,EAAE,EAAU;IAC1D,IAAI,CAAC,EAAE;QAAE,MAAM,IAAI,WAAW,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAA;IACrD,WAAW,CAAC,WAAW,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;AAC/E,CAAC"}

package/dist/tools/plugin-settings.d.ts

@@ -0,0 +1,15 @@
+import type { PluginSettingField, PluginSettingView } from '@maudecode/talaria-web-contracts';
+export declare class PluginSettingsInvalid extends Error {
+}
+/** One form value as the Agent stores it: numbers and JSON arrive as the text the user typed. */
+export declare function normalizePluginSetting(field: PluginSettingField, raw: unknown): unknown;
+export interface PluginSettingsPlan {
+    /** Changed non-secret values for `plugins.settings_save`. */
+    values: Record<string, unknown>;
+    /** `.env` name → value for each secret field being set, or null to remove it. */
+    secrets: Record<string, string | null>;
+}
+export declare function planPluginSettings(fields: PluginSettingView[], values: Record<string, unknown>, secrets: Record<string, string>): PluginSettingsPlan;
+/** Fields as Settings shows them: a secret the launch environment supplies (`shadowed`) is `locked`. */
+export declare function pluginSettingsView(fields: PluginSettingField[], shadowed: (envVar: string) => boolean): PluginSettingView[];
+export declare function serializePluginSettingsSave<T>(save: () => Promise<T>): Promise<T>;

package/dist/tools/plugin-settings.js

@@ -0,0 +1,90 @@
+/**
+ * TAL-806: checks a Settings save of an Agent plugin's manifest-declared settings against the field list the sidecar
+ * reported (`plugins.settings`). Non-secret values are normalized to the field type and kept only when they change;
+ * secrets map to the field's `.env` name, so a client can never name the variable it writes.
+ */
+import { isDeepStrictEqual } from 'node:util';
+export class PluginSettingsInvalid extends Error {
+}
+/** One form value as the Agent stores it: numbers and JSON arrive as the text the user typed. */
+export function normalizePluginSetting(field, raw) {
+    switch (field.type) {
+        case 'string':
+            if (typeof raw === 'string')
+                return raw;
+            break;
+        case 'enum':
+            if (typeof raw === 'string' && (field.choices ?? []).includes(raw))
+                return raw;
+            throw new PluginSettingsInvalid(`${field.label} must be one of: ${(field.choices ?? []).join(', ')}`);
+        case 'boolean':
+            if (typeof raw === 'boolean')
+                return raw;
+            break;
+        case 'number': {
+            const value = typeof raw === 'number' ? raw : typeof raw === 'string' && raw.trim() ? Number(raw.trim()) : Number.NaN;
+            if (Number.isFinite(value))
+                return value;
+            break;
+        }
+        case 'json': {
+            let value = raw;
+            if (typeof raw === 'string') {
+                try {
+                    value = JSON.parse(raw);
+                }
+                catch {
+                    throw new PluginSettingsInvalid(`${field.label} must be valid JSON`);
+                }
+            }
+            if (value !== null && typeof value === 'object')
+                return value;
+            throw new PluginSettingsInvalid(`${field.label} must be a JSON list or object`);
+        }
+        case 'secret':
+            throw new PluginSettingsInvalid(`${field.label} is a secret; send it in secrets`);
+    }
+    throw new PluginSettingsInvalid(`${field.label} must be a ${field.type}`);
+}
+export function planPluginSettings(fields, values, secrets) {
+    const byKey = new Map(fields.map((field) => [field.key, field]));
+    const declared = (key) => {
+        const field = byKey.get(key);
+        if (!field)
+            throw new PluginSettingsInvalid(`'${key}' is not a setting this plugin declares`);
+        return field;
+    };
+    const plan = { values: {}, secrets: {} };
+    for (const [key, raw] of Object.entries(values)) {
+        const field = declared(key);
+        const value = normalizePluginSetting(field, raw);
+        if (!isDeepStrictEqual(value, field.value))
+            plan.values[key] = value;
+    }
+    for (const [key, raw] of Object.entries(secrets)) {
+        const field = declared(key);
+        const value = raw.trim();
+        if (field.type !== 'secret' || !field.env)
+            throw new PluginSettingsInvalid(`'${key}' is not a secret setting`);
+        if (field.locked)
+            throw new PluginSettingsInvalid(`${field.label} is set by the server's environment (${field.env}), so it cannot be changed here`);
+        // An emptied field clears the stored secret; there is nothing to clear when none is stored.
+        if (value || field.has_value)
+            plan.secrets[field.env] = value || null;
+    }
+    return plan;
+}
+// One save at a time: each holds its field lookup, `.env` snapshot, writes and rollback, so a failed save can only restore
+// values no later save has written yet.
+// ponytail: one process-wide chain; per-plugin chains only if saves ever contend for throughput.
+let saves = Promise.resolve();
+/** Fields as Settings shows them: a secret the launch environment supplies (`shadowed`) is `locked`. */
+export function pluginSettingsView(fields, shadowed) {
+    return fields.map((field) => field.type === 'secret' && field.env && shadowed(field.env) ? { ...field, locked: true } : field);
+}
+export function serializePluginSettingsSave(save) {
+    const run = saves.then(save);
+    saves = run.catch(() => undefined);
+    return run;
+}
+//# sourceMappingURL=plugin-settings.js.map