@aui.io/apollo 0.1.35 → 0.1.38
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/node_modules/@aui.io/apollo-cli/dist/src/commands/bundles.js +3 -1
- package/node_modules/@aui.io/apollo-cli/dist/src/commands/bundles.js.map +1 -1
- package/node_modules/@aui.io/apollo-cli/dist/src/commands/hierarchy.js +15 -8
- package/node_modules/@aui.io/apollo-cli/dist/src/commands/hierarchy.js.map +1 -1
- package/node_modules/@aui.io/apollo-cli/package.json +3 -3
- package/node_modules/@aui.io/apollo-core/dist/src/api/agent-settings.d.ts +12 -68
- package/node_modules/@aui.io/apollo-core/dist/src/api/agent-settings.js +1 -61
- package/node_modules/@aui.io/apollo-core/dist/src/api/agent-settings.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/dist/src/api/management.d.ts +23 -1
- package/node_modules/@aui.io/apollo-core/dist/src/api/management.js +35 -1
- package/node_modules/@aui.io/apollo-core/dist/src/api/management.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/dist/src/api/transport.js +14 -4
- package/node_modules/@aui.io/apollo-core/dist/src/api/transport.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/dist/src/api/vault.d.ts +49 -27
- package/node_modules/@aui.io/apollo-core/dist/src/api/vault.js +35 -15
- package/node_modules/@aui.io/apollo-core/dist/src/api/vault.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/dist/src/config/index.js +0 -6
- package/node_modules/@aui.io/apollo-core/dist/src/config/index.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/dist/src/config/types.d.ts +2 -5
- package/node_modules/@aui.io/apollo-core/dist/src/index.d.ts +4 -5
- package/node_modules/@aui.io/apollo-core/dist/src/index.js +1 -2
- package/node_modules/@aui.io/apollo-core/dist/src/index.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/dist/src/services/bundles.d.ts +14 -5
- package/node_modules/@aui.io/apollo-core/dist/src/services/bundles.js +9 -3
- package/node_modules/@aui.io/apollo-core/dist/src/services/bundles.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/dist/src/services/clients.d.ts +1 -4
- package/node_modules/@aui.io/apollo-core/dist/src/services/clients.js +4 -23
- package/node_modules/@aui.io/apollo-core/dist/src/services/clients.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/dist/src/services/doctor.js +0 -1
- package/node_modules/@aui.io/apollo-core/dist/src/services/doctor.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/dist/src/services/hierarchy.d.ts +20 -39
- package/node_modules/@aui.io/apollo-core/dist/src/services/hierarchy.js +20 -126
- package/node_modules/@aui.io/apollo-core/dist/src/services/hierarchy.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/dist/src/services/vault.d.ts +7 -6
- package/node_modules/@aui.io/apollo-core/dist/src/services/vault.js +17 -7
- package/node_modules/@aui.io/apollo-core/dist/src/services/vault.js.map +1 -1
- package/node_modules/@aui.io/apollo-core/package.json +1 -1
- package/node_modules/@aui.io/apollo-tui/dist/src/lib/actions.js +17 -9
- package/node_modules/@aui.io/apollo-tui/dist/src/lib/actions.js.map +1 -1
- package/node_modules/@aui.io/apollo-tui/dist/src/lib/commands.js +1 -1
- package/node_modules/@aui.io/apollo-tui/dist/src/lib/commands.js.map +1 -1
- package/node_modules/@aui.io/apollo-tui/package.json +2 -2
- package/package.json +4 -4
- package/node_modules/@aui.io/apollo-core/dist/src/api/network.d.ts +0 -19
- package/node_modules/@aui.io/apollo-core/dist/src/api/network.js +0 -53
- package/node_modules/@aui.io/apollo-core/dist/src/api/network.js.map +0 -1
|
@@ -4,7 +4,6 @@ import { BuilderApiClient } from "../api/builder-api.js";
|
|
|
4
4
|
import { IdentityClient } from "../api/identity.js";
|
|
5
5
|
import { KbmClient } from "../api/kbm.js";
|
|
6
6
|
import { ManagementClient } from "../api/management.js";
|
|
7
|
-
import { NetworkClient } from "../api/network.js";
|
|
8
7
|
import { RuntimeApiClient } from "../api/runtime-api.js";
|
|
9
8
|
import { Transport } from "../api/transport.js";
|
|
10
9
|
import { VaultClient } from "../api/vault.js";
|
|
@@ -77,6 +76,8 @@ export function createClients(context, options = {}) {
|
|
|
77
76
|
service: "apollo-api",
|
|
78
77
|
baseUrl: context.baseUrls.management,
|
|
79
78
|
userId: context.userId,
|
|
79
|
+
orgId: context.orgId,
|
|
80
|
+
orgHeader: "x-aui-organization-id",
|
|
80
81
|
...common,
|
|
81
82
|
});
|
|
82
83
|
// Everything the runtime serves is version-dependent — the program schemas,
|
|
@@ -90,15 +91,6 @@ export function createClients(context, options = {}) {
|
|
|
90
91
|
: {}),
|
|
91
92
|
...common,
|
|
92
93
|
});
|
|
93
|
-
// Vault rides the apollo legacy gateway: session bearer + org header (the
|
|
94
|
-
// gateway validates and forwards its own trusted claims to apollo).
|
|
95
|
-
const vaultTransport = new Transport({
|
|
96
|
-
service: "vault",
|
|
97
|
-
baseUrl: context.baseUrls.vault,
|
|
98
|
-
orgId: context.orgId,
|
|
99
|
-
orgHeader: "X-Organization-ID",
|
|
100
|
-
...common,
|
|
101
|
-
});
|
|
102
94
|
const kbmTransport = new Transport({
|
|
103
95
|
service: "kbm",
|
|
104
96
|
baseUrl: context.baseUrls.kbm,
|
|
@@ -106,7 +98,7 @@ export function createClients(context, options = {}) {
|
|
|
106
98
|
orgHeader: "X-Organization-ID",
|
|
107
99
|
...common,
|
|
108
100
|
});
|
|
109
|
-
// Scenarios (v1 agent-settings): session bearer + org header
|
|
101
|
+
// Scenarios (v1 agent-settings): session bearer + org header.
|
|
110
102
|
const agentSettingsTransport = new Transport({
|
|
111
103
|
service: "agent-settings",
|
|
112
104
|
baseUrl: context.baseUrls.agentSettings,
|
|
@@ -114,16 +106,6 @@ export function createClients(context, options = {}) {
|
|
|
114
106
|
orgHeader: "X-Organization-ID",
|
|
115
107
|
...common,
|
|
116
108
|
});
|
|
117
|
-
// The network service takes the session token in `x-access-token` (like
|
|
118
|
-
// identity, not like everything else) and spells the org header its own way.
|
|
119
|
-
const networkTransport = new Transport({
|
|
120
|
-
service: "network",
|
|
121
|
-
baseUrl: context.baseUrls.network,
|
|
122
|
-
authHeader: "x-access-token",
|
|
123
|
-
orgId: context.orgId,
|
|
124
|
-
orgHeader: "organization-id",
|
|
125
|
-
...common,
|
|
126
|
-
});
|
|
127
109
|
// builder-api validates the session bearer itself (identity mode). No
|
|
128
110
|
// runtime pin rides here: the gates run on the builder's OWN engine, which
|
|
129
111
|
// is the point — they are the builder's opinion of the tree.
|
|
@@ -136,10 +118,9 @@ export function createClients(context, options = {}) {
|
|
|
136
118
|
identity,
|
|
137
119
|
management: new ManagementClient(managementTransport),
|
|
138
120
|
runtime: new RuntimeApiClient(runtimeTransport),
|
|
139
|
-
vault: new VaultClient(
|
|
121
|
+
vault: new VaultClient(managementTransport),
|
|
140
122
|
kbm: new KbmClient(kbmTransport),
|
|
141
123
|
agentSettings: new AgentSettingsClient(agentSettingsTransport),
|
|
142
|
-
network: new NetworkClient(networkTransport),
|
|
143
124
|
builder: new BuilderApiClient(builderTransport),
|
|
144
125
|
};
|
|
145
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clients.js","sourceRoot":"","sources":["../../../src/services/clients.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"clients.js","sourceRoot":"","sources":["../../../src/services/clients.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../src/services/doctor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../src/services/doctor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,OAAO,EACL,aAAa,EACb,YAAY,GAEb,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAkB,MAAM,cAAc,CAAC;AAiDvE,MAAM,cAAc,GAAG,EAAE,CAAC;AAC1B,2EAA2E;AAC3E,MAAM,oBAAoB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAC5C,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAE9C,8EAA8E;AAC9E,MAAM,aAAa,GAAG;IACpB,YAAY;IACZ,gBAAgB;IAChB,cAAc;IACd,eAAe;IACf,mBAAmB;IACnB,mBAAmB;IACnB,qBAAqB;IACrB,uBAAuB;IACvB,oBAAoB;IACpB,mBAAmB;IACnB,gBAAgB;IAChB,2BAA2B;IAC3B,YAAY;CACJ,CAAC;AAEX,MAAM,iBAAiB,GAAG,CACxB,OAAe,EACf,IAAc,EACG,EAAE,CACnB,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IAC9B,QAAQ,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC3D,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,IAAI,GAAG,OAAO,SAAS,CAAC,CAAC,CAAC;QAC1D,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QACpC,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEL,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,OAAgB,EAChB,OAAsB;IAEtB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IACvC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,EAAE,CAAC;IAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,iBAAiB,CAAC;IAC3D,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC;IACzC,MAAM,MAAM,GAAkB,EAAE,CAAC;IACjC,MAAM,GAAG,GAAG,CAAC,KAAkB,EAAQ,EAAE;QACvC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC,CAAC;IAEF,MAAM,kBAAkB,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC;IACxE,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5B,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE;QACtC,KAAK,EAAE,CAAC,OAAO;QACf,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACnD,CAAC,CAAC;IACH,MAAM,UAAU,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAC7C,MAAM,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IACzC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,MAAM,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAE/B,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,MAAM,CAAC;IACxE,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,MAAM,CAAC;IACxE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,KAAK,CAAC,EAAE,CAAC;AACjE,CAAC;AAED,4EAA4E;AAE5E,KAAK,UAAU,kBAAkB,CAC/B,GAAiC,EACjC,OAIC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;IACjE,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC;IACpE,GAAG,CAAC;QACF,EAAE,EAAE,cAAc;QAClB,OAAO,EAAE,cAAc;QACvB,MAAM,EAAE,KAAK,IAAI,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;QAC/C,KAAK,EAAE,SAAS,WAAW,EAAE;QAC7B,GAAG,CAAC,KAAK,IAAI,cAAc;YACzB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACE,IAAI,EAAE,wBAAwB,cAAc,GAAG;gBAC/C,UAAU,EAAE,gBAAgB,cAAc,2BAA2B;aACtE,CAAC;KACP,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;QAClE,GAAG,CAAC;YACF,EAAE,EAAE,KAAK;YACT,OAAO,EAAE,cAAc;YACvB,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,QAAQ,UAAU,EAAE;YAC3B,IAAI,EAAE,2BAA2B;SAClC,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,GAAG,CAAC;YACF,EAAE,EAAE,KAAK;YACT,OAAO,EAAE,cAAc;YACvB,MAAM,EAAE,MAAM;YACd,KAAK,EAAE,eAAe;YACtB,IAAI,EAAE,2DAA2D;YACjE,UAAU,EAAE,0CAA0C;SACvD,CAAC,CAAC;IACL,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACnD,IAAI,MAAM,GAAG,iBAAiB,CAAC;IAC/B,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,CAAC;YACvC,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,eAAe,IAAI,CAAC,GAAG,UAAU,IAAI,CAAC,GAAG,EAAE,CAAC;gBACrE,CAAC,CAAC,oBAAoB;gBACtB,CAAC,CAAC,sBAAsB,QAAQ,GAAG,CAAC;QACxC,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,GAAG,6BAA6B,KAAK,GAAG,CAAC;QACjD,CAAC;IACH,CAAC;IACD,GAAG,CAAC;QACF,EAAE,EAAE,gBAAgB;QACpB,OAAO,EAAE,cAAc;QACvB,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,UAAU,OAAO,CAAC,UAAU,EAAE;QACrC,IAAI,EAAE,MAAM;KACb,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACrB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAC1C,OAAO,CAAC,WAAW,EACnB,QAAQ,EACR,OAAO,CAAC,GAAG,CACZ,CAAC;YACF,GAAG,CAAC;gBACF,EAAE,EAAE,gBAAgB;gBACpB,OAAO,EAAE,cAAc;gBACvB,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;gBACrD,KAAK,EACH,MAAM,KAAK,OAAO,CAAC,UAAU;oBAC3B,CAAC,CAAC,qBAAqB;oBACvB,CAAC,CAAC,WAAW,MAAM,aAAa,OAAO,CAAC,UAAU,GAAG;gBACzD,GAAG,CAAC,MAAM,KAAK,OAAO,CAAC,UAAU;oBAC/B,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC;aACtC,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,GAAG,CAAC;gBACF,EAAE,EAAE,gBAAgB;gBACpB,OAAO,EAAE,cAAc;gBACvB,MAAM,EAAE,MAAM;gBACd,KAAK,EAAE,4CAA4C;gBACnD,IAAI,EAAE,kDAAkD;aACzD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,qBAAqB,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AACzD,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,GAAiC,EACjC,GAAsB,EACtB,OAAgD;IAEhD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,EAAE,CAAC;IAC1C,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IACtD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;IAClD,MAAM,MAAM,GACV,UAAU,KAAK,KAAK;QAClB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC;QAC3B,CAAC,CAAC,UAAU,KAAK,MAAM;YACrB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC;YACtE,CAAC,CAAC,SAAS,CAAC;IAClB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,GAAG,CAAC;YACF,EAAE,EAAE,mBAAmB;YACvB,OAAO,EAAE,cAAc;YACvB,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,0BAA0B,UAAU,IAAI,eAAe,GAAG;YACjE,IAAI,EAAE,qCAAqC;SAC5C,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC;IAAC,MAAM,CAAC;QACP,sDAAsD;IACxD,CAAC;IACD,MAAM,SAAS,GAAG,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IACvD,GAAG,CAAC;QACF,EAAE,EAAE,mBAAmB;QACvB,OAAO,EAAE,cAAc;QACvB,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;QACjC,KAAK,EAAE,SAAS;YACd,CAAC,CAAC,gCAAgC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG;YAC1D,CAAC,CAAC,iCAAiC;QACrC,GAAG,CAAC,SAAS;YACX,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACE,IAAI,EAAE,0CAA0C;gBAChD,UAAU,EAAE,UAAU,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,+BAA+B;aAC3E,CAAC;KACP,CAAC,CAAC;AACL,CAAC;AAED,4EAA4E;AAE5E,SAAS,iBAAiB,CACxB,GAAiC,EACjC,GAAsB;IAEtB,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,CACpC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,SAAS,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CACtD,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACb,IAAI,KAAK,cAAc,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,CACxE,CAAC;IACF,GAAG,CAAC;QACF,EAAE,EAAE,eAAe;QACnB,OAAO,EAAE,aAAa;QACtB,MAAM,EAAE,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;QAC9C,KAAK,EACH,SAAS,CAAC,MAAM,KAAK,CAAC;YACpB,CAAC,CAAC,mCAAmC;YACrC,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,iCAAiC;QAC1D,GAAG,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;YACxB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC;gBAC3B,UAAU,EACR,oEAAoE;aACvE,CAAC;KACP,CAAC,CAAC;IAEH,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS;QAAE,MAAM,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;IAC/E,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM;QAAE,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;IAC7E,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;IAC5C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,wBAAwB,MAAM,IAAI,OAAO,oBAAoB,CAAC,CAAC;IAC7E,CAAC;IACD,GAAG,CAAC;QACF,EAAE,EAAE,UAAU;QACd,OAAO,EAAE,aAAa;QACtB,MAAM,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;QAC3C,KAAK,EACH,MAAM,CAAC,MAAM,KAAK,CAAC;YACjB,CAAC,CAAC,mCAAmC;YACrC,CAAC,CAAC,+BAA+B;QACrC,GAAG,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;KAC7D,CAAC,CAAC;AACL,CAAC;AAED,4EAA4E;AAE5E,KAAK,UAAU,UAAU,CACvB,GAAiC,EACjC,KAIC;IAED,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACpC,GAAG,CAAC;QACF,EAAE,EAAE,SAAS;QACb,OAAO,EAAE,MAAM;QACf,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,WAAW,EAAE;QAChD,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,aAAa;KACxE,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,kBAAkB,CAAC,CAAC;IACvE,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,CAAC;QACzC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;QAC/B,MAAM,KAAK,GAAG,CAAC,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QACnC,GAAG,CAAC;YACF,EAAE,EAAE,yBAAyB;YAC7B,OAAO,EAAE,MAAM;YACf,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI;YAC7B,KAAK,EAAE,KAAK;gBACV,CAAC,CAAC,2CAA2C,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG;gBAChE,CAAC,CAAC,mCAAmC;YACvC,GAAG,CAAC,KAAK;gBACP,CAAC,CAAC,EAAE,UAAU,EAAE,aAAa,eAAe,EAAE,EAAE;gBAChD,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC;QACP,GAAG,CAAC;YACF,EAAE,EAAE,yBAAyB;YAC7B,OAAO,EAAE,MAAM;YACf,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;YACxC,KAAK,EAAE,qBAAqB;YAC5B,IAAI,EAAE,GAAG,CAAC,YAAY;gBACpB,CAAC,CAAC,mCAAmC;gBACrC,CAAC,CAAC,kCAAkC;YACtC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;SAC5D,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QAC1B,GAAG,CAAC;YACF,EAAE,EAAE,OAAO;YACX,OAAO,EAAE,MAAM;YACf,MAAM,EAAE,MAAM;YACd,KAAK,EAAE,eAAe;YACtB,IAAI,EAAE,yCAAyC;YAC/C,UAAU,EAAE,cAAc;SAC3B,CAAC,CAAC;IACL,CAAC;SAAM,IAAI,MAAM,CAAC,cAAc,KAAK,IAAI,EAAE,CAAC;QAC1C,GAAG,CAAC;YACF,EAAE,EAAE,OAAO;YACX,OAAO,EAAE,MAAM;YACf,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,oCAAoC;SAC5C,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACjE,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;YACnB,GAAG,CAAC;gBACF,EAAE,EAAE,OAAO;gBACX,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,MAAM;gBACd,KAAK,EAAE,iBAAiB,SAAS,CAAC,CAAC,SAAS,CAAC,MAAM;gBACnD,UAAU,EAAE,cAAc;aAC3B,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,SAAS,GAAG,oBAAoB,EAAE,CAAC;YAC5C,GAAG,CAAC;gBACF,EAAE,EAAE,OAAO;gBACX,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,MAAM;gBACd,KAAK,EAAE,oBAAoB,SAAS,CAAC,SAAS,CAAC,EAAE;gBACjD,IAAI,EAAE,wCAAwC;gBAC9C,UAAU,EAAE,cAAc;aAC3B,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,GAAG,CAAC;gBACF,EAAE,EAAE,OAAO;gBACX,OAAO,EAAE,MAAM;gBACf,MAAM,EAAE,IAAI;gBACZ,KAAK,EAAE,wBAAwB,MAAM,CAAC,cAAc,GAAG;aACxD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IACE,MAAM,CAAC,KAAK,KAAK,IAAI;QACrB,MAAM,CAAC,UAAU,KAAK,IAAI;QAC1B,MAAM,CAAC,KAAK,KAAK,MAAM,CAAC,UAAU,EAClC,CAAC;QACD,GAAG,CAAC;YACF,EAAE,EAAE,WAAW;YACf,OAAO,EAAE,MAAM;YACf,MAAM,EAAE,MAAM;YACd,KAAK,EAAE,uBAAuB;YAC9B,IAAI,EAAE,YAAY,MAAM,CAAC,KAAK,wBAAwB,MAAM,CAAC,UAAU,EAAE;YACzE,UAAU,EAAE,kBAAkB,MAAM,CAAC,KAAK,EAAE;SAC7C,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,GAAG,CAAC;YACF,EAAE,EAAE,WAAW;YACf,OAAO,EAAE,MAAM;YACf,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,MAAM,CAAC,KAAK;gBACjB,CAAC,CAAC,gBAAgB,MAAM,CAAC,KAAK,EAAE;gBAChC,CAAC,CAAC,0BAA0B;SAC/B,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,4EAA4E;AAE5E,KAAK,UAAU,cAAc,CAC3B,GAAiC,EACjC,OAAgB,EAChB,IAAY;IAEZ,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QACvB,GAAG,CAAC;YACF,EAAE,EAAE,UAAU;YACd,OAAO,EAAE,UAAU;YACnB,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,wBAAwB;YAC/B,IAAI,EAAE,8DAA8D;SACrE,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,GAAG,CAAC;QACF,EAAE,EAAE,SAAS;QACb,OAAO,EAAE,UAAU;QACnB,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;QAC1C,KAAK,EAAE,OAAO,CAAC,UAAU;YACvB,CAAC,CAAC,kBAAkB,OAAO,CAAC,UAAU,WAAW,OAAO,CAAC,OAAO,IAAI,GAAG,GAAG;YAC1E,CAAC,CAAC,8BAA8B;QAClC,GAAG,CAAC,OAAO,CAAC,UAAU;YACpB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACE,IAAI,EAAE,6CAA6C;gBACnD,UAAU,EAAE,0BAA0B;aACvC,CAAC;KACP,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IAChE,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC;IACrE,IAAI,SAAS,EAAE,CAAC;QACd,GAAG,CAAC;YACF,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,UAAU;YACnB,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,6BAA6B;SACrC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC;QAC7C,GAAG,CAAC;YACF,EAAE,EAAE,eAAe;YACnB,OAAO,EAAE,UAAU;YACnB,MAAM,EAAE,MAAM;YACd,KAAK,EAAE,YAAY;gBACjB,CAAC,CAAC,gCAAgC;gBAClC,CAAC,CAAC,4BAA4B;YAChC,IAAI,EAAE,uEAAuE;YAC7E,UAAU,EAAE,aAAa;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAC3D,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,CAAC;QACH,WAAW,GAAG,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAC9C,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAChC,CAAC,MAAM,CAAC;IACX,CAAC;IAAC,MAAM,CAAC;QACP,qCAAqC;IACvC,CAAC;IACD,GAAG,CAAC;QACF,EAAE,EAAE,SAAS;QACb,OAAO,EAAE,UAAU;QACnB,MAAM,EAAE,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;QACvC,KAAK,EACH,WAAW,GAAG,CAAC;YACb,CAAC,CAAC,8BAA8B,WAAW,GAAG;YAC9C,CAAC,CAAC,sBAAsB;QAC5B,GAAG,CAAC,WAAW,GAAG,CAAC;YACjB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC;gBACE,IAAI,EAAE,4CAA4C;gBAClD,UAAU,EAAE,oBAAoB;aACjC,CAAC;KACP,CAAC,CAAC;IAEH,IAAI,SAAS,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CACxB,SAAS,CAAC,IAAI,CAAC,EACf,WAAW,EACX,OAAO,CAAC,OAAO,EACf,eAAe,CAChB,CAAC;QACF,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC1C,GAAG,CAAC;YACF,EAAE,EAAE,UAAU;YACd,OAAO,EAAE,UAAU;YACnB,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;YAClC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,kBAAkB;YAChE,GAAG,CAAC,UAAU;gBACZ,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC;oBACE,IAAI,EAAE,gFAAgF;iBACvF,CAAC;SACP,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,4EAA4E;AAE5E,SAAS,aAAa,CACpB,GAAiC,EACjC,cAA+D,EAC/D,OAAgB;IAEhB,IAAI,OAAO,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QAC5C,GAAG,CAAC;YACF,EAAE,EAAE,UAAU;YACd,OAAO,EAAE,UAAU;YACnB,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,oCAAoC;SAC5C,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;QACpC,MAAM,QAAQ,GACZ,MAAM,CAAC,aAAa,KAAK,IAAI;YAC3B,CAAC,CAAC,cAAc;YAChB,CAAC,CAAC,MAAM,CAAC,aAAa;gBACpB,CAAC,CAAC,YAAY;gBACd,CAAC,CAAC,cAAc,CAAC;QACvB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YACtB,GAAG,CAAC;gBACF,EAAE,EAAE,WAAW,MAAM,CAAC,OAAO,EAAE;gBAC/B,OAAO,EAAE,UAAU;gBACnB,MAAM,EAAE,MAAM;gBACd,KAAK,EAAE,GAAG,MAAM,CAAC,OAAO,cAAc;gBACtC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjD,UAAU,EACR,6EAA6E;aAChF,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,MAAM,CAAC,aAAa,KAAK,KAAK,EAAE,CAAC;YAC1C,GAAG,CAAC;gBACF,EAAE,EAAE,WAAW,MAAM,CAAC,OAAO,EAAE;gBAC/B,OAAO,EAAE,UAAU;gBACnB,MAAM,EAAE,MAAM;gBACd,KAAK,EAAE,GAAG,MAAM,CAAC,OAAO,0BAA0B;gBAClD,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjD,UAAU,EAAE,cAAc;aAC3B,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,GAAG,CAAC;gBACF,EAAE,EAAE,WAAW,MAAM,CAAC,OAAO,EAAE;gBAC/B,OAAO,EAAE,UAAU;gBACnB,MAAM,EAAE,IAAI;gBACZ,KAAK,EAAE,GAAG,MAAM,CAAC,OAAO,eAAe,QAAQ,EAAE;aAClD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;AACH,CAAC;AAED,4EAA4E;AAE5E,KAAK,UAAU,aAAa,CAC1B,GAAiC,EACjC,IAAY;IAEZ,wEAAwE;IACxE,uEAAuE;IACvE,sBAAsB;IACtB,IAAI,WAA+B,CAAC;IACpC,IAAI,CAAC;QACH,WAAW,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC;IAAC,MAAM,CAAC;QACP,WAAW,GAAG,SAAS,CAAC,CAAC,qCAAqC;IAChE,CAAC;IACD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;QAC9B,GAAG,CAAC;YACF,EAAE,EAAE,mBAAmB;YACvB,OAAO,EAAE,SAAS;YAClB,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,qCAAqC;SAC7C,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAA8B,CAAC;YACpE,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CAC7C,CAAC,KAAK,EAA0B,EAAE,CAChC,OAAQ,KAAuB,CAAC,IAAI,KAAK,QAAQ;gBACjD,OAAQ,KAAuB,CAAC,QAAQ,KAAK,QAAQ,CACxD,CAAC;YACF,IAAI,IAAI,GAAG,CAAC,CAAC;YACb,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,IAAI,CAAC,CAAC,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC;oBAAE,IAAI,IAAI,CAAC,CAAC;YAC/C,CAAC;YACD,GAAG,CAAC;gBACF,EAAE,EAAE,mBAAmB;gBACvB,OAAO,EAAE,SAAS;gBAClB,MAAM,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;gBAClC,KAAK,EACH,IAAI,KAAK,CAAC;oBACR,CAAC,CAAC,4BAA4B,OAAO,CAAC,MAAM,QAAQ,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,GAAG;oBACzF,CAAC,CAAC,GAAG,IAAI,gCAAgC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE;gBACvE,GAAG,CAAC,IAAI,KAAK,CAAC;oBACZ,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC;wBACE,IAAI,EAAE,6EAA6E;qBACpF,CAAC;aACP,CAAC,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACP,GAAG,CAAC;gBACF,EAAE,EAAE,mBAAmB;gBACvB,OAAO,EAAE,SAAS;gBAClB,MAAM,EAAE,MAAM;gBACd,KAAK,EAAE,8BAA8B;gBACrC,IAAI,EAAE,wEAAwE;aAC/E,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACrE,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAChD,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,GAAG,CAAC;YACF,EAAE,EAAE,iBAAiB;YACrB,OAAO,EAAE,SAAS;YAClB,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,6BAA6B,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW;SACzF,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAI,KAA+B,CAAC,IAAI,KAAK,QAAQ,CAAC;QACnE,GAAG,CAAC;YACF,EAAE,EAAE,iBAAiB;YACrB,OAAO,EAAE,SAAS;YAClB,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;YAC/B,KAAK,EAAE,OAAO;gBACZ,CAAC,CAAC,yBAAyB;gBAC3B,CAAC,CAAC,iCAAiC;YACrC,GAAG,CAAC,OAAO;gBACT,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,EAAE,IAAI,EAAE,0DAA0D,EAAE,CAAC;SAC1E,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,4EAA4E;AAE5E,KAAK,UAAU,MAAM,CAAC,MAAc;IAClC,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,EAAU;IAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC;IACxC,IAAI,OAAO,GAAG,EAAE;QAAE,OAAO,GAAG,OAAO,GAAG,CAAC;IACvC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;IACvC,OAAO,GAAG,KAAK,KAAK,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;AAC/D,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type { AgentSettingsClient } from "../api/agent-settings.js";
|
|
2
2
|
import type { IdentityClient, Organization } from "../api/identity.js";
|
|
3
3
|
import { type Agent, type AgentVersion, type ManagementClient, type Project } from "../api/management.js";
|
|
4
|
-
import type { NetworkClient } from "../api/network.js";
|
|
5
4
|
import { type Context, type ProjectBinding } from "../config/index.js";
|
|
6
5
|
export declare function listOrganizations(identity: IdentityClient): Promise<Organization[]>;
|
|
7
6
|
export declare function useOrganization(context: Context, identity: IdentityClient, organizationId: string): Promise<{
|
|
@@ -23,48 +22,30 @@ export declare function listAgents(context: Context, management: ManagementClien
|
|
|
23
22
|
results: Agent[];
|
|
24
23
|
}>;
|
|
25
24
|
/**
|
|
26
|
-
*
|
|
27
|
-
*
|
|
28
|
-
*
|
|
29
|
-
*
|
|
30
|
-
*
|
|
31
|
-
*/
|
|
32
|
-
export declare const TEMPLATE_AGENT_ID = "6a63896e1bd618f292ba6684";
|
|
33
|
-
/** The two services `createAgent` drives, in the order it touches them. */
|
|
34
|
-
export interface AgentCreateClients {
|
|
35
|
-
agentSettings: AgentSettingsClient;
|
|
36
|
-
network: NetworkClient;
|
|
37
|
-
}
|
|
38
|
-
/**
|
|
39
|
-
* Create an agent by running the clone-from-template sequence the console
|
|
40
|
-
* needs, against agent-settings and the network service directly. It is
|
|
41
|
-
* step-for-step what apollo-api's create endpoint does internally — the only
|
|
42
|
-
* difference is that the template is named here rather than resolved from a
|
|
43
|
-
* category:
|
|
25
|
+
* Create an agent through apollo's management surface — one POST; apollo owns
|
|
26
|
+
* the whole server-side sequence (scoping, seeding, publish/activate when a
|
|
27
|
+
* template is involved) and enforces real permissions on the way in, which is
|
|
28
|
+
* why the console no longer runs the clone sequence against the v1 services
|
|
29
|
+
* itself.
|
|
44
30
|
*
|
|
45
|
-
*
|
|
46
|
-
*
|
|
47
|
-
*
|
|
48
|
-
*
|
|
49
|
-
*
|
|
50
|
-
*
|
|
51
|
-
* the bundle, the build bundle and the evaluation scores into the agent;
|
|
52
|
-
* 5. publish that draft and activate it, so the agent answers immediately;
|
|
53
|
-
* 6. draft again off the published version — the mutable copy authoring
|
|
54
|
-
* edits, and the tag a fresh checkout binds.
|
|
31
|
+
* `options.runtimeVersion` picks the engine and is required: the console
|
|
32
|
+
* always resolves the newest published runtime first, so the create lands on
|
|
33
|
+
* apollo's runtime-v2 path — an agent anchored directly on its project (none
|
|
34
|
+
* of the v1 scoping tiers), seeded with one empty editable draft (the tag the
|
|
35
|
+
* fresh checkout binds). The agent has no live version until the first
|
|
36
|
+
* push + publish.
|
|
55
37
|
*
|
|
56
|
-
* `options.
|
|
57
|
-
*
|
|
58
|
-
* it the clone inherits the template's own runtime — whatever build that
|
|
59
|
-
* template was last pushed against, which is how a new agent ends up
|
|
60
|
-
* recorded on an engine the catalog no longer offers.
|
|
38
|
+
* `options.fromTemplate` names an explicit clone source instead of the empty
|
|
39
|
+
* draft; the agent then goes live on the template's content immediately.
|
|
61
40
|
*
|
|
62
|
-
*
|
|
63
|
-
*
|
|
64
|
-
* because a blind re-run would allocate a second network and a second agent.
|
|
41
|
+
* A seed failure past the create is annotated by the server — the agent id
|
|
42
|
+
* is in the message — and surfaces verbatim, so it is never retried blindly.
|
|
65
43
|
*/
|
|
66
|
-
export declare function createAgent(context: Context, clients:
|
|
67
|
-
|
|
44
|
+
export declare function createAgent(context: Context, clients: {
|
|
45
|
+
management: ManagementClient;
|
|
46
|
+
}, name: string, options: {
|
|
47
|
+
fromTemplate?: string;
|
|
48
|
+
runtimeVersion: string;
|
|
68
49
|
}): Promise<Agent>;
|
|
69
50
|
export declare function bindAgent(context: Context, agent: Agent, cwd: string, options?: {
|
|
70
51
|
versionTag?: string;
|
|
@@ -2,7 +2,7 @@ import { homedir } from "node:os";
|
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { findLiveVersion, } from "../api/management.js";
|
|
4
4
|
import { patchBinding, setDefaultProject, writeBinding, } from "../config/index.js";
|
|
5
|
-
import {
|
|
5
|
+
import { ConfigError } from "../errors/index.js";
|
|
6
6
|
import { resolveRuntimeVersion } from "../runtime-version/index.js";
|
|
7
7
|
/**
|
|
8
8
|
* Patch the checkout's existing `.apollorc`. Bindings are never invented in
|
|
@@ -80,140 +80,34 @@ export async function listAgents(context, management, name) {
|
|
|
80
80
|
return management.listAgents(context.projectId, name);
|
|
81
81
|
}
|
|
82
82
|
/**
|
|
83
|
-
*
|
|
84
|
-
*
|
|
85
|
-
*
|
|
86
|
-
*
|
|
87
|
-
*
|
|
88
|
-
*/
|
|
89
|
-
export const TEMPLATE_AGENT_ID = "6a63896e1bd618f292ba6684";
|
|
90
|
-
/**
|
|
91
|
-
* Project an agent-settings record onto the published agent shape, the same
|
|
92
|
-
* way apollo-api does: the id is the record's own, `project_id` is the scope's
|
|
93
|
-
* account and `live_version_id` carries the active *tag* (REPORTS-26).
|
|
94
|
-
*/
|
|
95
|
-
function agentFromRecord(record, projectId) {
|
|
96
|
-
return {
|
|
97
|
-
id: record.id,
|
|
98
|
-
project_id: record.scope.account_id ?? projectId,
|
|
99
|
-
name: record.name,
|
|
100
|
-
...(record.active_version_tag === undefined
|
|
101
|
-
? {}
|
|
102
|
-
: { live_version_id: record.active_version_tag }),
|
|
103
|
-
created_at: record.created_at,
|
|
104
|
-
updated_at: record.updated_at,
|
|
105
|
-
};
|
|
106
|
-
}
|
|
107
|
-
/**
|
|
108
|
-
* Create an agent by running the clone-from-template sequence the console
|
|
109
|
-
* needs, against agent-settings and the network service directly. It is
|
|
110
|
-
* step-for-step what apollo-api's create endpoint does internally — the only
|
|
111
|
-
* difference is that the template is named here rather than resolved from a
|
|
112
|
-
* category:
|
|
83
|
+
* Create an agent through apollo's management surface — one POST; apollo owns
|
|
84
|
+
* the whole server-side sequence (scoping, seeding, publish/activate when a
|
|
85
|
+
* template is involved) and enforces real permissions on the way in, which is
|
|
86
|
+
* why the console no longer runs the clone sequence against the v1 services
|
|
87
|
+
* itself.
|
|
113
88
|
*
|
|
114
|
-
*
|
|
115
|
-
*
|
|
116
|
-
*
|
|
117
|
-
*
|
|
118
|
-
*
|
|
119
|
-
*
|
|
120
|
-
* the bundle, the build bundle and the evaluation scores into the agent;
|
|
121
|
-
* 5. publish that draft and activate it, so the agent answers immediately;
|
|
122
|
-
* 6. draft again off the published version — the mutable copy authoring
|
|
123
|
-
* edits, and the tag a fresh checkout binds.
|
|
89
|
+
* `options.runtimeVersion` picks the engine and is required: the console
|
|
90
|
+
* always resolves the newest published runtime first, so the create lands on
|
|
91
|
+
* apollo's runtime-v2 path — an agent anchored directly on its project (none
|
|
92
|
+
* of the v1 scoping tiers), seeded with one empty editable draft (the tag the
|
|
93
|
+
* fresh checkout binds). The agent has no live version until the first
|
|
94
|
+
* push + publish.
|
|
124
95
|
*
|
|
125
|
-
* `options.
|
|
126
|
-
*
|
|
127
|
-
* it the clone inherits the template's own runtime — whatever build that
|
|
128
|
-
* template was last pushed against, which is how a new agent ends up
|
|
129
|
-
* recorded on an engine the catalog no longer offers.
|
|
96
|
+
* `options.fromTemplate` names an explicit clone source instead of the empty
|
|
97
|
+
* draft; the agent then goes live on the template's content immediately.
|
|
130
98
|
*
|
|
131
|
-
*
|
|
132
|
-
*
|
|
133
|
-
* because a blind re-run would allocate a second network and a second agent.
|
|
99
|
+
* A seed failure past the create is annotated by the server — the agent id
|
|
100
|
+
* is in the message — and surfaces verbatim, so it is never retried blindly.
|
|
134
101
|
*/
|
|
135
|
-
export async function createAgent(context, clients, name,
|
|
102
|
+
export async function createAgent(context, clients, name, options) {
|
|
136
103
|
const projectId = context.projectId;
|
|
137
104
|
if (!projectId)
|
|
138
105
|
throw new ConfigError("Select a project first.");
|
|
139
|
-
|
|
140
|
-
if (!organizationId) {
|
|
141
|
-
throw new ConfigError("Select an organization first.", "Run `apollo org use` and try again.");
|
|
142
|
-
}
|
|
143
|
-
// Stamped as created_by/published_by on every record the sequence writes.
|
|
144
|
-
const userId = context.userId;
|
|
145
|
-
if (!userId) {
|
|
146
|
-
throw new AuthError("The stored credential has no user id.", "Run `apollo login` again to refresh it.");
|
|
147
|
-
}
|
|
148
|
-
// Everything below is checked here rather than left to the server: past the
|
|
149
|
-
// network call these would each fail with an agent already created.
|
|
150
|
-
const template = await clients.agentSettings.getAgent(templateAgentId);
|
|
151
|
-
if (template.kind !== "template") {
|
|
152
|
-
throw new ConfigError(`Agent ${templateAgentId} is not a template (kind=${template.kind}).`, "Pass a template agent's id with --template.");
|
|
153
|
-
}
|
|
154
|
-
const categoryId = template.scope.network_category_id;
|
|
155
|
-
if (!categoryId) {
|
|
156
|
-
throw new ConfigError(`Template ${template.name} has no category scope to create the agent in.`, "Pass a different template agent's id with --template.");
|
|
157
|
-
}
|
|
158
|
-
// The clone reads the template's *active* version, not its latest.
|
|
159
|
-
if (!template.active_version_id) {
|
|
160
|
-
throw new ConfigError(`Template ${template.name} has no active version to clone.`, "Publish and activate a version on the template, or pass --template <id>.");
|
|
161
|
-
}
|
|
162
|
-
const network = await clients.network.create({
|
|
163
|
-
name,
|
|
164
|
-
organizationId,
|
|
165
|
-
accountId: projectId,
|
|
166
|
-
categoryId,
|
|
167
|
-
});
|
|
168
|
-
const created = await clients.agentSettings.createAgent({
|
|
106
|
+
return clients.management.createAgent(projectId, {
|
|
169
107
|
name,
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
network_id: network.id,
|
|
173
|
-
account_id: projectId,
|
|
174
|
-
organization_id: organizationId,
|
|
175
|
-
network_category_id: categoryId,
|
|
176
|
-
},
|
|
177
|
-
kind: "regular",
|
|
178
|
-
bundleMode: true,
|
|
179
|
-
createdBy: userId,
|
|
180
|
-
agentMetadata: template.agent_metadata ?? {},
|
|
108
|
+
...(options.fromTemplate ? { fromTemplate: options.fromTemplate } : {}),
|
|
109
|
+
runtimeVersion: options.runtimeVersion,
|
|
181
110
|
});
|
|
182
|
-
try {
|
|
183
|
-
const imported = await clients.agentSettings.createDraft(created.id, {
|
|
184
|
-
source: "template",
|
|
185
|
-
fromTemplate: template.id,
|
|
186
|
-
label: "Template Import",
|
|
187
|
-
notes: `Imported from template ${template.name}`,
|
|
188
|
-
createdBy: userId,
|
|
189
|
-
...(options.runtimeVersion
|
|
190
|
-
? { runtimeVersion: options.runtimeVersion }
|
|
191
|
-
: {}),
|
|
192
|
-
});
|
|
193
|
-
await clients.agentSettings.publishVersion(created.id, imported.id, userId);
|
|
194
|
-
const live = await clients.agentSettings.activateVersion(created.id, imported.id);
|
|
195
|
-
// The seeded draft clones the version above, so it inherits the runtime
|
|
196
|
-
// already stamped there — passed again so the two never disagree if that
|
|
197
|
-
// clone ever stops carrying it.
|
|
198
|
-
await clients.agentSettings.createDraft(created.id, {
|
|
199
|
-
source: "version",
|
|
200
|
-
fromVersion: imported.id,
|
|
201
|
-
label: "Initial Version",
|
|
202
|
-
notes: "Initial Version",
|
|
203
|
-
createdBy: userId,
|
|
204
|
-
...(options.runtimeVersion
|
|
205
|
-
? { runtimeVersion: options.runtimeVersion }
|
|
206
|
-
: {}),
|
|
207
|
-
});
|
|
208
|
-
return agentFromRecord(live, projectId);
|
|
209
|
-
}
|
|
210
|
-
catch (error) {
|
|
211
|
-
throw new CliError(`Agent ${created.name} (${created.id}) was created, but seeding its first version from ${template.name} failed: ${error instanceof Error ? error.message : String(error)}`, {
|
|
212
|
-
code: "AGENT_SEED_FAILED",
|
|
213
|
-
cause: error,
|
|
214
|
-
suggestion: `Do not re-run create — it would allocate a second agent. Recover with \`apollo agent import ${created.id}\` or seed a version with \`apollo version create --template ${template.id}\`.`,
|
|
215
|
-
});
|
|
216
|
-
}
|
|
217
111
|
}
|
|
218
112
|
export async function bindAgent(context, agent, cwd, options = {}) {
|
|
219
113
|
const binding = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hierarchy.js","sourceRoot":"","sources":["../../../src/services/hierarchy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,OAAO,EACL,eAAe,GAKhB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"hierarchy.js","sourceRoot":"","sources":["../../../src/services/hierarchy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Vault secrets service — name + scope based management of user-owned
|
|
3
|
-
* secrets.
|
|
4
|
-
* agent-settings own storage
|
|
5
|
-
* there, so name-based
|
|
3
|
+
* secrets. Apollo-api's internal management proxy
|
|
4
|
+
* (`/internal/management/v1/vault/secrets`) and agent-settings own storage
|
|
5
|
+
* and encryption; get/delete/rotate are id-based there, so name-based
|
|
6
|
+
* operations resolve through the list first.
|
|
6
7
|
*
|
|
7
|
-
* Values only ever travel in the create body. Every read is
|
|
8
|
-
* a masked `preview`, so no output here needs masking.
|
|
8
|
+
* Values only ever travel in the create or rotate body. Every read is
|
|
9
|
+
* metadata plus a masked `preview`, so no output here needs masking.
|
|
9
10
|
*
|
|
10
11
|
* Scope levels: `agent` > `project` > `org` — resolution at runtime picks
|
|
11
12
|
* the most specific name. Wire vocabulary stays inside `api/vault.ts`.
|
|
@@ -30,7 +31,7 @@ export interface SetSecretParams {
|
|
|
30
31
|
level: VaultScopeLevel;
|
|
31
32
|
description?: string;
|
|
32
33
|
}
|
|
33
|
-
/** Create or rotate (
|
|
34
|
+
/** Create (POST) or rotate (PATCH by id) a secret at this name + scope. */
|
|
34
35
|
export declare function setSecret(context: Context, params: SetSecretParams, options?: VaultServiceOptions): Promise<VaultSecret>;
|
|
35
36
|
/** Secrets visible from the current scope chain, masked, sorted by name. */
|
|
36
37
|
export declare function listSecrets(context: Context, options?: VaultServiceOptions): Promise<VaultSecret[]>;
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Vault secrets service — name + scope based management of user-owned
|
|
3
|
-
* secrets.
|
|
4
|
-
* agent-settings own storage
|
|
5
|
-
* there, so name-based
|
|
3
|
+
* secrets. Apollo-api's internal management proxy
|
|
4
|
+
* (`/internal/management/v1/vault/secrets`) and agent-settings own storage
|
|
5
|
+
* and encryption; get/delete/rotate are id-based there, so name-based
|
|
6
|
+
* operations resolve through the list first.
|
|
6
7
|
*
|
|
7
|
-
* Values only ever travel in the create body. Every read is
|
|
8
|
-
* a masked `preview`, so no output here needs masking.
|
|
8
|
+
* Values only ever travel in the create or rotate body. Every read is
|
|
9
|
+
* metadata plus a masked `preview`, so no output here needs masking.
|
|
9
10
|
*
|
|
10
11
|
* Scope levels: `agent` > `project` > `org` — resolution at runtime picks
|
|
11
12
|
* the most specific name. Wire vocabulary stays inside `api/vault.ts`.
|
|
@@ -54,7 +55,7 @@ export function buildVaultScope(level, context) {
|
|
|
54
55
|
}
|
|
55
56
|
return vaultScopeFor(level, scopeIds(context));
|
|
56
57
|
}
|
|
57
|
-
/** Create or rotate (
|
|
58
|
+
/** Create (POST) or rotate (PATCH by id) a secret at this name + scope. */
|
|
58
59
|
export async function setSecret(context, params, options = {}) {
|
|
59
60
|
validateSecretName(params.name);
|
|
60
61
|
if (!params.value) {
|
|
@@ -66,6 +67,15 @@ export async function setSecret(context, params, options = {}) {
|
|
|
66
67
|
// buildVaultScope validates the level's id is present; agent-level writes
|
|
67
68
|
// carry the agent id itself instead of a scope object.
|
|
68
69
|
const scope = buildVaultScope(params.level, context);
|
|
70
|
+
const vault = clientsFor(context, options).vault;
|
|
71
|
+
const existing = (await vault.listSecrets(scopeIds(context))).find((secret) => secret.name === params.name && vaultScopeLevelOf(secret.scope) === params.level);
|
|
72
|
+
if (existing) {
|
|
73
|
+
return vault.updateSecret(existing.id, {
|
|
74
|
+
updated_by: context.userId,
|
|
75
|
+
value: params.value,
|
|
76
|
+
...(params.description ? { description: params.description } : {}),
|
|
77
|
+
});
|
|
78
|
+
}
|
|
69
79
|
const body = {
|
|
70
80
|
name: params.name,
|
|
71
81
|
value: params.value,
|
|
@@ -74,7 +84,7 @@ export async function setSecret(context, params, options = {}) {
|
|
|
74
84
|
created_by: context.userId,
|
|
75
85
|
updated_by: context.userId,
|
|
76
86
|
};
|
|
77
|
-
return
|
|
87
|
+
return vault.createSecret(body);
|
|
78
88
|
}
|
|
79
89
|
/** Secrets visible from the current scope chain, masked, sorted by name. */
|
|
80
90
|
export async function listSecrets(context, options = {}) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vault.js","sourceRoot":"","sources":["../../../src/services/vault.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"vault.js","sourceRoot":"","sources":["../../../src/services/vault.ts"],"names":[],"mappings":"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"}
|