@wuyanbin/ai-code-review-cli-remote 1.5.0 → 1.6.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/README.md +14 -6
- package/dist/core/agent-runtime.d.ts +1 -1
- package/dist/core/agent-runtime.d.ts.map +1 -1
- package/dist/core/agent-runtime.js +7 -2
- package/dist/core/agent-runtime.js.map +1 -1
- package/dist/core/model.d.ts.map +1 -1
- package/dist/core/model.js +3 -0
- package/dist/core/model.js.map +1 -1
- package/dist/gitlab/api.d.ts +19 -6
- package/dist/gitlab/api.d.ts.map +1 -1
- package/dist/gitlab/api.js +139 -63
- package/dist/gitlab/api.js.map +1 -1
- package/dist/platform/config.d.ts +4 -1
- package/dist/platform/config.d.ts.map +1 -1
- package/dist/platform/config.js +22 -5
- package/dist/platform/config.js.map +1 -1
- package/dist/platform/findings.d.ts.map +1 -1
- package/dist/platform/findings.js +3 -1
- package/dist/platform/findings.js.map +1 -1
- package/dist/platform/report.d.ts +5 -0
- package/dist/platform/report.d.ts.map +1 -1
- package/dist/platform/report.js +2 -0
- package/dist/platform/report.js.map +1 -1
- package/dist/runner.d.ts.map +1 -1
- package/dist/runner.js +5 -11
- package/dist/runner.js.map +1 -1
- package/dist/shared/ci-auth.d.ts +14 -0
- package/dist/shared/ci-auth.d.ts.map +1 -0
- package/dist/shared/ci-auth.js +37 -0
- package/dist/shared/ci-auth.js.map +1 -0
- package/dist/types.d.ts +0 -3
- package/dist/types.d.ts.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -1,23 +1,27 @@
|
|
|
1
1
|
# @wuyanbin/ai-code-review-cli-remote
|
|
2
2
|
|
|
3
3
|
Mico Devhub 的 AI Code Review 远程客户端。由 GitLab CI 的 `ai_code_review` job 调用（模板见仓库 `ci-templates/remote.yml`），
|
|
4
|
-
在 Runner
|
|
4
|
+
在 Runner 本地完成模型调用，平台负责配置下发、模型网关、MR 评论代理与结果持久化。
|
|
5
|
+
|
|
6
|
+
1.6.0 起 runner 上不再有任何 GitLab 令牌：MR 的读写全部经平台代理 `/api/modules/code-review/ci/gitlab/*`，由平台以
|
|
7
|
+
DevHub Bot 身份执行；每个平台请求都携带 GitLab 注入的 `CI_JOB_TOKEN`，平台向 GitLab 确认 job 正在运行且属于该项目后才处理。
|
|
8
|
+
低于 1.6.0 的版本会在拉配置时被平台拒绝，不会调用模型。
|
|
5
9
|
|
|
6
10
|
## 一次运行做什么
|
|
7
11
|
|
|
8
12
|
```
|
|
9
13
|
stdin: git diff <merge-base>..HEAD
|
|
10
14
|
│
|
|
11
|
-
├─ 1. 拉配置 GET /api/modules/code-review/ci/config
|
|
12
|
-
├─ 2. 预检
|
|
15
|
+
├─ 1. 拉配置 GET /api/modules/code-review/ci/config 模型、规则（不再下发 GitLab 令牌）
|
|
16
|
+
├─ 2. 预检 经平台代理读 MR：Draft / 已合并 / 陈旧流水线 直接退出，不花模型成本
|
|
13
17
|
├─ 3. 已知 findings GET /api/modules/code-review/ci/findings?mrIid=&headSha=&diffHash=&cliVersion=
|
|
14
18
|
│ OPEN / WONT_FIX / SUPPRESSED + lastReviewedSha；首轮无记录时平台按同 head 找来源 MR（跨 MR 继承，见下）
|
|
15
19
|
├─ 4. 主评审 分片 + 注解 diff + 符号级上下文；首轮 baseline 两趟取并集，增量运行一趟；同代码整体复用零趟，部分继承只审差集
|
|
16
20
|
├─ 5. 对账 保活 / 收口 / 人工 dismiss / 增量准入；已知 OPEN 交复核 agent，新报交语义判重
|
|
17
21
|
├─ 6. 取证验证 只对本次新建的 P0：带只读工具的 agent 读仓库核实，CONFIRMED 才发布
|
|
18
|
-
├─ 7. 发布
|
|
22
|
+
├─ 7. 发布 经平台代理写 MR：行内评论 = 经验证的 P0；P1 / P2 只在摘要汇总（封顶 10 条）；摘要布局见下
|
|
19
23
|
├─ 8. 回写 PUT /api/modules/code-review/ci/findings 全量 finding 状态（含验证结论、resolve 时间）
|
|
20
|
-
└─ 9. 上报 POST /api/modules/code-review/ci/runs 状态、用量、verdict、分项计数、Top
|
|
24
|
+
└─ 9. 上报 POST /api/modules/code-review/ci/runs 状态、用量、verdict、分项计数、Top 问题、评论发布结果
|
|
21
25
|
```
|
|
22
26
|
|
|
23
27
|
### 发布策略（1.4.0 起）
|
|
@@ -76,12 +80,16 @@ sha1（丢 `index` 行）与 merge-base；新 MR 首轮且无记录时，平台
|
|
|
76
80
|
| `AICR_CLI_VERSION` | CI 模板变量，默认 `latest` | 锁版本即回滚手段；无 per-feature 行为开关 |
|
|
77
81
|
| `CI_MERGE_REQUEST_IID` / `CI_COMMIT_SHA` / `CI_MERGE_REQUEST_SOURCE_BRANCH_SHA` | GitLab CI | MR 定位与 head 校验 |
|
|
78
82
|
| `CI_MERGE_REQUEST_DIFF_BASE_SHA` / `CI_MERGE_REQUEST_TARGET_BRANCH_NAME` | GitLab CI | 仓库 `.cursor/rules` 从 merge-base 的 git 树读取；取不到就跳过，不读工作树 |
|
|
79
|
-
| `CI_JOB_ID` | GitLab CI | run id；缺失时生成 uuid |
|
|
83
|
+
| `CI_JOB_ID` | GitLab CI | run id；缺失时生成 uuid（平台网关以校验后的 job id 计 run 预算） |
|
|
84
|
+
| `CI_JOB_TOKEN` | GitLab CI（自动注入） | 以 `x-aicr-job-token` 头随每个平台请求发送；模型请求只在 endpoint 指向平台网关时附带，直连模型厂商时不附带 |
|
|
80
85
|
| `AICR_INCREMENTAL_CONTEXT` / `AICR_MAX_PAGINATION_PAGES` | 可选 | 增量上下文半径 / GitLab 翻页上限 |
|
|
81
86
|
|
|
82
87
|
每次模型调用带 `x-aicr-purpose`（`review` / `summary` / `revalidate` / `semantic` / `verify`）与 `x-aicr-run-id`，
|
|
83
88
|
平台网关据此在 `ai_call_log` 归因并做按 run 的硬限。
|
|
84
89
|
|
|
90
|
+
评论发布结果 `commentPublish` 随运行上报：写操作全部成功为 `published`，全部失败为 `skipped`，其余为 `partial`，
|
|
91
|
+
失败时附带平台代理的错误码（如 `BOT_UNAVAILABLE`、`BOT_FORBIDDEN`）。平台据此在飞书卡片里提示「评论未发布到 MR」。
|
|
92
|
+
|
|
85
93
|
## 模型调用的请求形态
|
|
86
94
|
|
|
87
95
|
- 主评审、复核、判重、摘要：`core/model.ts` 的适配器，非流式，system 稳定块打 prompt cache 断点。
|
|
@@ -10,7 +10,7 @@ import { type ParsedUsage } from "./model";
|
|
|
10
10
|
* - baseURL = 平台下发的 endpoint 去掉 `/v1/messages`，SDK 自己拼路径；
|
|
11
11
|
* - 项目 token 作 `x-api-key`；`x-aicr-purpose` / `x-aicr-run-id` 供网关归因与按 run 限额；
|
|
12
12
|
* - 网关不转发 `anthropic-beta`，本期不依赖任何 beta 请求字段或头；
|
|
13
|
-
* - 不传 `thinking`（各代模型默认即可），`effort` 显式
|
|
13
|
+
* - 不传 `thinking`（各代模型默认即可），`effort` 显式 high（复核要取证判断，优先准确度），避免模型切换时随默认值漂移。
|
|
14
14
|
* 结论只能经「收口工具」（strict schema）提交：模型调用它即视为提交并结束，不再发起下一轮。
|
|
15
15
|
*/
|
|
16
16
|
export type AgentStopReason = "submitted" | "max_turns" | "deadline" | "budget_exceeded" | "error";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-runtime.d.ts","sourceRoot":"","sources":["../../src/core/agent-runtime.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"agent-runtime.d.ts","sourceRoot":"","sources":["../../src/core/agent-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,7 @@ const ToolError_1 = require("@anthropic-ai/sdk/lib/tools/ToolError");
|
|
|
12
12
|
const identity_1 = require("../shared/identity");
|
|
13
13
|
const run_budget_1 = require("../shared/run-budget");
|
|
14
14
|
const model_1 = require("./model");
|
|
15
|
+
const ci_auth_1 = require("../shared/ci-auth");
|
|
15
16
|
/** 让各工具以各自的 zod schema 定义，又能放进同一个数组 */
|
|
16
17
|
function defineAgentTool(tool) {
|
|
17
18
|
return tool;
|
|
@@ -19,7 +20,7 @@ function defineAgentTool(tool) {
|
|
|
19
20
|
const DEFAULT_MAX_TOKENS = 8000;
|
|
20
21
|
const DEFAULT_TIMEOUT_MS = 120000;
|
|
21
22
|
const DEFAULT_MAX_RETRIES = 1;
|
|
22
|
-
const EFFORT = "
|
|
23
|
+
const EFFORT = "high";
|
|
23
24
|
const NUDGE_MESSAGE = "你尚未提交结论。请在完成必要的取证后调用 submit_verdict 工具提交结论；这是结束本次验证的唯一方式。";
|
|
24
25
|
/** endpoint 去掉 `/v1/messages` 后缀（与尾部斜杠），得到 SDK 的 baseURL */
|
|
25
26
|
function toBaseUrl(endpoint) {
|
|
@@ -94,7 +95,11 @@ class ToolRunnerRuntime {
|
|
|
94
95
|
this.client = new sdk_1.default({
|
|
95
96
|
apiKey: options.apiKey,
|
|
96
97
|
baseURL: toBaseUrl(options.endpoint),
|
|
97
|
-
defaultHeaders: {
|
|
98
|
+
defaultHeaders: {
|
|
99
|
+
"x-aicr-run-id": options.runId ?? (0, identity_1.resolveRunId)(),
|
|
100
|
+
// job 令牌只发给平台网关，直连模型厂商时不附带
|
|
101
|
+
...(0, ci_auth_1.gatewayJobHeaders)(options.endpoint),
|
|
102
|
+
},
|
|
98
103
|
maxRetries: options.maxRetries ?? DEFAULT_MAX_RETRIES,
|
|
99
104
|
timeout: options.timeoutMs ?? DEFAULT_TIMEOUT_MS,
|
|
100
105
|
...(options.fetch ? { fetch: options.fetch } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent-runtime.js","sourceRoot":"","sources":["../../src/core/agent-runtime.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"agent-runtime.js","sourceRoot":"","sources":["../../src/core/agent-runtime.ts"],"names":[],"mappings":"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"}
|
package/dist/core/model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/core/model.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/core/model.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAGjD,MAAM,WAAW,gBAAgB;IAC/B,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CACF,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,0CAA0C;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,WAAW;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAeD,wBAAgB,eAAe,IAAI,IAAI,CAEtC;AAED,wBAAgB,oBAAoB,IAAI;IACtC,KAAK,EAAE,gBAAgB,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CAC7C,CAYA;AAED,iDAAiD;AACjD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,IAAI,CAQrE;AA4QD,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,gBAAgB,GAC3B,YAAY,CAOd"}
|
package/dist/core/model.js
CHANGED
|
@@ -8,6 +8,7 @@ const constants_1 = require("../constants");
|
|
|
8
8
|
const http_1 = require("../shared/http");
|
|
9
9
|
const identity_1 = require("../shared/identity");
|
|
10
10
|
const run_budget_1 = require("../shared/run-budget");
|
|
11
|
+
const ci_auth_1 = require("../shared/ci-auth");
|
|
11
12
|
// —— run 级用量累计：CLI 单进程只跑一个 run，模块级累计器零侵入调用链 ——
|
|
12
13
|
const usageByPurpose = new Map();
|
|
13
14
|
function emptyTotals() {
|
|
@@ -84,6 +85,8 @@ class BaseModelAdapter {
|
|
|
84
85
|
// 直连上游时被忽略
|
|
85
86
|
"x-aicr-purpose": purpose,
|
|
86
87
|
"x-aicr-run-id": (0, identity_1.resolveRunId)(),
|
|
88
|
+
// job 令牌只发给平台网关，直连模型厂商时不附带（见 shared/ci-auth）
|
|
89
|
+
...(0, ci_auth_1.gatewayJobHeaders)(this.endpoint),
|
|
87
90
|
...this.buildHeaders(),
|
|
88
91
|
},
|
|
89
92
|
body: JSON.stringify(this.buildBody(model, systemPrompt, userPrompt, options)),
|
package/dist/core/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/core/model.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/core/model.ts"],"names":[],"mappings":"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"}
|
package/dist/gitlab/api.d.ts
CHANGED
|
@@ -82,6 +82,24 @@ export type MergeRequestHeadFreshness = "current" | "stale" | "unknown";
|
|
|
82
82
|
*/
|
|
83
83
|
export declare function resolvePipelineHeadSha(env: NodeJS.ProcessEnv): string | undefined;
|
|
84
84
|
export declare function getMergeRequestHeadFreshness(pipelineCommitSha: string | undefined, mergeRequestHeadSha: string | undefined): MergeRequestHeadFreshness;
|
|
85
|
+
/** 平台评论代理的路径（规格「平台代理 GitLab 评论操作」）；cli-remote 不再直连 GitLab */
|
|
86
|
+
export declare const GITLAB_PROXY_PATH = "/api/modules/code-review/ci/gitlab";
|
|
87
|
+
/** 平台代理返回的错误码；用于汇总本次评论发布结果 */
|
|
88
|
+
export type CommentPublishReason = "BOT_UNAVAILABLE" | "BOT_FORBIDDEN" | "GITLAB_ERROR" | "MR_SCOPE_MISMATCH" | "NOT_MR_PIPELINE" | "NOT_BOT_NOTE";
|
|
89
|
+
export interface CommentPublishResult {
|
|
90
|
+
status: "published" | "partial" | "skipped";
|
|
91
|
+
reason?: CommentPublishReason;
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* 汇总本次运行的评论发布结果（随 ci/runs 上报，见规格「评论未发布的可见性」）：
|
|
95
|
+
* 写操作全部成功为 published，全部失败为 skipped，其余为 partial；
|
|
96
|
+
* 没有写操作但读取时遇到 bot 不可用 / 无权，也记为 skipped。
|
|
97
|
+
*/
|
|
98
|
+
export declare function summarizeCommentPublish(): CommentPublishResult;
|
|
99
|
+
/** 测试用：清空发布结果记录 */
|
|
100
|
+
export declare function resetCommentPublishLog(): void;
|
|
101
|
+
/** 代理是否可用：需要平台地址、项目 Token 与 MR 上下文 */
|
|
102
|
+
export declare function isGitlabProxyAvailable(env?: NodeJS.ProcessEnv): boolean;
|
|
85
103
|
/** 继承评论的来源标注（design D7）：有来源讨论链接时「原讨论」可点，否则只留文字 */
|
|
86
104
|
export interface InheritedCommentInfo {
|
|
87
105
|
sourceMrIid: string;
|
|
@@ -91,11 +109,10 @@ export declare function buildInheritedCommentNote(info: InheritedCommentInfo): s
|
|
|
91
109
|
export declare function buildCommentBody(comment: AIComment, inherited?: InheritedCommentInfo | null): string;
|
|
92
110
|
/**
|
|
93
111
|
* 来源 MR 里 bot 讨论的 note 链接（按 fingerprint）：继承评论的「原讨论」用。
|
|
94
|
-
* 复用 marker
|
|
112
|
+
* 复用 marker 查找，分页沿用固定上限 `MAX_PAGINATION_PAGES`；没有 `CI_PROJECT_URL` 时拼不出链接返回空表；
|
|
95
113
|
* 任何失败都只记录日志、返回空表，不阻塞发布。
|
|
96
114
|
*/
|
|
97
115
|
export declare function fetchSourceDiscussionNoteUrls(options: {
|
|
98
|
-
token?: string;
|
|
99
116
|
env?: NodeJS.ProcessEnv;
|
|
100
117
|
sourceMrIid: string;
|
|
101
118
|
userId: number | null | undefined;
|
|
@@ -112,18 +129,15 @@ export declare function collectHumanResolutions(context: GitlabReviewContext): M
|
|
|
112
129
|
* writers fall back to their own (also short-circuiting) fetch logic.
|
|
113
130
|
*/
|
|
114
131
|
export declare function fetchGitlabContext(options: {
|
|
115
|
-
token?: string;
|
|
116
132
|
env?: NodeJS.ProcessEnv;
|
|
117
133
|
}): Promise<GitlabReviewContext | null>;
|
|
118
134
|
/** Fetch the MR immediately before writes so an old pipeline cannot mutate current state. */
|
|
119
135
|
export declare function fetchGitlabMergeRequest(options: {
|
|
120
|
-
token?: string;
|
|
121
136
|
env?: NodeJS.ProcessEnv;
|
|
122
137
|
}): Promise<GitlabMergeRequest | null>;
|
|
123
138
|
export declare function postGitlabDiscussions(options: {
|
|
124
139
|
comments: AIComment[];
|
|
125
140
|
diff?: string;
|
|
126
|
-
token?: string;
|
|
127
141
|
env?: NodeJS.ProcessEnv;
|
|
128
142
|
context?: GitlabReviewContext;
|
|
129
143
|
mergeRequest?: GitlabMergeRequest | null;
|
|
@@ -137,7 +151,6 @@ export declare function postGitlabDiscussions(options: {
|
|
|
137
151
|
export declare function findExistingSummaryBody(context: GitlabReviewContext | undefined): string | null;
|
|
138
152
|
export declare function postGitlabSummary(options: {
|
|
139
153
|
markdown: string;
|
|
140
|
-
token?: string;
|
|
141
154
|
env?: NodeJS.ProcessEnv;
|
|
142
155
|
context?: GitlabReviewContext;
|
|
143
156
|
}): Promise<boolean>;
|
package/dist/gitlab/api.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/gitlab/api.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/gitlab/api.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAG1C,UAAU,UAAU;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,UAAU;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACvD,sCAAsC;IACtC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,+DAA+D;IAC/D,QAAQ,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;CAC1E;AAED,UAAU,gBAAgB;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,eAAe,EAAE,OAAO,CAAC;IACzB,KAAK,EAAE,UAAU,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE;QACV,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,0CAA0C;IAC1C,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACvC,sDAAsD;IACtD,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,gDAAgD;IAChD,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,6BAA6B;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,oCAAoC;IACpC,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAKD,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAEtE;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,EAAE,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,GACxC,OAAO,CAIT;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,EAAE,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,GACxC,OAAO,CAET;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAC3C,EAAE,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,GACxC,MAAM,GAAG,IAAI,CASf;AAED;;;;GAIG;AACH,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,UAAU,GAAG,IAAI,CAAC;IACxB,WAAW,EAAE,gBAAgB,EAAE,CAAC;CACjC;AAED,MAAM,MAAM,yBAAyB,GAAG,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;AAExE;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,MAAM,CAAC,UAAU,GACrB,MAAM,GAAG,SAAS,CAMpB;AAED,wBAAgB,4BAA4B,CAC1C,iBAAiB,EAAE,MAAM,GAAG,SAAS,EACrC,mBAAmB,EAAE,MAAM,GAAG,SAAS,GACtC,yBAAyB,CAK3B;AAED,6DAA6D;AAC7D,eAAO,MAAM,iBAAiB,uCAAuC,CAAC;AAEtE,8BAA8B;AAC9B,MAAM,MAAM,oBAAoB,GAC5B,iBAAiB,GACjB,eAAe,GACf,cAAc,GACd,mBAAmB,GACnB,iBAAiB,GACjB,cAAc,CAAC;AAmBnB,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,WAAW,GAAG,SAAS,GAAG,SAAS,CAAC;IAC5C,MAAM,CAAC,EAAE,oBAAoB,CAAC;CAC/B;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,IAAI,oBAAoB,CAiB9D;AAED,mBAAmB;AACnB,wBAAgB,sBAAsB,IAAI,IAAI,CAE7C;AAgBD,sCAAsC;AACtC,wBAAgB,sBAAsB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAIpF;AAsLD,kDAAkD;AAClD,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,oBAAoB,GAAG,MAAM,CAG5E;AAED,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,SAAS,EAClB,SAAS,CAAC,EAAE,oBAAoB,GAAG,IAAI,GACtC,MAAM,CAcR;AAED;;;;GAIG;AACH,wBAAsB,6BAA6B,CAAC,OAAO,EAAE;IAC3D,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACnC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA+B/B;AAuED;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,mBAAmB,GAC3B,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CA4B5B;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE;IAChD,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,GAAG,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAatC;AAED,6FAA6F;AAC7F,wBAAsB,uBAAuB,CAAC,OAAO,EAAE;IACrD,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAKrC;AAED,wBAAsB,qBAAqB,CAAC,OAAO,EAAE;IACnD,QAAQ,EAAE,SAAS,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,OAAO,CAAC,EAAE,mBAAmB,CAAC;IAC9B,YAAY,CAAC,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACzC,qEAAqE;IACrE,SAAS,CAAC,EAAE;QACV,aAAa,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3C,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACvC,CAAC;CACH,GAAG,OAAO,CAAC,OAAO,CAAC,CAmLnB;AAED,iDAAiD;AACjD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,mBAAmB,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAM/F;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE;IAC/C,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,OAAO,CAAC,EAAE,mBAAmB,CAAC;CAC/B,GAAG,OAAO,CAAC,OAAO,CAAC,CA4DnB"}
|