@intutic/sync-daemon 2.0.0 → 2.2.0

package/dist/disconnect/recognise.js

@@ -0,0 +1,98 @@
+/**
+ * recognise.ts — how disconnect tells Intutic's entries from the user's.
+ *
+ * Every test here is on content Intutic writes and nothing else: a hook
+ * command that runs a gate script from an `.intutic/hooks/` directory, a
+ * rules file that starts with the generated header, a URL on the origin of
+ * the proxy connect pointed the harness at.
+ *
+ * @module
+ */
+import * as node_fs from 'node:fs/promises';
+import * as node_path from 'node:path';
+import { proxyHost } from '@intutic/shared-types';
+import { isObject } from './plan.js';
+/** First line of every rules file Intutic generates. */
+export const RULES_HEADER = '# Intutic Governance Rules (auto-generated)';
+export function startsWithRulesHeader(text) {
+    return text.startsWith(RULES_HEADER);
+}
+/** Whether `text` mentions `marker`, for owned files recognised by a line Intutic writes in them. */
+export function contains(marker) {
+    return (text) => text.includes(marker);
+}
+/**
+ * Whether `command` runs the gate script `script` from an `.intutic/hooks/`
+ * directory (any workspace's, or the home one) — however it is quoted or
+ * whichever interpreter runs it.
+ */
+export function runsGate(command, script) {
+    if (typeof command !== 'string')
+        return false;
+    const escaped = script.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    return new RegExp(`[\\\\/]\\.intutic[\\\\/]hooks[\\\\/]${escaped}(?=["'\\s]|$)`).test(command);
+}
+/**
+ * Whether a `{ matcher, hooks: [{ command }] }` entry is Intutic's: every
+ * hook in it runs `script`. The shape Claude Code, Codex, Continue, Muse,
+ * Gemini CLI, Pi and Claude Desktop share.
+ */
+export function isGateEntry(script) {
+    return (entry) => {
+        if (!isObject(entry) || !Array.isArray(entry.hooks) || entry.hooks.length === 0)
+            return false;
+        return entry.hooks.every((h) => isObject(h) && runsGate(h.command, script));
+    };
+}
+/** Whether a `{ command }` entry (Cursor, Windsurf, Roo) runs `script`. */
+export function isGateCommandEntry(script) {
+    return (entry) => isObject(entry) && runsGate(entry.command, script);
+}
+/** Loopback hosts compare equal: connect writes `localhost` in one place and `127.0.0.1` in another. */
+function originOf(value) {
+    try {
+        const url = new URL(value);
+        const host = url.hostname === 'localhost' || url.hostname === '[::1]' ? '127.0.0.1' : url.hostname;
+        const port = url.port || (url.protocol === 'https:' ? '443' : '80');
+        return `${url.protocol}//${host}:${port}`;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * A test for "this value is a URL on the Intutic proxy", given the proxy
+ * URLs connect is known to have written. Any path on the proxy's origin
+ * counts: connect writes the bare host for Anthropic SDKs, `/v1` for OpenAI
+ * ones, and a trailing slash for Continue.
+ */
+export function proxyUrlMatcher(proxyUrls) {
+    const origins = new Set(proxyUrls.map((u) => originOf(proxyHost(u))).filter((o) => o !== null));
+    return (value) => typeof value === 'string' && origins.size > 0 && origins.has(originOf(value) ?? '');
+}
+/**
+ * Proxy URLs an earlier connect left in a workspace's own generated files:
+ * the "Proxy URL" line of a rules file and `INTUTIC_PROXY_URL` in
+ * `.env.intutic`. Used when connect predates the recorded list.
+ */
+export async function proxyUrlsInWorkspace(workspaceRoot) {
+    const found = new Set();
+    const files = ['CLAUDE.md', '.cursorrules', '.windsurfrules', 'AGENTS.md', '.github/copilot-instructions.md', '.env.intutic'];
+    for (const rel of files) {
+        let text;
+        try {
+            text = await node_fs.readFile(node_path.join(workspaceRoot, rel), 'utf-8');
+        }
+        catch {
+            continue;
+        }
+        if (!startsWithRulesHeader(text))
+            continue;
+        for (const m of text.matchAll(/^> \*\*Proxy URL:\*\* `([^`]+)`$/gm))
+            found.add(m[1]);
+        for (const m of text.matchAll(/^export INTUTIC_PROXY_URL="([^"]+)"$/gm))
+            found.add(m[1]);
+    }
+    return [...found];
+}
+//# sourceMappingURL=recognise.js.map

package/dist/disconnect/recognise.js.map

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

package/dist/disconnect/tomlLines.d.ts

@@ -0,0 +1,39 @@
+/**
+ * tomlLines.ts — line-level TOML edits that keep the user's comments.
+ *
+ * Codex's and OpenHands' writers set a key or append a table by editing
+ * lines, so the user's comments survive; undoing them the same way keeps
+ * that promise. Only the shapes those writers produce are handled: a
+ * `key = value` line in the top level or in a `[table]`, and a whole table.
+ *
+ * @module
+ */
+interface Section {
+    /** Table name as written between the brackets, or null for the top level. */
+    name: string | null;
+    /** Index of the header line (-1 for the top level). */
+    header: number;
+    /** One past the last line of the section. */
+    end: number;
+}
+/** Splits lines into sections, ignoring `[` lines inside multi-line strings. */
+export declare function tomlSections(lines: readonly string[]): Section[];
+/** The value a one-line `key = value` assignment holds, or undefined when the line is not one. */
+export declare function lineValue(line: string, key: string): unknown;
+/** Index of `key`'s line in the first section named `table` (null: top level), or -1. */
+export declare function findKeyLine(lines: readonly string[], table: string | null, key: string): number;
+/**
+ * Removes the table named `table`, header to end, with the blank line a
+ * writer put before it when it appended the table.
+ */
+export declare function removeTable(lines: string[], table: string): boolean;
+/** Removes a `[table]` header with nothing left under it but blank lines. */
+export declare function removeEmptyTable(lines: string[], table: string): boolean;
+/**
+ * Puts back one key a writer set. When the original text had the key in
+ * the same section its line is restored; otherwise the line is removed.
+ * Only a line whose value `isIntutic` recognises is touched.
+ */
+export declare function restoreKeyLine(lines: string[], table: string | null, key: string, originalLines: readonly string[] | null, isIntutic: (value: unknown) => boolean): boolean;
+export {};
+//# sourceMappingURL=tomlLines.d.ts.map

package/dist/disconnect/tomlLines.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tomlLines.d.ts","sourceRoot":"","sources":["../../src/disconnect/tomlLines.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,UAAU,OAAO;IACf,6EAA6E;IAC7E,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;IACnB,uDAAuD;IACvD,MAAM,EAAE,MAAM,CAAA;IACd,6CAA6C;IAC7C,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,gFAAgF;AAChF,wBAAgB,YAAY,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,EAAE,CAuBhE;AAED,kGAAkG;AAClG,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAO5D;AAED,yFAAyF;AACzF,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAO/F;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAOnE;AAED,6EAA6E;AAC7E,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAKxE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,MAAM,EAAE,EACf,KAAK,EAAE,MAAM,GAAG,IAAI,EACpB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,EACvC,SAAS,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,GACrC,OAAO,CAWT"}

package/dist/disconnect/tomlLines.js

@@ -0,0 +1,105 @@
+/**
+ * tomlLines.ts — line-level TOML edits that keep the user's comments.
+ *
+ * Codex's and OpenHands' writers set a key or append a table by editing
+ * lines, so the user's comments survive; undoing them the same way keeps
+ * that promise. Only the shapes those writers produce are handled: a
+ * `key = value` line in the top level or in a `[table]`, and a whole table.
+ *
+ * @module
+ */
+import { parse as parseToml } from 'smol-toml';
+/** Splits lines into sections, ignoring `[` lines inside multi-line strings. */
+export function tomlSections(lines) {
+    const sections = [{ name: null, header: -1, end: lines.length }];
+    let inString = null;
+    lines.forEach((line, i) => {
+        if (inString === null) {
+            // `[table]` or `[[array.of.tables]]`; the name is what is between the brackets.
+            const header = /^\s*\[\[?\s*([^\][]+?)\s*\]\]?\s*(#.*)?$/.exec(line);
+            if (header) {
+                sections[sections.length - 1].end = i;
+                sections.push({ name: header[1], header: i, end: lines.length });
+                return;
+            }
+        }
+        for (const quote of ['"""', "'''"]) {
+            let at = line.indexOf(quote);
+            while (at !== -1) {
+                if (inString === null)
+                    inString = quote;
+                else if (inString === quote)
+                    inString = null;
+                at = line.indexOf(quote, at + 3);
+            }
+        }
+    });
+    return sections;
+}
+/** The value a one-line `key = value` assignment holds, or undefined when the line is not one. */
+export function lineValue(line, key) {
+    if (!new RegExp(`^\\s*${key}\\s*=`).test(line))
+        return undefined;
+    try {
+        return parseToml(line)[key];
+    }
+    catch {
+        return undefined;
+    }
+}
+/** Index of `key`'s line in the first section named `table` (null: top level), or -1. */
+export function findKeyLine(lines, table, key) {
+    const section = tomlSections(lines).find((s) => s.name === table);
+    if (!section)
+        return -1;
+    for (let i = section.header + 1; i < section.end; i++) {
+        if (lineValue(lines[i], key) !== undefined)
+            return i;
+    }
+    return -1;
+}
+/**
+ * Removes the table named `table`, header to end, with the blank line a
+ * writer put before it when it appended the table.
+ */
+export function removeTable(lines, table) {
+    const section = tomlSections(lines).find((s) => s.name === table);
+    if (!section)
+        return false;
+    let start = section.header;
+    if (start > 0 && lines[start - 1].trim() === '')
+        start--;
+    lines.splice(start, section.end - start);
+    return true;
+}
+/** Removes a `[table]` header with nothing left under it but blank lines. */
+export function removeEmptyTable(lines, table) {
+    const section = tomlSections(lines).find((s) => s.name === table);
+    if (!section)
+        return false;
+    for (let i = section.header + 1; i < section.end; i++)
+        if (lines[i].trim() !== '')
+            return false;
+    return removeTable(lines, table);
+}
+/**
+ * Puts back one key a writer set. When the original text had the key in
+ * the same section its line is restored; otherwise the line is removed.
+ * Only a line whose value `isIntutic` recognises is touched.
+ */
+export function restoreKeyLine(lines, table, key, originalLines, isIntutic) {
+    const at = findKeyLine(lines, table, key);
+    if (at === -1 || !isIntutic(lineValue(lines[at], key)))
+        return false;
+    const was = originalLines ? findKeyLine(originalLines, table, key) : -1;
+    if (was !== -1) {
+        if (lines[at] === originalLines[was])
+            return false;
+        lines[at] = originalLines[was];
+    }
+    else {
+        lines.splice(at, 1);
+    }
+    return true;
+}
+//# sourceMappingURL=tomlLines.js.map

package/dist/disconnect/tomlLines.js.map

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

package/dist/harness/aiderConfigMerger.d.ts

@@ -2,8 +2,26 @@
  * aiderConfigMerger.ts — Safe YAML merge for .aider.conf.yml.
  *
  * Reads any existing .aider.conf.yml, STRIPS dangerous auto-exec keys
- * (test-cmd, lint-cmd, auto-test, auto-lint), merges in Intutic governance
- * keys (openai-api-base, anthropic-api-base), and writes back atomically.
+ * (test-cmd, lint-cmd, auto-test, auto-lint), merges in the Intutic proxy
+ * routing, and writes back atomically. Everything else in the file — lists,
+ * nested values, comments — is kept: the file is edited through the `yaml`
+ * library's document model, never re-serialised from a flattened copy.
+ *
+ * Aider rejects any config key that is not one of its command-line options
+ * ("unrecognized arguments"), so only real options are written:
+ *
+ * - `openai-api-base` — the proxy's OpenAI-style base URL (host + `/v1`).
+ * - `set-env: ANTHROPIC_BASE_URL=<host>` — Aider has no Anthropic base-URL
+ *   option; its model layer (LiteLLM) reads this variable, and wants the bare
+ *   host because it appends `/v1/messages` itself. Entries the user set for
+ *   other variables are kept.
+ * - `read: .intutic/aider-sops.md` — the SOP text, as a read-only context
+ *   file (Aider's own mechanism for conventions), written next to the config.
+ *
+ * Earlier versions wrote `anthropic-api-base` and `extra-instructions`, which
+ * are not Aider options and stopped Aider from starting; both are removed.
+ *
+ * A file that does not parse as YAML, or is not a mapping, is left untouched.
  *
  * Each strip emits a governance_config_sanitized log entry visible in
  * the control plane audit feed.
@@ -13,15 +31,34 @@
  *
  * @module
  */
+/** SOP file, relative to the workspace root (where Aider runs). */
+export declare const AIDER_SOPS_FILE = ".intutic/aider-sops.md";
+export declare function stripOwnHeader(raw: string): string;
+/** Result of merging the Intutic keys into an Aider config's text. */
+export interface AiderMergeResult {
+    /** New file content, or `null` when the file must be left untouched. */
+    content: string | null;
+    /** Suppressed keys that were removed. */
+    stripped: string[];
+}
+/**
+ * Merge the Intutic keys into the text of an `.aider.conf.yml`.
+ *
+ * @param raw      - Current file content ('' when the file does not exist).
+ * @param proxyUrl - The proxy host (a trailing `/v1` is tolerated).
+ * @param hasSops  - Whether the SOP file is to be listed under `read`.
+ */
+export declare function mergeAiderYaml(raw: string, proxyUrl: string, hasSops: boolean): AiderMergeResult;
 /**
  * Merge Intutic governance settings into .aider.conf.yml.
  *
  * Preserves all user keys EXCEPT the suppressed auto-exec keys.
- * Adds/updates openai-api-base and anthropic-api-base.
  *
  * @param configPath - Absolute path to .aider.conf.yml
  * @param proxyUrl   - Intutic proxy URL
- * @param sopsText   - Optional SOP instructions for extra-instructions field
+ * @param sopsText   - Optional SOP instructions, written to the `read` file
+ * @returns `true` when the config was written, `false` when it was left
+ *          untouched because it is not a YAML mapping (a warning is logged).
  */
-export declare function mergeAiderConfig(configPath: string, proxyUrl: string, sopsText?: string): Promise<void>;
+export declare function mergeAiderConfig(configPath: string, proxyUrl: string, sopsText?: string): Promise<boolean>;
 //# sourceMappingURL=aiderConfigMerger.d.ts.map

package/dist/harness/aiderConfigMerger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aiderConfigMerger.d.ts","sourceRoot":"","sources":["../../src/harness/aiderConfigMerger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AA0EH;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CAmDf"}
+{"version":3,"file":"aiderConfigMerger.d.ts","sourceRoot":"","sources":["../../src/harness/aiderConfigMerger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAoBH,mEAAmE;AACnE,eAAO,MAAM,eAAe,2BAA2B,CAAA;AAcvD,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAOlD;AAED,sEAAsE;AACtE,MAAM,WAAW,gBAAgB;IAC/B,wEAAwE;IACxE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,yCAAyC;IACzC,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB;AAYD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,gBAAgB,CA2BhG;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC,CA8ClB"}

package/dist/harness/aiderConfigMerger.js

@@ -2,8 +2,26 @@
  * aiderConfigMerger.ts — Safe YAML merge for .aider.conf.yml.
  *
  * Reads any existing .aider.conf.yml, STRIPS dangerous auto-exec keys
- * (test-cmd, lint-cmd, auto-test, auto-lint), merges in Intutic governance
- * keys (openai-api-base, anthropic-api-base), and writes back atomically.
+ * (test-cmd, lint-cmd, auto-test, auto-lint), merges in the Intutic proxy
+ * routing, and writes back atomically. Everything else in the file — lists,
+ * nested values, comments — is kept: the file is edited through the `yaml`
+ * library's document model, never re-serialised from a flattened copy.
+ *
+ * Aider rejects any config key that is not one of its command-line options
+ * ("unrecognized arguments"), so only real options are written:
+ *
+ * - `openai-api-base` — the proxy's OpenAI-style base URL (host + `/v1`).
+ * - `set-env: ANTHROPIC_BASE_URL=<host>` — Aider has no Anthropic base-URL
+ *   option; its model layer (LiteLLM) reads this variable, and wants the bare
+ *   host because it appends `/v1/messages` itself. Entries the user set for
+ *   other variables are kept.
+ * - `read: .intutic/aider-sops.md` — the SOP text, as a read-only context
+ *   file (Aider's own mechanism for conventions), written next to the config.
+ *
+ * Earlier versions wrote `anthropic-api-base` and `extra-instructions`, which
+ * are not Aider options and stopped Aider from starting; both are removed.
+ *
+ * A file that does not parse as YAML, or is not a mapping, is left untouched.
  *
  * Each strip emits a governance_config_sanitized log entry visible in
  * the control plane audit feed.
@@ -15,125 +33,134 @@
  */
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
+import { parseDocument, isMap, isSeq, isScalar, YAMLSeq } from 'yaml';
 import { createLogger } from '@intutic/logger';
-import { newIso } from '@intutic/id';
+import { keepOriginal } from '../disconnect/originals.js';
+import { anthropicBaseUrl, openaiBaseUrl } from '@intutic/shared-types';
 const log = createLogger('sync-aider-merger');
 /**
  * Keys that Aider auto-executes on startup without user confirmation.
  * Stripping these prevents supply-chain persistence attacks.
  */
 const SUPPRESSED_KEYS = ['test-cmd', 'lint-cmd', 'auto-test', 'auto-lint', 'test_cmd', 'lint_cmd'];
-/**
- * Minimal YAML parser for .aider.conf.yml — handles simple key: value lines
- * and multi-line strings. Does not handle complex YAML. Good enough for the
- * flat structure of .aider.conf.yml.
- */
-function parseAiderYaml(raw) {
-    const result = {};
+/** Keys earlier versions wrote that Aider rejects as unrecognized arguments. */
+const INVALID_LEGACY_KEYS = ['anthropic-api-base', 'extra-instructions'];
+/** SOP file, relative to the workspace root (where Aider runs). */
+export const AIDER_SOPS_FILE = '.intutic/aider-sops.md';
+/** Header written at the top of the file. Kept short: it sits above the
+ *  user's own content, and is replaced, not stacked, on every sync. */
+const HEADER = [
+    '# Intutic: openai-api-base, the ANTHROPIC_BASE_URL set-env entry and the',
+    `# ${AIDER_SOPS_FILE} read entry are managed by intutic connect. test-cmd,`,
+    '# lint-cmd, auto-test and auto-lint are removed on every sync.',
+];
+/** Leading lines this product wrote (the header above, or the one earlier
+ *  versions wrote), removed before the file is parsed. */
+const OWN_HEADER_LINE = /^# (Intutic: |Intutic Governance Rules \(auto-generated|Last sync: |WARNING: test-cmd and lint-cmd keys are suppressed|\.intutic\/aider-sops\.md read entry|lint-cmd, auto-test and auto-lint are removed)/;
+export function stripOwnHeader(raw) {
     const lines = raw.split('\n');
     let i = 0;
-    while (i < lines.length) {
-        const line = lines[i];
-        // Skip comments and blank lines
-        if (!line || line.trim().startsWith('#')) {
-            i++;
-            continue;
-        }
-        const colonIdx = line.indexOf(':');
-        if (colonIdx === -1) {
-            i++;
-            continue;
-        }
-        const key = line.slice(0, colonIdx).trim();
-        const rest = line.slice(colonIdx + 1).trim();
-        if (rest === '|' || rest === '>') {
-            // Multi-line block scalar — collect until next key or EOF
-            const blockLines = [];
-            i++;
-            while (i < lines.length && (lines[i].startsWith('  ') || lines[i] === '')) {
-                blockLines.push(lines[i].startsWith('  ') ? lines[i].slice(2) : '');
-                i++;
-            }
-            result[key] = blockLines.join('\n').trimEnd();
-        }
-        else {
-            // Strip inline quotes
-            result[key] = rest.replace(/^["']|["']$/g, '');
-            i++;
-        }
-    }
-    return result;
+    while (i < lines.length && OWN_HEADER_LINE.test(lines[i]))
+        i++;
+    if (i === 0)
+        return raw;
+    while (i < lines.length && lines[i].trim() === '')
+        i++;
+    return lines.slice(i).join('\n');
+}
+/** Turn `key`'s value into a sequence (a scalar becomes a one-item list). */
+function ensureSeq(doc, key) {
+    const current = doc.get(key, true);
+    if (isSeq(current))
+        return current;
+    const seq = new YAMLSeq();
+    if (isScalar(current) && current.value !== null && current.value !== '')
+        seq.add(current.value);
+    doc.set(key, seq);
+    return seq;
 }
 /**
- * Minimal YAML serializer — writes flat key: value pairs.
- * Multi-line values use the | block scalar style.
+ * Merge the Intutic keys into the text of an `.aider.conf.yml`.
+ *
+ * @param raw      - Current file content ('' when the file does not exist).
+ * @param proxyUrl - The proxy host (a trailing `/v1` is tolerated).
+ * @param hasSops  - Whether the SOP file is to be listed under `read`.
  */
-function serializeAiderYaml(obj) {
-    const lines = [];
-    for (const [key, value] of Object.entries(obj)) {
-        if (typeof value === 'string' && value.includes('\n')) {
-            lines.push(`${key}: |`);
-            for (const ln of value.split('\n')) {
-                lines.push(`  ${ln}`);
-            }
-        }
-        else if (typeof value === 'boolean') {
-            lines.push(`${key}: ${value}`);
-        }
-        else {
-            lines.push(`${key}: ${String(value)}`);
-        }
-    }
-    return lines.join('\n');
+export function mergeAiderYaml(raw, proxyUrl, hasSops) {
+    const doc = parseDocument(stripOwnHeader(raw));
+    if (doc.errors.length > 0)
+        return { content: null, stripped: [] };
+    // A missing, empty or comment-only file starts as an empty mapping (its
+    // comments stay on the document); anything else that is not a mapping (a
+    // list, a bare scalar) is not an Aider config to merge into.
+    if (doc.contents === null)
+        doc.contents = doc.createNode({});
+    if (!isMap(doc.contents))
+        return { content: null, stripped: [] };
+    const stripped = SUPPRESSED_KEYS.filter((key) => doc.has(key));
+    for (const key of [...stripped, ...INVALID_LEGACY_KEYS])
+        doc.delete(key);
+    doc.set('openai-api-base', openaiBaseUrl(proxyUrl));
+    const setEnv = ensureSeq(doc, 'set-env');
+    setEnv.items = setEnv.items.filter((item) => {
+        const value = isScalar(item) ? item.value : item;
+        return !(typeof value === 'string' && value.startsWith('ANTHROPIC_BASE_URL='));
+    });
+    setEnv.add(`ANTHROPIC_BASE_URL=${anthropicBaseUrl(proxyUrl)}`);
+    const read = ensureSeq(doc, 'read');
+    read.items = read.items.filter((item) => (isScalar(item) ? item.value : item) !== AIDER_SOPS_FILE);
+    if (hasSops)
+        read.add(AIDER_SOPS_FILE);
+    if (read.items.length === 0)
+        doc.delete('read');
+    return { content: `${HEADER.join('\n')}\n\n${doc.toString()}`, stripped };
 }
 /**
  * Merge Intutic governance settings into .aider.conf.yml.
  *
  * Preserves all user keys EXCEPT the suppressed auto-exec keys.
- * Adds/updates openai-api-base and anthropic-api-base.
  *
  * @param configPath - Absolute path to .aider.conf.yml
  * @param proxyUrl   - Intutic proxy URL
- * @param sopsText   - Optional SOP instructions for extra-instructions field
+ * @param sopsText   - Optional SOP instructions, written to the `read` file
+ * @returns `true` when the config was written, `false` when it was left
+ *          untouched because it is not a YAML mapping (a warning is logged).
  */
 export async function mergeAiderConfig(configPath, proxyUrl, sopsText) {
-    // Read existing config if present
-    let existing = {};
+    let raw = '';
     try {
-        const raw = await fs.readFile(configPath, 'utf-8');
-        existing = parseAiderYaml(raw);
+        raw = await fs.readFile(configPath, 'utf-8');
     }
-    catch {
-        // No existing file — start fresh
+    catch (err) {
+        if (err.code !== 'ENOENT')
+            throw err;
     }
-    // Strip dangerous auto-exec keys
-    const stripped = [];
-    for (const key of SUPPRESSED_KEYS) {
-        if (key in existing) {
-            stripped.push(key);
-            delete existing[key];
-        }
+    const { content, stripped } = mergeAiderYaml(raw, proxyUrl, Boolean(sopsText));
+    if (content === null) {
+        log.warn({ action: 'aider_config_merge_skipped', path: configPath }, `${configPath} is not a YAML mapping — left untouched; fix it and the next sync will add the Intutic keys`);
+        return false;
     }
     if (stripped.length > 0) {
         log.warn({ action: 'aider_keys_stripped', keys: stripped, path: configPath }, `Stripped dangerous auto-exec keys from .aider.conf.yml: ${stripped.join(', ')}`);
     }
-    // Merge governance keys
-    existing['openai-api-base'] = proxyUrl;
-    existing['anthropic-api-base'] = proxyUrl;
+    // The SOP file lives next to the config, under the workspace's .intutic/.
+    const sopsPath = path.join(path.dirname(configPath), AIDER_SOPS_FILE);
     if (sopsText) {
-        existing['extra-instructions'] = sopsText;
+        await fs.mkdir(path.dirname(sopsPath), { recursive: true });
+        const tmpSops = sopsPath + '.intutic-tmp';
+        await fs.writeFile(tmpSops, sopsText + '\n', 'utf-8');
+        await fs.rename(tmpSops, sopsPath);
+    }
+    else {
+        await fs.rm(sopsPath, { force: true });
     }
-    const header = [
-        '# Intutic Governance Rules (auto-generated — do not edit proxy keys)',
-        `# Last sync: ${newIso()}`,
-        `# WARNING: test-cmd and lint-cmd keys are suppressed by Intutic governance`,
-        '',
-    ].join('\n');
-    const content = header + serializeAiderYaml(existing) + '\n';
     const tmpPath = configPath + '.intutic-tmp';
+    // The config sits at the workspace root, so its directory is the workspace.
+    await keepOriginal(configPath, path.dirname(configPath));
     await fs.mkdir(path.dirname(configPath), { recursive: true });
     await fs.writeFile(tmpPath, content, 'utf-8');
     await fs.rename(tmpPath, configPath);
     log.info({ action: 'aider_config_written', path: configPath, stripped }, 'Aider config merged with proxy URL and dangerous keys stripped');
+    return true;
 }
 //# sourceMappingURL=aiderConfigMerger.js.map

package/dist/harness/aiderConfigMerger.js.map

@@ -1 +1 @@
-{"version":3,"file":"aiderConfigMerger.js","sourceRoot":"","sources":["../../src/harness/aiderConfigMerger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAEpC,MAAM,GAAG,GAAG,YAAY,CAAC,mBAAmB,CAAC,CAAA;AAE7C;;;GAGG;AACH,MAAM,eAAe,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,CAAC,CAAA;AAElG;;;;GAIG;AACH,SAAS,cAAc,CAAC,GAAW;IACjC,MAAM,MAAM,GAA4B,EAAE,CAAA;IAC1C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC7B,IAAI,CAAC,GAAG,CAAC,CAAA;IACT,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QACxB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QACrB,gCAAgC;QAChC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAAC,CAAC,EAAE,CAAC;YAAC,SAAQ;QAAC,CAAC;QAE3D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAClC,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE,CAAC;YAAC,CAAC,EAAE,CAAC;YAAC,SAAQ;QAAC,CAAC;QAEtC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAA;QAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QAE5C,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;YACjC,0DAA0D;YAC1D,MAAM,UAAU,GAAa,EAAE,CAAA;YAC/B,CAAC,EAAE,CAAA;YACH,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC;gBAC1E,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;gBACnE,CAAC,EAAE,CAAA;YACL,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAA;QAC/C,CAAC;aAAM,CAAC;YACN,sBAAsB;YACtB,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAA;YAC9C,CAAC,EAAE,CAAA;QACL,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED;;;GAGG;AACH,SAAS,kBAAkB,CAAC,GAA4B;IACtD,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACtD,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,CAAA;YACvB,KAAK,MAAM,EAAE,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;YACvB,CAAC;QACH,CAAC;aAAM,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE,CAAC;YACtC,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,KAAK,KAAK,EAAE,CAAC,CAAA;QAChC,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,KAAK,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;QACxC,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACzB,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,UAAkB,EAClB,QAAgB,EAChB,QAAiB;IAEjB,kCAAkC;IAClC,IAAI,QAAQ,GAA4B,EAAE,CAAA;IAC1C,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QAClD,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,CAAA;IAChC,CAAC;IAAC,MAAM,CAAC;QACP,iCAAiC;IACnC,CAAC;IAED,iCAAiC;IACjC,MAAM,QAAQ,GAAa,EAAE,CAAA;IAC7B,KAAK,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;QAClC,IAAI,GAAG,IAAI,QAAQ,EAAE,CAAC;YACpB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YAClB,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAA;QACtB,CAAC;IACH,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,GAAG,CAAC,IAAI,CACN,EAAE,MAAM,EAAE,qBAAqB,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,EACnE,2DAA2D,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACjF,CAAA;IACH,CAAC;IAED,wBAAwB;IACxB,QAAQ,CAAC,iBAAiB,CAAC,GAAG,QAAQ,CAAA;IACtC,QAAQ,CAAC,oBAAoB,CAAC,GAAG,QAAQ,CAAA;IAEzC,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,oBAAoB,CAAC,GAAG,QAAQ,CAAA;IAC3C,CAAC;IAED,MAAM,MAAM,GAAG;QACb,sEAAsE;QACtE,gBAAgB,MAAM,EAAE,EAAE;QAC1B,4EAA4E;QAC5E,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAEZ,MAAM,OAAO,GAAG,MAAM,GAAG,kBAAkB,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAA;IAE5D,MAAM,OAAO,GAAG,UAAU,GAAG,cAAc,CAAA;IAC3C,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC7D,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IAC7C,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;IAEpC,GAAG,CAAC,IAAI,CACN,EAAE,MAAM,EAAE,sBAAsB,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,EAC9D,gEAAgE,CACjE,CAAA;AACH,CAAC"}
+{"version":3,"file":"aiderConfigMerger.js","sourceRoot":"","sources":["../../src/harness/aiderConfigMerger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAiB,MAAM,MAAM,CAAA;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAEvE,MAAM,GAAG,GAAG,YAAY,CAAC,mBAAmB,CAAC,CAAA;AAE7C;;;GAGG;AACH,MAAM,eAAe,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,CAAC,CAAA;AAElG,gFAAgF;AAChF,MAAM,mBAAmB,GAAG,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,CAAA;AAExE,mEAAmE;AACnE,MAAM,CAAC,MAAM,eAAe,GAAG,wBAAwB,CAAA;AAEvD;uEACuE;AACvE,MAAM,MAAM,GAAG;IACb,0EAA0E;IAC1E,KAAK,eAAe,uDAAuD;IAC3E,gEAAgE;CACjE,CAAA;AAED;0DAC0D;AAC1D,MAAM,eAAe,GAAG,4MAA4M,CAAA;AAEpO,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC7B,IAAI,CAAC,GAAG,CAAC,CAAA;IACT,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAAE,CAAC,EAAE,CAAA;IAC9D,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,GAAG,CAAA;IACvB,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE;QAAE,CAAC,EAAE,CAAA;IACtD,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAClC,CAAC;AAUD,6EAA6E;AAC7E,SAAS,SAAS,CAAC,GAAa,EAAE,GAAW;IAC3C,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;IAClC,IAAI,KAAK,CAAC,OAAO,CAAC;QAAE,OAAO,OAAO,CAAA;IAClC,MAAM,GAAG,GAAG,IAAI,OAAO,EAAE,CAAA;IACzB,IAAI,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,KAAK,KAAK,IAAI,IAAI,OAAO,CAAC,KAAK,KAAK,EAAE;QAAE,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC/F,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IACjB,OAAO,GAAG,CAAA;AACZ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,GAAW,EAAE,QAAgB,EAAE,OAAgB;IAC5E,MAAM,GAAG,GAAa,aAAa,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAA;IACxD,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;IACjE,wEAAwE;IACxE,yEAAyE;IACzE,6DAA6D;IAC7D,IAAI,GAAG,CAAC,QAAQ,KAAK,IAAI;QAAE,GAAG,CAAC,QAAQ,GAAG,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;IAC5D,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC;QAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAA;IAEhE,MAAM,QAAQ,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;IAC9D,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,QAAQ,EAAE,GAAG,mBAAmB,CAAC;QAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAExE,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEnD,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IACxC,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;QAChD,OAAO,CAAC,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,CAAA;IAChF,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,GAAG,CAAC,sBAAsB,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAE9D,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IACnC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,eAAe,CAAC,CAAA;IAClG,IAAI,OAAO;QAAE,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IACtC,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;IAE/C,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAA;AAC3E,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,UAAkB,EAClB,QAAgB,EAChB,QAAiB;IAEjB,IAAI,GAAG,GAAG,EAAE,CAAA;IACZ,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;IAC9C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ;YAAE,MAAM,GAAG,CAAA;IACjE,CAAC;IAED,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC9E,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACrB,GAAG,CAAC,IAAI,CACN,EAAE,MAAM,EAAE,4BAA4B,EAAE,IAAI,EAAE,UAAU,EAAE,EAC1D,GAAG,UAAU,6FAA6F,CAC3G,CAAA;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,GAAG,CAAC,IAAI,CACN,EAAE,MAAM,EAAE,qBAAqB,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,EACnE,2DAA2D,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACjF,CAAA;IACH,CAAC;IAED,0EAA0E;IAC1E,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,CAAA;IACrE,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC3D,MAAM,OAAO,GAAG,QAAQ,GAAG,cAAc,CAAA;QACzC,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI,EAAE,OAAO,CAAC,CAAA;QACrD,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACpC,CAAC;SAAM,CAAC;QACN,MAAM,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IACxC,CAAC;IAED,MAAM,OAAO,GAAG,UAAU,GAAG,cAAc,CAAA;IAC3C,4EAA4E;IAC5E,MAAM,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAA;IACxD,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC7D,MAAM,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IAC7C,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;IAEpC,GAAG,CAAC,IAAI,CACN,EAAE,MAAM,EAAE,sBAAsB,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,EAC9D,gEAAgE,CACjE,CAAA;IACD,OAAO,IAAI,CAAA;AACb,CAAC"}