clanka 0.11.0 → 0.12.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.
Files changed (92) hide show
  1. package/README.md +49 -0
  2. package/dist/Acp.d.ts +1 -1
  3. package/dist/Acp.d.ts.map +1 -1
  4. package/dist/Acp.js +112 -7
  5. package/dist/Acp.js.map +1 -1
  6. package/dist/Acp.test.js +178 -0
  7. package/dist/Acp.test.js.map +1 -1
  8. package/dist/Agent.d.ts.map +1 -1
  9. package/dist/Agent.js +26 -8
  10. package/dist/Agent.js.map +1 -1
  11. package/dist/AgentExecutor.js +15 -1
  12. package/dist/AgentExecutor.js.map +1 -1
  13. package/dist/AgentTools.d.ts +7 -0
  14. package/dist/AgentTools.d.ts.map +1 -1
  15. package/dist/AgentTools.js +7 -0
  16. package/dist/AgentTools.js.map +1 -1
  17. package/dist/McpConfig.d.ts +36 -0
  18. package/dist/McpConfig.d.ts.map +1 -0
  19. package/dist/McpConfig.js +182 -0
  20. package/dist/McpConfig.js.map +1 -0
  21. package/dist/McpConfig.test.d.ts +2 -0
  22. package/dist/McpConfig.test.d.ts.map +1 -0
  23. package/dist/McpConfig.test.js +163 -0
  24. package/dist/McpConfig.test.js.map +1 -0
  25. package/dist/McpServers.d.ts +176 -0
  26. package/dist/McpServers.d.ts.map +1 -0
  27. package/dist/McpServers.js +707 -0
  28. package/dist/McpServers.js.map +1 -0
  29. package/dist/McpServers.test.d.ts +2 -0
  30. package/dist/McpServers.test.d.ts.map +1 -0
  31. package/dist/McpServers.test.js +717 -0
  32. package/dist/McpServers.test.js.map +1 -0
  33. package/dist/TypeBuilder.d.ts +9 -0
  34. package/dist/TypeBuilder.d.ts.map +1 -1
  35. package/dist/TypeBuilder.js +24 -11
  36. package/dist/TypeBuilder.js.map +1 -1
  37. package/dist/TypeBuilder.test.js +33 -0
  38. package/dist/TypeBuilder.test.js.map +1 -1
  39. package/dist/bin/{Effect-zUBunSAW.mjs → Effect-DuThyCJ1.mjs} +87 -9
  40. package/dist/bin/Effect-DuThyCJ1.mjs.map +1 -0
  41. package/dist/bin/McpClient-CIiPyMDJ.mjs +36 -0
  42. package/dist/bin/McpClient-CIiPyMDJ.mjs.map +1 -0
  43. package/dist/bin/{OutputFormatter-BPdc6RmH.mjs → OutputFormatter-BvIjvUmT.mjs} +3 -3
  44. package/dist/bin/{OutputFormatter-BPdc6RmH.mjs.map → OutputFormatter-BvIjvUmT.mjs.map} +1 -1
  45. package/dist/bin/{Schema-C2Y2y3tU.mjs → Schema-DcXUXpRg.mjs} +831 -35
  46. package/dist/bin/Schema-DcXUXpRg.mjs.map +1 -0
  47. package/dist/bin/{SemanticSearch-BKZxP19F.mjs → SemanticSearch-CdGA4CIC.mjs} +5 -5
  48. package/dist/bin/{SemanticSearch-BKZxP19F.mjs.map → SemanticSearch-CdGA4CIC.mjs.map} +1 -1
  49. package/dist/bin/{Stream-BvmRbTMu.mjs → Stream-I9SRMlLj.mjs} +20 -22
  50. package/dist/bin/Stream-I9SRMlLj.mjs.map +1 -0
  51. package/dist/bin/cli.mjs +17642 -802
  52. package/dist/bin/cli.mjs.map +1 -1
  53. package/dist/bin/{index.min-DbZbUHX3.mjs → index.min-Bkz7vIWv.mjs} +5 -5
  54. package/dist/bin/{index.min-DbZbUHX3.mjs.map → index.min-Bkz7vIWv.mjs.map} +1 -1
  55. package/dist/bin/rolldown-runtime-zY4HT0JA.mjs +30 -0
  56. package/dist/bin/{turndown.cjs-DK29wZw3.mjs → turndown.cjs-LntFxFyd.mjs} +2 -2
  57. package/dist/bin/{turndown.cjs-DK29wZw3.mjs.map → turndown.cjs-LntFxFyd.mjs.map} +1 -1
  58. package/dist/cli.js +24 -2
  59. package/dist/cli.js.map +1 -1
  60. package/dist/fixtures/McpFakeServer.d.ts +47 -0
  61. package/dist/fixtures/McpFakeServer.d.ts.map +1 -0
  62. package/dist/fixtures/McpFakeServer.js +112 -0
  63. package/dist/fixtures/McpFakeServer.js.map +1 -0
  64. package/dist/fixtures/McpStdioServer.d.ts +2 -0
  65. package/dist/fixtures/McpStdioServer.d.ts.map +1 -0
  66. package/dist/fixtures/McpStdioServer.js +53 -0
  67. package/dist/fixtures/McpStdioServer.js.map +1 -0
  68. package/dist/index.d.ts +4 -0
  69. package/dist/index.d.ts.map +1 -1
  70. package/dist/index.js +4 -0
  71. package/dist/index.js.map +1 -1
  72. package/package.json +1 -1
  73. package/src/Acp.test.ts +242 -0
  74. package/src/Acp.ts +141 -5
  75. package/src/Agent.ts +38 -10
  76. package/src/AgentExecutor.ts +14 -1
  77. package/src/AgentTools.ts +8 -0
  78. package/src/McpConfig.test.ts +238 -0
  79. package/src/McpConfig.ts +255 -0
  80. package/src/McpServers.test.ts +1050 -0
  81. package/src/McpServers.ts +1072 -0
  82. package/src/TypeBuilder.test.ts +70 -0
  83. package/src/TypeBuilder.ts +41 -14
  84. package/src/cli.ts +46 -0
  85. package/src/fixtures/McpFakeServer.ts +162 -0
  86. package/src/fixtures/McpStdioServer.ts +60 -0
  87. package/src/index.ts +5 -0
  88. package/dist/bin/Effect-zUBunSAW.mjs.map +0 -1
  89. package/dist/bin/McpClient-CnP2P7c9.mjs +0 -14179
  90. package/dist/bin/McpClient-CnP2P7c9.mjs.map +0 -1
  91. package/dist/bin/Schema-C2Y2y3tU.mjs.map +0 -1
  92. package/dist/bin/Stream-BvmRbTMu.mjs.map +0 -1
@@ -0,0 +1,163 @@
1
+ import { assert, describe, it } from "@effect/vitest";
2
+ import * as NodeServices from "@effect/platform-node/NodeServices";
3
+ import * as ConfigProvider from "effect/ConfigProvider";
4
+ import * as Duration from "effect/Duration";
5
+ import * as Effect from "effect/Effect";
6
+ import * as FileSystem from "effect/FileSystem";
7
+ import * as Path from "effect/Path";
8
+ import * as Redacted from "effect/Redacted";
9
+ import * as McpConfig from "./McpConfig.js";
10
+ import * as McpServers from "./McpServers.js";
11
+ /**
12
+ * Writes the files into a fresh directory and loads them, with `project/` as
13
+ * the cwd and `home/` as `XDG_CONFIG_HOME`. A string is written as it is,
14
+ * anything else as JSON.
15
+ */
16
+ const load = (files, options = {}) => Effect.gen(function* () {
17
+ const fs = yield* FileSystem.FileSystem;
18
+ const path = yield* Path.Path;
19
+ const root = yield* fs.makeTempDirectoryScoped();
20
+ const write = Effect.fnUntraced(function* (file, content) {
21
+ yield* fs.makeDirectory(path.dirname(file), { recursive: true });
22
+ yield* fs.writeFileString(file, typeof content === "string" ? content : JSON.stringify(content));
23
+ });
24
+ const home = path.join(root, "home");
25
+ const cwd = path.join(root, "project");
26
+ yield* fs.makeDirectory(cwd, { recursive: true });
27
+ if (files.user !== undefined) {
28
+ yield* write(path.join(home, "clanka", "mcp.json"), files.user);
29
+ }
30
+ if (files.project !== undefined) {
31
+ yield* write(path.join(cwd, ".mcp.json"), files.project);
32
+ }
33
+ const flagFiles = [];
34
+ for (const [name, content] of Object.entries(files.flags ?? {})) {
35
+ const file = path.join(root, "flags", name);
36
+ yield* write(file, content);
37
+ flagFiles.push(file);
38
+ }
39
+ const config = yield* McpConfig.load({
40
+ cwd,
41
+ files: flagFiles,
42
+ enabled: options.enabled ?? true,
43
+ }).pipe(Effect.provideService(ConfigProvider.ConfigProvider, ConfigProvider.fromEnv({
44
+ env: { XDG_CONFIG_HOME: home, ...options.env },
45
+ })));
46
+ return { config, root };
47
+ });
48
+ const at = (value, path) => path
49
+ .split(".")
50
+ .reduce((value, key) => value?.[key], value);
51
+ const secret = (value, path) => Redacted.value(at(value, path));
52
+ describe("McpConfig", () => {
53
+ it.effect("merges the user, project and flag files by precedence", () => Effect.gen(function* () {
54
+ const path = yield* Path.Path;
55
+ const { config, root } = yield* load({
56
+ user: {
57
+ mcpServers: {
58
+ shared: {
59
+ command: "user-cmd",
60
+ args: ["--user"],
61
+ env: { FROM: "user" },
62
+ },
63
+ remote: {
64
+ url: "https://user.example/mcp",
65
+ headers: { Authorization: "Bearer user" },
66
+ disabled: true,
67
+ alwaysAllow: ["anything"],
68
+ },
69
+ },
70
+ },
71
+ project: {
72
+ mcpServers: {
73
+ shared: { command: "project-cmd" },
74
+ tool: { command: "project-tool" },
75
+ },
76
+ },
77
+ flags: {
78
+ "a.json": { mcpServers: { tool: { command: "a-tool" } } },
79
+ "nested/b.json": {
80
+ mcpServers: {
81
+ tool: { command: "b-tool", cwd: "work", callTimeout: 1500 },
82
+ },
83
+ },
84
+ },
85
+ });
86
+ assert.sameMembers(Object.keys(config), ["shared", "remote", "tool"]);
87
+ // A higher-precedence entry replaces a lower one whole.
88
+ assert.nestedPropertyVal(config, "shared.type", "stdio");
89
+ assert.nestedPropertyVal(config, "shared.command", "project-cmd");
90
+ assert.notDeepNestedPropertyVal(config, "shared.args", ["--user"]);
91
+ assert.notNestedProperty(config, "shared.env.FROM");
92
+ // `type` follows from `url`; unknown keys are ignored.
93
+ assert.nestedPropertyVal(config, "remote.type", "http");
94
+ assert.nestedPropertyVal(config, "remote.url", "https://user.example/mcp");
95
+ assert.strictEqual(secret(config, "remote.headers.Authorization"), "Bearer user");
96
+ // A later flag wins; its relative `cwd` resolves against its own file.
97
+ assert.nestedPropertyVal(config, "tool.command", "b-tool");
98
+ assert.nestedPropertyVal(config, "tool.cwd", path.join(root, "flags", "nested", "work"));
99
+ assert.strictEqual(Duration.toMillis(at(config, "tool.callTimeout")), 1500);
100
+ }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)));
101
+ it.live("expands environment variables before decoding", () => Effect.gen(function* () {
102
+ const { config } = yield* load({
103
+ project: {
104
+ mcpServers: {
105
+ local: {
106
+ command: "${BIN:-node}",
107
+ args: ["--token=${TOKEN}", "$TOKEN"],
108
+ env: { KEY: "${TOKEN}" },
109
+ cwd: "${WORK}",
110
+ },
111
+ remote: {
112
+ url: "https://${HOST:-example.com}/mcp",
113
+ headers: { Authorization: "Bearer ${TOKEN}" },
114
+ },
115
+ missing: { command: "node", args: ["${NOT_SET}"] },
116
+ },
117
+ },
118
+ }, { env: { TOKEN: "t0k", WORK: "/work" } });
119
+ assert.nestedPropertyVal(config, "local.command", "node");
120
+ // Bare `$VAR` is left alone.
121
+ assert.deepNestedPropertyVal(config, "local.args", [
122
+ "--token=t0k",
123
+ "$TOKEN",
124
+ ]);
125
+ assert.strictEqual(secret(config, "local.env.KEY"), "t0k");
126
+ assert.nestedPropertyVal(config, "local.cwd", "/work");
127
+ assert.nestedPropertyVal(config, "remote.url", "https://example.com/mcp");
128
+ assert.strictEqual(secret(config, "remote.headers.Authorization"), "Bearer t0k");
129
+ // A missing variable fails only that server.
130
+ const status = yield* Effect.gen(function* () {
131
+ const servers = yield* McpServers.McpServers;
132
+ return yield* servers.status;
133
+ }).pipe(Effect.provide(McpServers.layer({ missing: config["missing"] })));
134
+ const missing = status["missing"];
135
+ assert.strictEqual(missing?._tag, "Failed");
136
+ if (missing?._tag === "Failed") {
137
+ assert.include(missing.error, "environment variable NOT_SET is not set");
138
+ }
139
+ }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)));
140
+ it.effect("keeps servers named like Object.prototype members", () => Effect.gen(function* () {
141
+ const { config } = yield* load({
142
+ project: '{ "mcpServers": { "__proto__": { "command": "proto-cmd" }, "constructor": { "command": "constructor-cmd" } } }',
143
+ });
144
+ assert.sameMembers(Object.keys(config), ["__proto__", "constructor"]);
145
+ assert.strictEqual(at(config, "__proto__.command"), "proto-cmd");
146
+ assert.strictEqual(at(config, "constructor.command"), "constructor-cmd");
147
+ }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)));
148
+ it.effect("an invalid file stops the CLI unless MCP is disabled", () => Effect.gen(function* () {
149
+ const invalidJson = yield* load({ project: "{ not json" }).pipe(Effect.flip);
150
+ assert.include(invalidJson.message, ".mcp.json");
151
+ const invalidEntry = yield* load({
152
+ flags: { "bad.json": { mcpServers: { broken: { command: 42 } } } },
153
+ }).pipe(Effect.flip);
154
+ assert.include(invalidEntry.message, "bad.json");
155
+ assert.include(invalidEntry.message, "broken");
156
+ const disabled = yield* load({
157
+ project: "{ not json",
158
+ flags: { "bad.json": { mcpServers: { broken: { command: 42 } } } },
159
+ }, { enabled: false });
160
+ assert.deepStrictEqual(disabled.config, {});
161
+ }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)));
162
+ });
163
+ //# sourceMappingURL=McpConfig.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"McpConfig.test.js","sourceRoot":"","sources":["../src/McpConfig.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,176 @@
1
+ import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
2
+ import * as Context from "effect/Context";
3
+ import * as Duration from "effect/Duration";
4
+ import * as Effect from "effect/Effect";
5
+ import * as Layer from "effect/Layer";
6
+ import * as Option from "effect/Option";
7
+ import * as Schema from "effect/Schema";
8
+ import type { LoopToolHandlers } from "./AgentExecutor.ts";
9
+ import { type ImageAttachment } from "./AgentTools.ts";
10
+ /**
11
+ * A server started as a child process and spoken to over stdio.
12
+ *
13
+ * @since 1.0.0
14
+ * @category Config
15
+ */
16
+ export declare const StdioServerConfig: Schema.Struct<{
17
+ readonly type: Schema.Literal<"stdio">;
18
+ readonly command: Schema.String;
19
+ readonly args: Schema.optionalKey<Schema.$Array<Schema.String>>;
20
+ readonly env: Schema.optionalKey<Schema.$Record<Schema.String, Schema.RedactedFromValue<Schema.String>>>;
21
+ /**
22
+ * Resolved against the process cwd. Defaults to the process cwd.
23
+ */
24
+ readonly cwd: Schema.optionalKey<Schema.String>;
25
+ readonly connectTimeout: Schema.optionalKey<Schema.Duration>;
26
+ readonly callTimeout: Schema.optionalKey<Schema.Duration>;
27
+ }>;
28
+ /**
29
+ * A server reached over streamable HTTP.
30
+ *
31
+ * @since 1.0.0
32
+ * @category Config
33
+ */
34
+ export declare const HttpServerConfig: Schema.Struct<{
35
+ readonly type: Schema.Literal<"http">;
36
+ readonly url: Schema.String;
37
+ readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.RedactedFromValue<Schema.String>>>;
38
+ readonly connectTimeout: Schema.optionalKey<Schema.Duration>;
39
+ readonly callTimeout: Schema.optionalKey<Schema.Duration>;
40
+ }>;
41
+ /**
42
+ * @since 1.0.0
43
+ * @category Config
44
+ */
45
+ export declare const McpServerConfig: Schema.Union<readonly [Schema.Struct<{
46
+ readonly type: Schema.Literal<"stdio">;
47
+ readonly command: Schema.String;
48
+ readonly args: Schema.optionalKey<Schema.$Array<Schema.String>>;
49
+ readonly env: Schema.optionalKey<Schema.$Record<Schema.String, Schema.RedactedFromValue<Schema.String>>>;
50
+ /**
51
+ * Resolved against the process cwd. Defaults to the process cwd.
52
+ */
53
+ readonly cwd: Schema.optionalKey<Schema.String>;
54
+ readonly connectTimeout: Schema.optionalKey<Schema.Duration>;
55
+ readonly callTimeout: Schema.optionalKey<Schema.Duration>;
56
+ }>, Schema.Struct<{
57
+ readonly type: Schema.Literal<"http">;
58
+ readonly url: Schema.String;
59
+ readonly headers: Schema.optionalKey<Schema.$Record<Schema.String, Schema.RedactedFromValue<Schema.String>>>;
60
+ readonly connectTimeout: Schema.optionalKey<Schema.Duration>;
61
+ readonly callTimeout: Schema.optionalKey<Schema.Duration>;
62
+ }>]>;
63
+ /**
64
+ * @since 1.0.0
65
+ * @category Config
66
+ */
67
+ export type McpServerConfig = typeof McpServerConfig.Type;
68
+ /**
69
+ * A server that cannot be started, such as one whose configuration refers to
70
+ * a missing environment variable. It is reported as `Failed` with `error`.
71
+ *
72
+ * @since 1.0.0
73
+ * @category Config
74
+ */
75
+ export interface UnavailableServer {
76
+ readonly type: "unavailable";
77
+ readonly error: string;
78
+ }
79
+ /**
80
+ * @since 1.0.0
81
+ * @category Config
82
+ */
83
+ export type ServerEntry = McpServerConfig | UnavailableServer;
84
+ /**
85
+ * A server reached through a transport the caller builds. `transport` is
86
+ * called once, when the layer is built.
87
+ *
88
+ * @since 1.0.0
89
+ * @category Config
90
+ */
91
+ export interface TransportServer {
92
+ readonly transport: () => Transport;
93
+ readonly connectTimeout?: Duration.Input | undefined;
94
+ readonly callTimeout?: Duration.Input | undefined;
95
+ }
96
+ declare const Connected_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => Readonly<A> & {
97
+ readonly _tag: "Connected";
98
+ } & import("effect/Pipeable").Pipeable;
99
+ /**
100
+ * @since 1.0.0
101
+ * @category Status
102
+ */
103
+ export declare class Connected extends Connected_base<{
104
+ /**
105
+ * The names of every tool the server listed.
106
+ */
107
+ readonly tools: ReadonlyArray<string>;
108
+ readonly instructions: Option.Option<string>;
109
+ }> {
110
+ }
111
+ declare const Failed_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => Readonly<A> & {
112
+ readonly _tag: "Failed";
113
+ } & import("effect/Pipeable").Pipeable;
114
+ /**
115
+ * @since 1.0.0
116
+ * @category Status
117
+ */
118
+ export declare class Failed extends Failed_base<{
119
+ readonly error: string;
120
+ }> {
121
+ }
122
+ /**
123
+ * @since 1.0.0
124
+ * @category Status
125
+ */
126
+ export type ServerStatus = Connected | Failed;
127
+ declare const McpServers_base: Context.ServiceClass<McpServers, "clanka/McpServers", {
128
+ /**
129
+ * Each server by its configured name.
130
+ */
131
+ readonly status: Effect.Effect<Readonly<Record<string, ServerStatus>>>;
132
+ /**
133
+ * The system prompt section listing the servers, or `""` when none is
134
+ * configured.
135
+ */
136
+ readonly prompt: string;
137
+ /**
138
+ * The declaration of `searchTools`, or `""` when no server is connected.
139
+ */
140
+ readonly dts: string;
141
+ /**
142
+ * The loop-side handlers: one per tool, keyed `"<server>.<tool>"`, and
143
+ * `searchTools`. Images in results go to `onImage`.
144
+ */
145
+ readonly handlers: (onImage: (image: ImageAttachment) => Effect.Effect<void>) => LoopToolHandlers;
146
+ }>;
147
+ /**
148
+ * @since 1.0.0
149
+ * @category Services
150
+ */
151
+ export declare class McpServers extends McpServers_base {
152
+ }
153
+ /**
154
+ * Connects every server when built and closes them with its scope. A server
155
+ * that cannot connect is `Failed`; building the layer never fails.
156
+ *
157
+ * @since 1.0.0
158
+ * @category Layers
159
+ */
160
+ export declare const layer: (config: Readonly<Record<string, ServerEntry>>) => Layer.Layer<McpServers>;
161
+ /**
162
+ * Like `layer`, with transports built by the caller.
163
+ *
164
+ * @since 1.0.0
165
+ * @category Layers
166
+ */
167
+ export declare const layerTransports: (servers: Readonly<Record<string, TransportServer>>) => Layer.Layer<McpServers>;
168
+ /**
169
+ * The JavaScript identifier a server or tool name is offered under.
170
+ *
171
+ * @since 1.0.0
172
+ * @category Naming
173
+ */
174
+ export declare const identifier: (name: string) => string;
175
+ export {};
176
+ //# sourceMappingURL=McpServers.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"McpServers.d.ts","sourceRoot":"","sources":["../src/McpServers.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAA;AAO9E,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAEzC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAKvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAIvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAC1D,OAAO,EAAyB,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAU7E;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB;;;;;IAO5B;;OAEG;;;;EAIH,CAAA;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB;;;;;;EAQ3B,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,eAAe;;;;;IA5B1B;;OAEG;;;;;;;;;;IA6BH,CAAA;AAEF;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,OAAO,eAAe,CAAC,IAAI,CAAA;AAEzD;;;;;;GAMG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAA;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACvB;AAED;;;GAGG;AACH,MAAM,MAAM,WAAW,GAAG,eAAe,GAAG,iBAAiB,CAAA;AAE7D;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,SAAS,CAAA;IACnC,QAAQ,CAAC,cAAc,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAA;IACpD,QAAQ,CAAC,WAAW,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAA;CAClD;;;;AAQD;;;GAGG;AACH,qBAAa,SAAU,SAAQ,eAA8B;IAC3D;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;IACrC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;CAC7C,CAAC;CAAG;;;;AAEL;;;GAGG;AACH,qBAAa,MAAO,SAAQ,YAA2B;IACrD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CACvB,CAAC;CAAG;AAEL;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,SAAS,GAAG,MAAM,CAAA;;IAazC;;OAEG;qBACc,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;IACtE;;;OAGG;qBACc,MAAM;IACvB;;OAEG;kBACW,MAAM;IACpB;;;OAGG;uBACgB,CACjB,OAAO,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KACrD,gBAAgB;;AA1BzB;;;GAGG;AACH,qBAAa,UAAW,SAAQ,eAwBR;CAAG;AAE3B;;;;;;GAMG;AACH,eAAO,MAAM,KAAK,WACR,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,KAC5C,KAAK,CAAC,KAAK,CAAC,UAAU,CAGtB,CAAA;AAEH;;;;;GAKG;AACH,eAAO,MAAM,eAAe,YACjB,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,KACjD,KAAK,CAAC,KAAK,CAAC,UAAU,CAQtB,CAAA;AA4DH;;;;;GAKG;AACH,eAAO,MAAM,UAAU,SAAU,MAAM,KAAG,MAIzC,CAAA"}