@mainwave/cli 0.2.0 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/adapters/claude-desktop.js +16 -48
- package/dist/adapters/claude-desktop.js.map +1 -1
- package/dist/adapters/codex-cli.js +68 -5
- package/dist/adapters/codex-cli.js.map +1 -1
- package/dist/adapters/copilot-chat.js +5 -28
- package/dist/adapters/copilot-chat.js.map +1 -1
- package/dist/adapters/copilot-cli.js +7 -30
- package/dist/adapters/copilot-cli.js.map +1 -1
- package/dist/core/format.js +48 -35
- package/dist/core/format.js.map +1 -1
- package/dist/core/git.js +26 -0
- package/dist/core/git.js.map +1 -0
- package/dist/core/headers.js +221 -0
- package/dist/core/headers.js.map +1 -0
- package/dist/core/markers.js +38 -5
- package/dist/core/markers.js.map +1 -1
- package/dist/core/prompts.js +16 -1
- package/dist/core/prompts.js.map +1 -1
- package/dist/core/wizard.js +67 -13
- package/dist/core/wizard.js.map +1 -1
- package/hooks/github-pr-marker.mjs +6 -1
- package/hooks/jira-ticket-marker.mjs +6 -1
- package/hooks/linear-ticket-marker.mjs +6 -1
- package/hooks/marker-core.mjs +56 -3
- package/package.json +1 -1
package/dist/core/git.js
ADDED
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { spawnSync } from 'node:child_process';
|
|
2
|
+
/**
|
|
3
|
+
* The developer's email from `git config user.email`, or undefined when git
|
|
4
|
+
* isn't installed, isn't configured, or the command fails. Used to pre-fill the
|
|
5
|
+
* identity prompt for adapters that inject identity (Codex), so the developer's
|
|
6
|
+
* activity can be attributed without them typing their address (MAI-1394). The
|
|
7
|
+
* prompt lets them override or clear it, so a stale/shared git identity is never
|
|
8
|
+
* silently authoritative.
|
|
9
|
+
*/
|
|
10
|
+
export const detectGitEmail = () => {
|
|
11
|
+
try {
|
|
12
|
+
const r = spawnSync('git', ['config', '--get', 'user.email'], {
|
|
13
|
+
encoding: 'utf8',
|
|
14
|
+
timeout: 2000,
|
|
15
|
+
});
|
|
16
|
+
if (r.status !== 0)
|
|
17
|
+
return undefined;
|
|
18
|
+
const email = r.stdout.trim();
|
|
19
|
+
return email || undefined;
|
|
20
|
+
}
|
|
21
|
+
catch {
|
|
22
|
+
// Any unexpected spawn failure — no default, the prompt just starts empty.
|
|
23
|
+
return undefined;
|
|
24
|
+
}
|
|
25
|
+
};
|
|
26
|
+
//# sourceMappingURL=git.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../src/core/git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAE9C;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,GAAuB,EAAE;IACrD,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE;YAC5D,QAAQ,EAAE,MAAM;YAChB,OAAO,EAAE,IAAI;SACd,CAAC,CAAA;QACF,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,SAAS,CAAA;QACpC,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;QAC7B,OAAO,KAAK,IAAI,SAAS,CAAA;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,2EAA2E;QAC3E,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC,CAAA"}
|
|
@@ -0,0 +1,221 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The OTLP header collection every adapter sends to the collector, the
|
|
3
|
+
* encodings a single settings value can carry it in, and the rule for which
|
|
4
|
+
* header holds a secret. One module owns all three because the display path
|
|
5
|
+
* has to reverse exactly what the build path produced: `core/format.ts` masks
|
|
6
|
+
* a rendered value by asking each encoding declared here to redact it, rather
|
|
7
|
+
* than pattern-matching the setting's name.
|
|
8
|
+
*
|
|
9
|
+
* That coupling is the fix for MAI-1340. Claude Desktop stores its headers as
|
|
10
|
+
* a JSON-object string under `otlpHeaders`; the masker only knew the
|
|
11
|
+
* comma-separated env-var form and two key names, so it printed a live org key
|
|
12
|
+
* in the wizard diff and in `doctor`. An adapter that needs a fourth encoding
|
|
13
|
+
* adds it to `HEADER_ENCODINGS` — which is what it has to build with — and the
|
|
14
|
+
* masker picks it up with no change.
|
|
15
|
+
*
|
|
16
|
+
* Adapters that split headers across one settings key per header (Codex CLI's
|
|
17
|
+
* `otel.*.otlp-http.headers.Authorization`) carry no collection to decode; the
|
|
18
|
+
* masker catches those via `isSecretHeaderName` on the key's last dotted
|
|
19
|
+
* segment, against the same name list used here.
|
|
20
|
+
*/
|
|
21
|
+
export const HEADER_NAME = {
|
|
22
|
+
authorization: 'Authorization',
|
|
23
|
+
ucid: 'X-Mainwave-UCID',
|
|
24
|
+
source: 'X-Mainwave-Source',
|
|
25
|
+
};
|
|
26
|
+
/**
|
|
27
|
+
* Header names whose value is a credential, lowercased for comparison. The
|
|
28
|
+
* single source of truth for "this must never be printed" — consulted both
|
|
29
|
+
* when redacting an encoded collection and when masking a per-header key.
|
|
30
|
+
*/
|
|
31
|
+
const SECRET_HEADER_NAMES = [HEADER_NAME.authorization.toLowerCase()];
|
|
32
|
+
export const isSecretHeaderName = (name) => SECRET_HEADER_NAMES.includes(name.trim().toLowerCase());
|
|
33
|
+
const BEARER_VALUE_RE = /^\s*bearer\s+\S/i;
|
|
34
|
+
/** True when a header value carries a bearer token, whatever the header is called. */
|
|
35
|
+
export const isBearerValue = (value) => BEARER_VALUE_RE.test(value);
|
|
36
|
+
/**
|
|
37
|
+
* A header entry must be masked when its name is a known credential header, or
|
|
38
|
+
* when the value is bearer-shaped regardless of name — defense in depth for a
|
|
39
|
+
* future tool that names its auth header something else.
|
|
40
|
+
*/
|
|
41
|
+
const isSensitiveEntry = (name, value) => isSecretHeaderName(name) || isBearerValue(value);
|
|
42
|
+
const CREDENTIAL_SHAPE_RES = [
|
|
43
|
+
/bearer\s+\S/i,
|
|
44
|
+
new RegExp(SECRET_HEADER_NAMES.join('|'), 'i'),
|
|
45
|
+
];
|
|
46
|
+
/**
|
|
47
|
+
* True when a string looks like it carries a credential *somewhere* — a bearer
|
|
48
|
+
* token or a secret header name, at any offset.
|
|
49
|
+
*
|
|
50
|
+
* This is the fail-closed trigger, not a masking rule: a value no encoding
|
|
51
|
+
* could decode (truncated JSON, a nested non-string value, a token containing
|
|
52
|
+
* the delimiter) must never be rendered verbatim when it might hold a key.
|
|
53
|
+
* `doctor` reads whatever is on disk, and a managed-settings file is exactly
|
|
54
|
+
* the thing an MDM or a human hand-edits into an unparseable state.
|
|
55
|
+
*/
|
|
56
|
+
export const hasCredentialShape = (raw) => CREDENTIAL_SHAPE_RES.some((re) => re.test(raw));
|
|
57
|
+
/**
|
|
58
|
+
* The tenancy/auth headers, in a stable key order so a re-run doesn't churn the
|
|
59
|
+
* encoded value (and therefore doesn't produce a spurious wizard diff).
|
|
60
|
+
*/
|
|
61
|
+
export const buildHeaders = ({ apiKey, ucid, source, }) => {
|
|
62
|
+
const headers = {
|
|
63
|
+
[HEADER_NAME.authorization]: `Bearer ${apiKey}`,
|
|
64
|
+
};
|
|
65
|
+
if (ucid)
|
|
66
|
+
headers[HEADER_NAME.ucid] = ucid;
|
|
67
|
+
headers[HEADER_NAME.source] = source;
|
|
68
|
+
return headers;
|
|
69
|
+
};
|
|
70
|
+
/** Extracts the token from a `Bearer <token>` header value. */
|
|
71
|
+
export const headerBearerToken = (value) => {
|
|
72
|
+
if (typeof value !== 'string' || !value.toLowerCase().startsWith('bearer '))
|
|
73
|
+
return undefined;
|
|
74
|
+
return value.slice('bearer '.length).trim() || undefined;
|
|
75
|
+
};
|
|
76
|
+
/**
|
|
77
|
+
* Renders one decoded header entry. Sensitive entries are masked; the rest are
|
|
78
|
+
* recursed into first, so a value that itself holds an encoded collection (a
|
|
79
|
+
* doubly-encoded blob from a hand-written profile) is masked rather than
|
|
80
|
+
* printed. Returns `undefined` to decline — the value looks like it carries a
|
|
81
|
+
* credential but no encoding could render it — which propagates up and makes
|
|
82
|
+
* the whole collection fail closed.
|
|
83
|
+
*/
|
|
84
|
+
const redactEntry = (name, value, mask) => {
|
|
85
|
+
if (isSensitiveEntry(name, value))
|
|
86
|
+
return mask(value);
|
|
87
|
+
const nested = redactHeaderCollection(value, mask);
|
|
88
|
+
if (nested !== undefined)
|
|
89
|
+
return nested;
|
|
90
|
+
return hasCredentialShape(value) ? undefined : value;
|
|
91
|
+
};
|
|
92
|
+
const isPlainObject = (v) => v !== null && typeof v === 'object' && !Array.isArray(v);
|
|
93
|
+
/**
|
|
94
|
+
* JSON-object string — the managed-configuration encoding (macOS plist,
|
|
95
|
+
* Windows registry, Linux `managed-settings.json`) that Claude Desktop's
|
|
96
|
+
* `otlpHeaders` requires.
|
|
97
|
+
*/
|
|
98
|
+
export const jsonObjectHeaders = {
|
|
99
|
+
id: 'json-object',
|
|
100
|
+
encode: (headers) => JSON.stringify(headers),
|
|
101
|
+
decode: (raw) => {
|
|
102
|
+
if (!raw.trimStart().startsWith('{'))
|
|
103
|
+
return undefined;
|
|
104
|
+
let parsed;
|
|
105
|
+
try {
|
|
106
|
+
parsed = JSON.parse(raw);
|
|
107
|
+
}
|
|
108
|
+
catch {
|
|
109
|
+
return undefined;
|
|
110
|
+
}
|
|
111
|
+
if (!isPlainObject(parsed))
|
|
112
|
+
return undefined;
|
|
113
|
+
const out = {};
|
|
114
|
+
// All-string values only: anything else isn't a header map, and coercing it
|
|
115
|
+
// would make the masked render differ in shape from what is on disk.
|
|
116
|
+
for (const [k, v] of Object.entries(parsed)) {
|
|
117
|
+
if (typeof v !== 'string')
|
|
118
|
+
return undefined;
|
|
119
|
+
out[k] = v;
|
|
120
|
+
}
|
|
121
|
+
return Object.keys(out).length > 0 ? out : undefined;
|
|
122
|
+
},
|
|
123
|
+
// JSON is machine-written here, so decode/encode round-trips losslessly.
|
|
124
|
+
redact: (raw, mask) => {
|
|
125
|
+
const headers = jsonObjectHeaders.decode(raw);
|
|
126
|
+
if (!headers)
|
|
127
|
+
return undefined;
|
|
128
|
+
const out = {};
|
|
129
|
+
for (const [name, value] of Object.entries(headers)) {
|
|
130
|
+
const rendered = redactEntry(name, value, mask);
|
|
131
|
+
if (rendered === undefined)
|
|
132
|
+
return undefined;
|
|
133
|
+
out[name] = rendered;
|
|
134
|
+
}
|
|
135
|
+
return jsonObjectHeaders.encode(out);
|
|
136
|
+
},
|
|
137
|
+
};
|
|
138
|
+
/** RFC 7230 token — header names, and the dotted attribute names OTel reuses. No spaces. */
|
|
139
|
+
const TOKEN_RE = /^[A-Za-z0-9!#$%&'*+.^_`|~-]+$/;
|
|
140
|
+
/** Splits `key=value`; `undefined` when the segment isn't a well-formed pair. */
|
|
141
|
+
const splitPair = (segment) => {
|
|
142
|
+
const eq = segment.indexOf('=');
|
|
143
|
+
if (eq < 0)
|
|
144
|
+
return undefined;
|
|
145
|
+
const name = segment.slice(0, eq).trim();
|
|
146
|
+
// A base64 token's `=` padding must not read as a pair — the name has to look
|
|
147
|
+
// like a header name.
|
|
148
|
+
if (!TOKEN_RE.test(name))
|
|
149
|
+
return undefined;
|
|
150
|
+
return { name, value: segment.slice(eq + 1) };
|
|
151
|
+
};
|
|
152
|
+
/**
|
|
153
|
+
* Comma-separated `key=value` pairs — the OpenTelemetry env-var convention
|
|
154
|
+
* (`OTEL_EXPORTER_OTLP_HEADERS`), and the form the first-party Cowork admin
|
|
155
|
+
* console accepts (it rejects a JSON object; see the claude-desktop adapter).
|
|
156
|
+
*/
|
|
157
|
+
export const kvPairsHeaders = {
|
|
158
|
+
id: 'kv-pairs',
|
|
159
|
+
encode: (headers) => Object.entries(headers)
|
|
160
|
+
.map(([k, v]) => `${k}=${v}`)
|
|
161
|
+
.join(','),
|
|
162
|
+
decode: (raw) => {
|
|
163
|
+
const out = {};
|
|
164
|
+
for (const segment of raw.split(',')) {
|
|
165
|
+
const pair = splitPair(segment);
|
|
166
|
+
if (pair)
|
|
167
|
+
out[pair.name] = pair.value.trim();
|
|
168
|
+
}
|
|
169
|
+
return Object.keys(out).length > 0 ? out : undefined;
|
|
170
|
+
},
|
|
171
|
+
/**
|
|
172
|
+
* Rewrites sensitive pairs in place and passes every other segment through
|
|
173
|
+
* byte-for-byte, so a hand-edited value renders as it is on disk.
|
|
174
|
+
*
|
|
175
|
+
* Declines outright when a segment doesn't parse and the value looks like it
|
|
176
|
+
* carries a credential: the split is on `,`, so an unparseable segment can be
|
|
177
|
+
* the tail of a token the split cut in half, and rendering it would print a
|
|
178
|
+
* fragment of the secret.
|
|
179
|
+
*/
|
|
180
|
+
redact: (raw, mask) => {
|
|
181
|
+
let sawPair = false;
|
|
182
|
+
let sawUnparseable = false;
|
|
183
|
+
let declined = false;
|
|
184
|
+
const segments = raw.split(',').map((segment) => {
|
|
185
|
+
const pair = splitPair(segment);
|
|
186
|
+
if (!pair) {
|
|
187
|
+
sawUnparseable = true;
|
|
188
|
+
return segment;
|
|
189
|
+
}
|
|
190
|
+
sawPair = true;
|
|
191
|
+
const value = pair.value.trim();
|
|
192
|
+
const rendered = redactEntry(pair.name, value, mask);
|
|
193
|
+
if (rendered === undefined) {
|
|
194
|
+
declined = true;
|
|
195
|
+
return segment;
|
|
196
|
+
}
|
|
197
|
+
return rendered === value ? segment : `${pair.name}=${rendered}`;
|
|
198
|
+
});
|
|
199
|
+
if (!sawPair || declined)
|
|
200
|
+
return undefined;
|
|
201
|
+
if (sawUnparseable && hasCredentialShape(raw))
|
|
202
|
+
return undefined;
|
|
203
|
+
return segments.join(',');
|
|
204
|
+
},
|
|
205
|
+
};
|
|
206
|
+
/** Every encoding the CLI can emit a header collection in. Order is try-order when redacting. */
|
|
207
|
+
export const HEADER_ENCODINGS = [jsonObjectHeaders, kvPairsHeaders];
|
|
208
|
+
/**
|
|
209
|
+
* Renders `raw` with its credentials masked, using whichever declared encoding
|
|
210
|
+
* claims it. `undefined` means no encoding would render it safely — callers
|
|
211
|
+
* must fail closed, never fall back to the raw value.
|
|
212
|
+
*/
|
|
213
|
+
export const redactHeaderCollection = (raw, mask) => {
|
|
214
|
+
for (const encoding of HEADER_ENCODINGS) {
|
|
215
|
+
const redacted = encoding.redact(raw, mask);
|
|
216
|
+
if (redacted !== undefined)
|
|
217
|
+
return redacted;
|
|
218
|
+
}
|
|
219
|
+
return undefined;
|
|
220
|
+
};
|
|
221
|
+
//# sourceMappingURL=headers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"headers.js","sourceRoot":"","sources":["../../src/core/headers.ts"],"names":[],"mappings":"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"}
|
package/dist/core/markers.js
CHANGED
|
@@ -86,9 +86,14 @@ export const copyHookScripts = async (files, srcDir = packagedHooksDir(), destDi
|
|
|
86
86
|
* a plain invocation is written there and a missing script is a visible,
|
|
87
87
|
* non-blocking error instead.
|
|
88
88
|
*/
|
|
89
|
-
export const buildHookCommand = (scriptPath, version, plat = process.platform) =>
|
|
90
|
-
|
|
91
|
-
|
|
89
|
+
export const buildHookCommand = (scriptPath, version, plat = process.platform, runtimeTool) => {
|
|
90
|
+
// `--tool <name>` selects which config format the shared marker scripts read
|
|
91
|
+
// OTLP settings from at runtime (Codex: config.toml). Omitted → their default.
|
|
92
|
+
const toolArg = runtimeTool ? ` --tool ${runtimeTool}` : '';
|
|
93
|
+
return plat === 'win32'
|
|
94
|
+
? `node "${scriptPath}" ${MANAGED_BY}@${version}${toolArg}`
|
|
95
|
+
: `f="${scriptPath}"; [ -f "$f" ] && exec node "$f" ${MANAGED_BY}@${version}${toolArg}; exit 0`;
|
|
96
|
+
};
|
|
92
97
|
/** The version stamped in a CLI-owned command, or undefined for other shapes.
|
|
93
98
|
* Stops at `;` as well as whitespace — in the POSIX wrapper the stamp is
|
|
94
99
|
* immediately followed by `; exit 0`. */
|
|
@@ -99,12 +104,12 @@ export const parseManagedByVersion = (command) => {
|
|
|
99
104
|
/** First quoted `*.mjs` path in a command — where the entry expects its script. */
|
|
100
105
|
export const scriptPathFromCommand = (command) => /"([^"]+\.mjs)"/.exec(command)?.[1];
|
|
101
106
|
/** Matches the internal installer: PostToolUse, 5s timeout. */
|
|
102
|
-
export const buildHookGroups = (matchers, version, hookDir = installedHooksDir(), plat = process.platform) => matchers.map((m) => ({
|
|
107
|
+
export const buildHookGroups = (matchers, version, hookDir = installedHooksDir(), plat = process.platform, runtimeTool) => matchers.map((m) => ({
|
|
103
108
|
matcher: m.matcher,
|
|
104
109
|
hooks: [
|
|
105
110
|
{
|
|
106
111
|
type: 'command',
|
|
107
|
-
command: buildHookCommand(join(hookDir, m.hook), version, plat),
|
|
112
|
+
command: buildHookCommand(join(hookDir, m.hook), version, plat, runtimeTool),
|
|
108
113
|
timeout: 5,
|
|
109
114
|
},
|
|
110
115
|
],
|
|
@@ -206,6 +211,34 @@ export const planMarkers = (doc, groups) => {
|
|
|
206
211
|
const added = groups.filter((a) => !before.some((b) => sameGroup(b, a)));
|
|
207
212
|
return { next, removed, added, unchanged, changed: removed.length > 0 || added.length > 0 };
|
|
208
213
|
};
|
|
214
|
+
/**
|
|
215
|
+
* Prepare a marker write against a standalone hooks file (Codex's `hooks.json`),
|
|
216
|
+
* separate from the adapter's OTel-config file. Reads the file (empty doc when
|
|
217
|
+
* absent), splices our groups via `planMarkers`, and returns a `SettingsUpdate`
|
|
218
|
+
* whose `next` is the planned document — the env diff is empty because a hooks
|
|
219
|
+
* file carries no env, so the caller gates the write on `plan.changed`. Written
|
|
220
|
+
* through the same `applyUpdate` atomic path as every other surface.
|
|
221
|
+
*/
|
|
222
|
+
export const prepareMarkersFile = async (path, codec, groups, mode = 0o600) => {
|
|
223
|
+
let body;
|
|
224
|
+
try {
|
|
225
|
+
body = await fs.readFile(path, 'utf8');
|
|
226
|
+
}
|
|
227
|
+
catch {
|
|
228
|
+
body = null;
|
|
229
|
+
}
|
|
230
|
+
const doc = body === null ? codec.empty() : codec.parse(body, path);
|
|
231
|
+
const plan = planMarkers(doc, groups);
|
|
232
|
+
const update = {
|
|
233
|
+
path,
|
|
234
|
+
exists: body !== null,
|
|
235
|
+
codec,
|
|
236
|
+
next: plan.next,
|
|
237
|
+
diff: { added: [], changed: [], removed: [], unchanged: 0 },
|
|
238
|
+
mode,
|
|
239
|
+
};
|
|
240
|
+
return { update, plan };
|
|
241
|
+
};
|
|
209
242
|
const shortCommand = (command) => {
|
|
210
243
|
const script = scriptPathFromCommand(command);
|
|
211
244
|
const version = parseManagedByVersion(command);
|
package/dist/core/markers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"markers.js","sourceRoot":"","sources":["../../src/core/markers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"markers.js","sourceRoot":"","sources":["../../src/core/markers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAMxC;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,CAAC,MAAM,UAAU,GAAG,4BAA4B,CAAA;AAEtD;;;;;;GAMG;AACH,MAAM,iBAAiB,GAAG,CAAC,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,CAAU,CAAA;AACtF,MAAM,sBAAsB,GAAG;IAC7B,6EAA6E;IAC7E,mBAAmB;IACnB,+BAA+B;IAC/B,uEAAuE;IACvE,gBAAgB;CACR,CAAA;AAIV,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,OAAe,EAAoB,EAAE;IACpE,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAAE,OAAO,KAAK,CAAA;IACpE,IAAI,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAAE,OAAO,UAAU,CAAA;IAC9E,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAkBD,MAAM,aAAa,GAAG,CAAC,CAAU,EAAgC,EAAE,CACjE,CAAC,KAAK,IAAI,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;AAE1D,qFAAqF;AACrF,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAW,EAAE,CAC3C,aAAa,CAAC,IAAI,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;AAEzD,qEAAqE;AACrE,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAW,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA;AAEpF,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EAAE,GAAG,GAAG,gBAAgB,EAAE,EAA2B,EAAE;IAC9F,MAAM,GAAG,GAAY,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;IACtF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;IACrF,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,CAAU,EAAE,EAAE;QAC5B,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACrF,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAA;QACxF,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAA;IAC7C,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,wFAAwF;AACxF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,QAAiC,EAAY,EAAE,CAAC;IAC9E,iBAAiB;IACjB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;CAC/B,CAAA;AAED;;;;;GAKG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,KAAwB,EACxB,MAAM,GAAG,gBAAgB,EAAE,EAC3B,OAAO,GAAG,iBAAiB,EAAE,EACZ,EAAE;IACnB,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IAC5C,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAA;QAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;QACrD,MAAM,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;QAC9C,MAAM,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAA;IACxC,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,UAAkB,EAClB,OAAe,EACf,OAAwB,OAAO,CAAC,QAAQ,EACxC,WAAoB,EACZ,EAAE;IACV,6EAA6E;IAC7E,+EAA+E;IAC/E,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IAC3D,OAAO,IAAI,KAAK,OAAO;QACrB,CAAC,CAAC,SAAS,UAAU,KAAK,UAAU,IAAI,OAAO,GAAG,OAAO,EAAE;QAC3D,CAAC,CAAC,MAAM,UAAU,oCAAoC,UAAU,IAAI,OAAO,GAAG,OAAO,UAAU,CAAA;AACnG,CAAC,CAAA;AAED;;0CAE0C;AAC1C,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,OAAe,EAAsB,EAAE;IAC3E,MAAM,EAAE,GAAG,IAAI,MAAM,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,uBAAuB,EAAE,MAAM,CAAC,aAAa,CAAC,CAAA;IAC1F,OAAO,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AAC9B,CAAC,CAAA;AAED,mFAAmF;AACnF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,OAAe,EAAsB,EAAE,CAC3E,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AAErC,+DAA+D;AAC/D,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,QAAiC,EACjC,OAAe,EACf,OAAO,GAAG,iBAAiB,EAAE,EAC7B,OAAwB,OAAO,CAAC,QAAQ,EACxC,WAAoB,EACP,EAAE,CACf,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACnB,OAAO,EAAE,CAAC,CAAC,OAAO;IAClB,KAAK,EAAE;QACL;YACE,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,CAAC;YAC5E,OAAO,EAAE,CAAC;SACX;KACF;CACF,CAAC,CAAC,CAAA;AAQL,MAAM,cAAc,GAAG,CAAC,KAAc,EAAoB,EAAE;IAC1D,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;IACrE,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC5B,IAAI,aAAa,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACtD,MAAM,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;YACrC,IAAI,CAAC,KAAK,IAAI;gBAAE,OAAO,CAAC,CAAA;QAC1B,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,KAA8B,EAAE,SAAoB,EAAc,EAAE;IAC1F,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAA;IAC3D,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,CAE7E,CAAA;IACb,OAAO;QACL,OAAO,EAAE,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc;QAC3E,OAAO,EAAE,KAAK,EAAE,OAAO,IAAI,EAAE;QAC7B,SAAS;KACV,CAAA;AACH,CAAC,CAAA;AAED,gFAAgF;AAChF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,GAAY,EAAgB,EAAE;IAC7D,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9F,OAAO,EAAE,CAAA;IACX,CAAC;IACD,MAAM,GAAG,GAAiB,EAAE,CAAA;IAC5B,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QACtC,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;QAC3B,IAAI,CAAC,KAAK,IAAI,IAAI,aAAa,CAAC,CAAC,CAAC;YAAE,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IACpE,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,wEAAwE;AACxE,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,IAAY,EAAgC,EAAE;IAClF,IAAI,IAAY,CAAA;IAChB,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;IACD,IAAI,CAAC;QACH,OAAO,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;IAC3C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC,CAAA;AAcD,MAAM,SAAS,GAAG,CAAC,MAAkB,EAAE,KAAgB,EAAW,EAAE,CAClE,MAAM,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,EAAE,CAAC,CAAA;AAExF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAY,EAAE,MAA4B,EAAe,EAAE;IACrF,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;IAC9F,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAA;IAC1B,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,2DAA2D,CAAC,CAAA;IAC9E,CAAC;IACD,MAAM,KAAK,GAA4B,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;IACtE,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAA;IACjC,IAAI,OAAO,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAA;IACzF,CAAC;IACD,MAAM,IAAI,GAAc,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IAEnD,MAAM,MAAM,GAAiB,EAAE,CAAA;IAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QAC7B,MAAM,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAA;QAC3B,IAAI,CAAC,KAAK,IAAI,IAAI,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;YACjC,OAAO,KAAK,CAAA;QACd,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC,CAAC,CAAA;IACF,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC,CAAA;IAErC,MAAM,IAAI,GAA4B,EAAE,GAAG,GAAG,EAAE,CAAA;IAChD,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,IAAI,CAAC,KAAK,GAAG,EAAE,GAAG,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAA;IAClD,CAAC;SAAM,CAAC;QACN,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAA;QAChD,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC;YAAE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;;YAC9C,OAAO,IAAI,CAAC,KAAK,CAAA;IACxB,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;IAClF,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;IAC1E,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;IACxE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAA;AAC7F,CAAC,CAAA;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,IAAY,EACZ,KAAoB,EACpB,MAA4B,EAC5B,IAAI,GAAG,KAAK,EAC4C,EAAE;IAC1D,IAAI,IAAmB,CAAA;IACvB,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,GAAG,IAAI,CAAA;IACb,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IACnE,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IACrC,MAAM,MAAM,GAAmB;QAC7B,IAAI;QACJ,MAAM,EAAE,IAAI,KAAK,IAAI;QACrB,KAAK;QACL,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE;QAC3D,IAAI;KACL,CAAA;IACD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;AACzB,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CAAC,OAAe,EAAU,EAAE;IAC/C,MAAM,MAAM,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAA;IAC7C,MAAM,OAAO,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAA;IAC9C,IAAI,MAAM;QAAE,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,mBAAmB,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;IACvF,OAAO,OAAO,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAA;AACrE,CAAC,CAAA;AAED,gFAAgF;AAChF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,IAAiB,EAAY,EAAE;IACjE,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QAC3B,MAAM,GAAG,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,EAAE,CAAA;QACrC,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,OAAO,OAAO,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACxE,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,CAAC,CAAC,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,EAAE,CAAA;QACvE,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,OAAO,OAAO,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,KAAK,EAAE,CAAC,CAAA;IACtF,CAAC;IACD,IAAI,IAAI,CAAC,SAAS,GAAG,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,SAAS,yBAAyB,CAAC,CAAA;IACjF,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED;;+EAE+E;AAC/E,MAAM,CAAC,MAAM,cAAc,GAAG,GAAsC,EAAE,CAAC;IACrE,EAAE,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,6BAA6B,CAAC,EAAE;IACjF,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,kCAAkC,CAAC,EAAE;IACpF,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,yBAAyB,CAAC,EAAE;CACnE,CAAA;AAQD;gEACgE;AAChE,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,MAA6D,EACtC,EAAE;IACzB,MAAM,GAAG,GAAiB,EAAE,CAAA;IAC5B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM;YAAE,SAAQ;QACnC,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAChD,IAAI,MAAM,KAAK,IAAI;YAAE,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;IAChF,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,KAA4B,EAC5B,cAAsB,EACtB,QAAiC,EACf,EAAE;IACpB,MAAM,MAAM,GAAY,EAAE,CAAA;IAC1B,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,KAAK,CAAC,CAAC,CAAA;IAC/E,MAAM,QAAQ,GAAG,KAAK;SACnB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,UAAU,CAAC,CAAC;SAC/D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IAErB,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9C,MAAM,CAAC,IAAI,CAAC;YACV,KAAK,EAAE,MAAM;YACb,OAAO,EACL,kGAAkG;SACrG,CAAC,CAAA;QACF,OAAO,MAAM,CAAA;IACf,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC;YACV,KAAK,EAAE,MAAM;YACb,OAAO,EACL,8EAA8E,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM;gBACvG,iFAAiF;gBACjF,kFAAkF;SACrF,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QAChD,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,cAAc,EAAE,CAAC;YACxD,MAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,MAAM;gBACb,OAAO,EACL,gBAAgB,CAAC,CAAC,OAAO,kCAAkC,OAAO,qBAAqB,cAAc,IAAI;oBACzG,qGAAqG;aACxG,CAAC,CAAA;QACJ,CAAC;QACD,MAAM,MAAM,GAAG,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;QAC/C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YACzB,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,OAAO;oBACd,OAAO,EAAE,kCAAkC,MAAM,yDAAyD;iBAC3G,CAAC,CAAA;YACJ,CAAC;YACD,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;YAC9D,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;gBAC/C,MAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,MAAM;oBACb,OAAO,EACL,mBAAmB,QAAQ,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,OAAO,2BAA2B,QAAQ,CAAC,OAAO,MAAM;wBAC/G,wEAAwE;iBAC3E,CAAC,CAAA;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnB,MAAM,QAAQ,GAAa,EAAE,CAAA;QAC7B,KAAK,MAAM,EAAE,IAAI,cAAc,EAAE,EAAE,CAAC;YAClC,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;gBACnC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,mBAAmB,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;YACzE,CAAC;YAAC,MAAM,CAAC;gBACP,iDAAiD;YACnD,CAAC;QACH,CAAC;QACD,MAAM,CAAC,IAAI,CAAC;YACV,KAAK,EAAE,MAAM;YACb,OAAO,EACL,QAAQ,CAAC,MAAM,GAAG,CAAC;gBACjB,CAAC,CAAC,0BAA0B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;gBAClD,CAAC,CAAC,0FAA0F;oBAC1F,+FAA+F;SACtG,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC,CAAA"}
|
package/dist/core/prompts.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { checkbox, confirm, input, password, select } from '@inquirer/prompts';
|
|
2
2
|
import { maskSecret } from './format.js';
|
|
3
3
|
const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
4
|
+
// Deliberately loose: enough to catch a fat-fingered non-address, not to police
|
|
5
|
+
// valid RFC 5322 forms. The value is attribution metadata, not an auth boundary.
|
|
6
|
+
const EMAIL_RE = /^[^@\s]+@[^@\s]+\.[^@\s]+$/;
|
|
4
7
|
export const promptScope = async (localPath, globalPath, localWarning) => select({
|
|
5
8
|
message: 'Where should the configuration be written?',
|
|
6
9
|
default: localWarning ? 'global' : 'local',
|
|
@@ -24,6 +27,18 @@ export const promptUcid = async (defaultUcid) => {
|
|
|
24
27
|
const trimmed = value.trim();
|
|
25
28
|
return trimmed === '' ? undefined : trimmed;
|
|
26
29
|
};
|
|
30
|
+
export const promptUserEmail = async (defaultEmail) => {
|
|
31
|
+
const value = await input({
|
|
32
|
+
message: 'Your email for activity attribution (optional — press enter to skip):',
|
|
33
|
+
default: defaultEmail,
|
|
34
|
+
validate: (v) => {
|
|
35
|
+
const t = v.trim();
|
|
36
|
+
return t === '' || EMAIL_RE.test(t) || 'must be an email address, or empty to skip';
|
|
37
|
+
},
|
|
38
|
+
});
|
|
39
|
+
const trimmed = value.trim();
|
|
40
|
+
return trimmed === '' ? undefined : trimmed;
|
|
41
|
+
};
|
|
27
42
|
export const promptCollectorUrl = async (defaultUrl) => {
|
|
28
43
|
const value = await input({
|
|
29
44
|
message: 'Collector URL:',
|
|
@@ -63,7 +78,7 @@ export const promptApiKey = async (existing) => {
|
|
|
63
78
|
};
|
|
64
79
|
export const promptOptIns = async (existing) => {
|
|
65
80
|
const selected = await checkbox({
|
|
66
|
-
message: "Sensitive-data telemetry (space toggles, 'a' selects all):",
|
|
81
|
+
message: "Sensitive-data telemetry — enabling any of these sends that content off this machine to your collector (space toggles, 'a' selects all):",
|
|
67
82
|
choices: [
|
|
68
83
|
{
|
|
69
84
|
name: 'User prompts (logs full prompt content)',
|
package/dist/core/prompts.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../src/core/prompts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE9E,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAIxC,MAAM,OAAO,GAAG,iEAAiE,CAAA;
|
|
1
|
+
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../src/core/prompts.ts"],"names":[],"mappings":"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"}
|
package/dist/core/wizard.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { select } from '@inquirer/prompts';
|
|
2
|
+
import { randomUUID } from 'node:crypto';
|
|
2
3
|
import { resolve } from 'node:path';
|
|
3
4
|
import { ValidateError, WizardAbort } from './errors.js';
|
|
4
5
|
import { color, renderDiff } from './format.js';
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
6
|
+
import { detectGitEmail } from './git.js';
|
|
7
|
+
import { buildHookGroups, copyHookScripts, describeMarkersPlan, hookScriptFiles, planMarkers, prepareMarkersFile, readOwnedGroups, readPackagedMatchers, scanForMarkers, } from './markers.js';
|
|
8
|
+
import { promptApiKey, promptCollectorUrl, promptConfirmWrite, promptMarkers, promptOptIns, promptScope, promptUcid, promptUserEmail, } from './prompts.js';
|
|
7
9
|
import { applyUpdate, prepareUpdate, readExistingEnv } from './settings.js';
|
|
8
10
|
import { ensureTty } from './tty.js';
|
|
9
11
|
import { validateCollector } from './validate.js';
|
|
@@ -97,12 +99,38 @@ export const runWizard = async (adapter) => {
|
|
|
97
99
|
// because the pre-fill read below is keyed on the chosen path.
|
|
98
100
|
const initialKey = await promptApiKey(existing.apiKey);
|
|
99
101
|
const initialUrl = await promptCollectorUrl(existing.collectorUrl ?? DEFAULT_COLLECTOR_URL);
|
|
100
|
-
|
|
101
|
-
if (!ucid) {
|
|
102
|
+
let ucid = await promptUcid(existing.ucid);
|
|
103
|
+
if (!ucid && adapter.autoUcid) {
|
|
104
|
+
// This tool's telemetry is invisible without a UCID (empty UCID → dropped
|
|
105
|
+
// from the Use Cases view), so mint one rather than orphan the runs. It
|
|
106
|
+
// persists in the config, so a re-run pre-fills and keeps this same id
|
|
107
|
+
// (MAI-1382).
|
|
108
|
+
ucid = randomUUID();
|
|
109
|
+
console.log();
|
|
110
|
+
console.log(color.yellow(`No use case ID set — generated ${ucid}.\n` +
|
|
111
|
+
"It'll appear under Unassigned Agent Activity on the Use Cases page,\n" +
|
|
112
|
+
'where you can assign it to a use case.'));
|
|
113
|
+
}
|
|
114
|
+
else if (!ucid) {
|
|
102
115
|
console.log();
|
|
103
116
|
console.log(color.yellow('No use case ID set — events still reach the collector but land in the\n' +
|
|
104
117
|
'unmapped bucket until you assign a UCID (re-run setup to add one).'));
|
|
105
118
|
}
|
|
119
|
+
// Identity for tools whose telemetry omits it (Codex stamps user.email on only
|
|
120
|
+
// ~half its records and its spans carry none). Resolve the developer's email —
|
|
121
|
+
// git config as the editable default — so the collector can attribute activity
|
|
122
|
+
// via the X-Mainwave-User-Email header. Tools that emit user.email natively
|
|
123
|
+
// (Claude Code) leave injectsIdentity unset and are never prompted (MAI-1394).
|
|
124
|
+
let userEmail;
|
|
125
|
+
if (adapter.injectsIdentity) {
|
|
126
|
+
userEmail = await promptUserEmail(existing.userEmail ?? detectGitEmail());
|
|
127
|
+
if (!userEmail) {
|
|
128
|
+
console.log();
|
|
129
|
+
console.log(color.yellow(`No email set — ${adapter.displayName} activity that arrives without a native\n` +
|
|
130
|
+
'user.email stays unattributed on the People and per-user cost views\n' +
|
|
131
|
+
'(re-run setup to add one).'));
|
|
132
|
+
}
|
|
133
|
+
}
|
|
106
134
|
const optIns = await promptOptIns(existing.optIns);
|
|
107
135
|
if (optIns.userPrompts) {
|
|
108
136
|
console.log();
|
|
@@ -115,7 +143,11 @@ export const runWizard = async (adapter) => {
|
|
|
115
143
|
// on-disk state, read from the file the wizard is about to write.
|
|
116
144
|
let markersOn = null;
|
|
117
145
|
if (adapter.markers) {
|
|
118
|
-
|
|
146
|
+
// Read the re-run default from wherever the hooks actually live — the sibling
|
|
147
|
+
// hooks.json for Codex, the primary settings file otherwise.
|
|
148
|
+
const hf = adapter.markers.hooksFile;
|
|
149
|
+
const markersReadPath = hf ? (scope === 'local' ? (hf.localPath ?? hf.path) : hf.path) : path;
|
|
150
|
+
const current = await readOwnedGroups(markersReadPath);
|
|
119
151
|
const configured = (current ?? []).some((g) => g.ownership === 'cli');
|
|
120
152
|
markersOn = await promptMarkers(adapter.markers.disclosure, configured || undefined);
|
|
121
153
|
}
|
|
@@ -126,23 +158,42 @@ export const runWizard = async (adapter) => {
|
|
|
126
158
|
}
|
|
127
159
|
console.log();
|
|
128
160
|
const { url: collectorUrl, key: apiKey } = await validateWithRetry(initialUrl, initialKey);
|
|
129
|
-
const buildInput = { ucid, collectorUrl, apiKey, optIns };
|
|
161
|
+
const buildInput = { ucid, collectorUrl, apiKey, optIns, userEmail };
|
|
130
162
|
const primaryUpdate = await prepareUpdate({
|
|
131
163
|
path,
|
|
132
164
|
newEnv: adapter.buildEnv(buildInput),
|
|
133
165
|
managedKeys: adapter.managedEnvKeys,
|
|
134
166
|
codec: adapter.codec,
|
|
135
167
|
});
|
|
136
|
-
//
|
|
137
|
-
//
|
|
138
|
-
//
|
|
168
|
+
// Marker hook groups: remove everything we own (any prior shape), then append
|
|
169
|
+
// fresh groups from the packaged matchers — or nothing, when opted out. Claude
|
|
170
|
+
// Code co-locates hooks in its settings file (splice into the primary write);
|
|
171
|
+
// Codex loads them from a sibling hooks.json, which gets its own write.
|
|
172
|
+
// `markersCarrier` is whichever update's document holds them, so change
|
|
173
|
+
// detection and the diff render key off the right one.
|
|
139
174
|
let markersPlan = null;
|
|
140
175
|
let hookFiles = [];
|
|
176
|
+
let separateMarkersUpdate = null;
|
|
177
|
+
let markersCarrier = null;
|
|
141
178
|
if (markersOn !== null) {
|
|
142
179
|
const matchers = await readPackagedMatchers();
|
|
143
180
|
hookFiles = hookScriptFiles(matchers);
|
|
144
|
-
|
|
145
|
-
|
|
181
|
+
const groups = markersOn
|
|
182
|
+
? buildHookGroups(matchers, VERSION, undefined, undefined, adapter.markers?.runtimeTool)
|
|
183
|
+
: [];
|
|
184
|
+
const hooksFile = adapter.markers?.hooksFile;
|
|
185
|
+
if (hooksFile) {
|
|
186
|
+
const hooksPath = scope === 'local' ? (hooksFile.localPath ?? hooksFile.path) : hooksFile.path;
|
|
187
|
+
const prepared = await prepareMarkersFile(hooksPath, hooksFile.codec, groups);
|
|
188
|
+
markersPlan = prepared.plan;
|
|
189
|
+
separateMarkersUpdate = prepared.update;
|
|
190
|
+
markersCarrier = prepared.update;
|
|
191
|
+
}
|
|
192
|
+
else {
|
|
193
|
+
markersPlan = planMarkers(primaryUpdate.next, groups);
|
|
194
|
+
primaryUpdate.next = markersPlan.next;
|
|
195
|
+
markersCarrier = primaryUpdate;
|
|
196
|
+
}
|
|
146
197
|
}
|
|
147
198
|
const additionalUpdates = await Promise.all(additionalWritePaths.map(({ aw, path: awPath }) => prepareUpdate({
|
|
148
199
|
path: awPath,
|
|
@@ -153,13 +204,16 @@ export const runWizard = async (adapter) => {
|
|
|
153
204
|
})));
|
|
154
205
|
const labeledUpdates = [
|
|
155
206
|
{ label: path, update: primaryUpdate },
|
|
207
|
+
...(separateMarkersUpdate
|
|
208
|
+
? [{ label: separateMarkersUpdate.path, update: separateMarkersUpdate }]
|
|
209
|
+
: []),
|
|
156
210
|
...additionalUpdates.map((update, i) => ({
|
|
157
211
|
label: `${additionalWritePaths[i].aw.label} (${update.path})`,
|
|
158
212
|
update,
|
|
159
213
|
})),
|
|
160
214
|
];
|
|
161
215
|
const markersChanged = markersPlan?.changed ?? false;
|
|
162
|
-
const changedUpdates = labeledUpdates.filter(({ update }) => hasAnyChange(update.diff) || (update ===
|
|
216
|
+
const changedUpdates = labeledUpdates.filter(({ update }) => hasAnyChange(update.diff) || (update === markersCarrier && markersChanged));
|
|
163
217
|
if (changedUpdates.length === 0) {
|
|
164
218
|
console.log();
|
|
165
219
|
console.log(color.dim(`No changes needed in ${path}.`));
|
|
@@ -179,7 +233,7 @@ export const runWizard = async (adapter) => {
|
|
|
179
233
|
const body = renderDiff(update.diff);
|
|
180
234
|
if (body)
|
|
181
235
|
console.log(body);
|
|
182
|
-
if (update ===
|
|
236
|
+
if (update === markersCarrier && markersPlan && markersChanged) {
|
|
183
237
|
for (const line of describeMarkersPlan(markersPlan)) {
|
|
184
238
|
const painted = line.startsWith('+')
|
|
185
239
|
? color.green(line)
|