@aeolus-fleet/trierarch-plugin 0.30.0 → 0.32.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 +6 -3
- package/dist/adapters/fleet/core-version.d.ts +12 -3
- package/dist/adapters/fleet/core-version.js +22 -6
- package/dist/adapters/fleet/core-version.js.map +1 -1
- package/dist/adapters/fleet/rest-fleet-door.js +10 -0
- package/dist/adapters/fleet/rest-fleet-door.js.map +1 -1
- package/dist/adapters/prisma/enabled-models.d.ts +4 -0
- package/dist/adapters/prisma/enabled-models.js +14 -0
- package/dist/adapters/prisma/enabled-models.js.map +1 -0
- package/dist/adapters/prisma/fleet-forgetter.d.ts +1 -1
- package/dist/adapters/prisma/fleet-forgetter.js +2 -2
- package/dist/adapters/prisma/fleet-forgetter.js.map +1 -1
- package/dist/adapters/prisma/generated/browser.d.ts +7 -0
- package/dist/adapters/prisma/generated/client.d.ts +7 -0
- package/dist/adapters/prisma/generated/internal/class.d.ts +11 -0
- package/dist/adapters/prisma/generated/internal/class.js +4 -4
- package/dist/adapters/prisma/generated/internal/class.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.d.ts +82 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +6 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +6 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +6 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/EnabledModel.d.ts +920 -0
- package/dist/adapters/prisma/generated/models/EnabledModel.js +2 -0
- package/dist/adapters/prisma/generated/models/EnabledModel.js.map +1 -0
- package/dist/adapters/prisma/generated/models.d.ts +1 -0
- package/dist/adapters/trpc/router.d.ts +125 -0
- package/dist/adapters/trpc/router.js +15 -1
- package/dist/adapters/trpc/router.js.map +1 -1
- package/dist/app.d.ts +3 -0
- package/dist/app.js +41 -4
- package/dist/app.js.map +1 -1
- package/dist/bin/aeolus-trierarch-plugin.js +1 -0
- package/dist/bin/aeolus-trierarch-plugin.js.map +1 -1
- package/dist/config.d.ts +3 -0
- package/dist/config.js +18 -0
- package/dist/config.js.map +1 -1
- package/dist/core/assignment/assign-crews.d.ts +4 -1
- package/dist/core/assignment/assign-crews.js +4 -2
- package/dist/core/assignment/assign-crews.js.map +1 -1
- package/dist/core/assignment/check-crew-settings.d.ts +4 -2
- package/dist/core/assignment/check-crew-settings.js +3 -3
- package/dist/core/assignment/check-crew-settings.js.map +1 -1
- package/dist/core/assignment/placement.d.ts +14 -3
- package/dist/core/assignment/placement.js +48 -11
- package/dist/core/assignment/placement.js.map +1 -1
- package/dist/core/connection/ports.d.ts +7 -0
- package/dist/core/installation/ports.d.ts +2 -1
- package/dist/core/machines/join-machine.d.ts +2 -1
- package/dist/core/machines/join-machine.js +4 -2
- package/dist/core/machines/join-machine.js.map +1 -1
- package/dist/core/models/list-enabled-models.d.ts +7 -0
- package/dist/core/models/list-enabled-models.js +5 -0
- package/dist/core/models/list-enabled-models.js.map +1 -0
- package/dist/core/models/ports.d.ts +11 -0
- package/dist/core/models/ports.js +2 -0
- package/dist/core/models/ports.js.map +1 -0
- package/dist/core/models/set-model-enabled.d.ts +15 -0
- package/dist/core/models/set-model-enabled.js +12 -0
- package/dist/core/models/set-model-enabled.js.map +1 -0
- package/dist/core/operator/authenticate-operator.d.ts +2 -2
- package/dist/core/operator/ports.d.ts +2 -2
- package/dist/core/repositories/resend-trusted-repositories.d.ts +15 -0
- package/dist/core/repositories/resend-trusted-repositories.js +19 -0
- package/dist/core/repositories/resend-trusted-repositories.js.map +1 -0
- package/dist/core/repositories/share-trusted-repositories.d.ts +25 -0
- package/dist/core/repositories/share-trusted-repositories.js +45 -0
- package/dist/core/repositories/share-trusted-repositories.js.map +1 -0
- package/dist/core/repositories/trusted-repositories.d.ts +22 -0
- package/dist/core/repositories/trusted-repositories.js +91 -0
- package/dist/core/repositories/trusted-repositories.js.map +1 -0
- package/package.json +3 -3
- package/src/adapters/prisma/migrations/20261025100000_enabled_models/migration.sql +7 -0
- package/src/adapters/prisma/schema.prisma +13 -1
|
@@ -4,8 +4,8 @@ import { checkPlacement } from './placement.js';
|
|
|
4
4
|
import { readPlacement } from './read-placement.js';
|
|
5
5
|
/**
|
|
6
6
|
* Use case: whether crew settings would be placed now, before a request is
|
|
7
|
-
* made (#245): read the fleet's trierarchs
|
|
8
|
-
* settings by placement's rules. It writes nothing; the request itself goes
|
|
7
|
+
* made (#245): read the fleet's trierarchs and enabled models as assignment
|
|
8
|
+
* does, and check the settings by placement's rules. It writes nothing; the request itself goes
|
|
9
9
|
* to the fleet, and assignment places it as always.
|
|
10
10
|
*/
|
|
11
11
|
export function createCheckCrewSettings(deps) {
|
|
@@ -18,7 +18,7 @@ export function createCheckCrewSettings(deps) {
|
|
|
18
18
|
if (!read.isOk) {
|
|
19
19
|
return refuse('FLEET_UNAVAILABLE', `The fleet did not answer the check: ${read.error.message}`);
|
|
20
20
|
}
|
|
21
|
-
return ok(checkPlacement(settings, read.value.trierarchs));
|
|
21
|
+
return ok(checkPlacement(settings, { trierarchs: read.value.trierarchs, enabledModels: await deps.models.list(fleetId) }));
|
|
22
22
|
};
|
|
23
23
|
}
|
|
24
24
|
//# sourceMappingURL=check-crew-settings.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-crew-settings.js","sourceRoot":"","sources":["../../../src/core/assignment/check-crew-settings.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"check-crew-settings.js","sourceRoot":"","sources":["../../../src/core/assignment/check-crew-settings.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAuB,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIpD;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CAAC,IAAmH;IACzJ,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;QACjC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,MAAM,CAAC,eAAe,EAAE,gFAAgF,CAAC,CAAC;QACnH,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QACrI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,MAAM,CAAC,mBAAmB,EAAE,uCAAuC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAClG,CAAC;QACD,OAAO,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7H,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -22,6 +22,15 @@ export interface PlacementTrierarch {
|
|
|
22
22
|
/** The label values its ship carries, every owner's: what a request's machine labels match (#102). */
|
|
23
23
|
labelValueIds: readonly string[];
|
|
24
24
|
}
|
|
25
|
+
/**
|
|
26
|
+
* What placement places by: the fleet's trierarchs as they are now, and the
|
|
27
|
+
* fleet's enabled models (model governance, M1): exact model ids, none being
|
|
28
|
+
* no rule.
|
|
29
|
+
*/
|
|
30
|
+
export interface PlacementFleet {
|
|
31
|
+
trierarchs: readonly PlacementTrierarch[];
|
|
32
|
+
enabledModels: readonly string[];
|
|
33
|
+
}
|
|
25
34
|
/** What placement decides for a request: the trierarch to claim it for, or why none fits. */
|
|
26
35
|
export type Placement = {
|
|
27
36
|
kind: 'assign';
|
|
@@ -51,14 +60,16 @@ export type PlacementCheck = {
|
|
|
51
60
|
* Policy: whether settings would be placed now, before anything is requested
|
|
52
61
|
* (#245): by the same rules as placement, against the trierarchs as they are.
|
|
53
62
|
*/
|
|
54
|
-
export declare function checkPlacement(settings: unknown,
|
|
63
|
+
export declare function checkPlacement(settings: unknown, fleet: PlacementFleet): PlacementCheck;
|
|
55
64
|
/**
|
|
56
65
|
* Policy: where each unassigned request goes (docs/trierarch.md,
|
|
57
|
-
* "Assignment"). Oldest request first
|
|
66
|
+
* "Assignment"). Oldest request first; in a fleet that enabled models, only
|
|
67
|
+
* a request whose model is enabled, or that names none and runs on an enabled
|
|
68
|
+
* default (model governance, M3). Each to a trierarch whose ship
|
|
58
69
|
* carries every machine label it names, that offers its harness and workspace, takes its options against the schema it reports for
|
|
59
70
|
* that harness, did not give it back (#382), and has room (its cap above the requests assigned to it);
|
|
60
71
|
* of those, the most room as a share of its cap, then the oldest. What it
|
|
61
72
|
* assigns counts against the room of later requests in the same pass. A
|
|
62
73
|
* request none fits gets the reason, unless that reason is written already.
|
|
63
74
|
*/
|
|
64
|
-
export declare function place(requests: readonly PlacementRequest[], trierarchs:
|
|
75
|
+
export declare function place(requests: readonly PlacementRequest[], { trierarchs, enabledModels }: PlacementFleet): Placement[];
|
|
@@ -34,6 +34,29 @@ function offersWorkspace(details, workspace) {
|
|
|
34
34
|
function workspaceName(workspace) {
|
|
35
35
|
return workspace.kind === 'worktree' ? `repository ${workspace.repository}` : `folder ${workspace.name}`;
|
|
36
36
|
}
|
|
37
|
+
/** A harness options schema that reports a default model (`properties.model.default`). */
|
|
38
|
+
const defaultModelSchema = z.object({ properties: z.object({ model: z.object({ default: z.string() }) }) });
|
|
39
|
+
/** Whether the harness reports a default model and the fleet enabled it: a harness with no default or no model option does not. */
|
|
40
|
+
function isDefaultEnabled(schema, enabledModels) {
|
|
41
|
+
const read = defaultModelSchema.safeParse(schema);
|
|
42
|
+
return read.success && enabledModels.includes(read.data.properties.model.default);
|
|
43
|
+
}
|
|
44
|
+
/** Why a request waits on a model the fleet did not enable, within what a reason may hold. */
|
|
45
|
+
function modelDisabledReason(what) {
|
|
46
|
+
return `model disabled: ${what}`.slice(0, CREW_REQUEST_REASON_MAX_LENGTH);
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Why a request naming a model the fleet did not enable waits, or undefined
|
|
50
|
+
* when the fleet has no rule or the model is enabled (M3): checked before any
|
|
51
|
+
* trierarch.
|
|
52
|
+
*/
|
|
53
|
+
function namedModelRefusal(settings, enabledModels) {
|
|
54
|
+
const named = settings.options.model;
|
|
55
|
+
if (enabledModels.length === 0 || named === undefined || (typeof named === 'string' && enabledModels.includes(named))) {
|
|
56
|
+
return undefined;
|
|
57
|
+
}
|
|
58
|
+
return { reason: modelDisabledReason(typeof named === 'string' ? named : JSON.stringify(named)), field: 'options' };
|
|
59
|
+
}
|
|
37
60
|
/** Room left as a share of its cap: what placement compares. */
|
|
38
61
|
function roomShare(trierarch) {
|
|
39
62
|
return (trierarch.details.caps.ships - trierarch.assigned) / trierarch.details.caps.ships;
|
|
@@ -44,11 +67,17 @@ function givenBackReason(givenBack) {
|
|
|
44
67
|
return `given back by every trierarch that fits; last: ${last}`.slice(0, CREW_REQUEST_REASON_MAX_LENGTH);
|
|
45
68
|
}
|
|
46
69
|
/**
|
|
47
|
-
* The trierarch to claim for the settings, or why none fits:
|
|
48
|
-
*
|
|
49
|
-
*
|
|
70
|
+
* The trierarch to claim for the settings, or why none fits: a named model
|
|
71
|
+
* the fleet did not enable, first (M3); machine labels, harness (the named
|
|
72
|
+
* one, or each trierarch's default), workspace, options; an enabled default
|
|
73
|
+
* model for a request naming none; then the trierarchs that gave the request
|
|
74
|
+
* back (#382), then room.
|
|
50
75
|
*/
|
|
51
|
-
function fit(settings, { trierarchs, givenBack }) {
|
|
76
|
+
function fit(settings, { trierarchs, enabledModels, givenBack }) {
|
|
77
|
+
const disabled = namedModelRefusal(settings, enabledModels);
|
|
78
|
+
if (disabled !== undefined) {
|
|
79
|
+
return disabled;
|
|
80
|
+
}
|
|
52
81
|
if (trierarchs.length === 0) {
|
|
53
82
|
return { reason: 'no trierarch reports yet' };
|
|
54
83
|
}
|
|
@@ -72,13 +101,18 @@ function fit(settings, { trierarchs, givenBack }) {
|
|
|
72
101
|
if (withWorkspace.length === 0) {
|
|
73
102
|
return { reason: `no trierarch offering ${harnessWords} has ${workspaceName(settings.workspace)}`, field: 'workspace' };
|
|
74
103
|
}
|
|
75
|
-
const refusals = withWorkspace.map(({ trierarch, harness }) => ({ trierarch, refusal: optionsRefusal(harness.options, settings.options) }));
|
|
76
|
-
const taking = refusals.filter(({ refusal }) => refusal === undefined)
|
|
104
|
+
const refusals = withWorkspace.map(({ trierarch, harness }) => ({ trierarch, harness, refusal: optionsRefusal(harness.options, settings.options) }));
|
|
105
|
+
const taking = refusals.filter(({ refusal }) => refusal === undefined);
|
|
77
106
|
const [firstRefusal] = refusals;
|
|
78
107
|
if (taking.length === 0) {
|
|
79
108
|
return { reason: `no trierarch takes these options for ${harnessWords}: ${firstRefusal?.refusal ?? ''}`, field: 'options' };
|
|
80
109
|
}
|
|
81
|
-
|
|
110
|
+
// A request naming no model runs on the harness's default: only an enabled one fits (M3).
|
|
111
|
+
const allowed = enabledModels.length === 0 || settings.options.model !== undefined ? taking : taking.filter(({ harness }) => isDefaultEnabled(harness.options, enabledModels));
|
|
112
|
+
if (allowed.length === 0) {
|
|
113
|
+
return { reason: modelDisabledReason(`no enabled default model for ${harnessWords}`), field: 'options' };
|
|
114
|
+
}
|
|
115
|
+
const left = allowed.map(({ trierarch }) => trierarch).filter((trierarch) => !givenBack.some((back) => back.trierarchShipId === trierarch.shipId));
|
|
82
116
|
if (left.length === 0) {
|
|
83
117
|
return { reason: givenBackReason(givenBack) };
|
|
84
118
|
}
|
|
@@ -96,9 +130,9 @@ function parsed(settings) {
|
|
|
96
130
|
* Policy: whether settings would be placed now, before anything is requested
|
|
97
131
|
* (#245): by the same rules as placement, against the trierarchs as they are.
|
|
98
132
|
*/
|
|
99
|
-
export function checkPlacement(settings,
|
|
133
|
+
export function checkPlacement(settings, fleet) {
|
|
100
134
|
const read = parsed(settings);
|
|
101
|
-
const fitted = 'settings' in read ? fit(read.settings, {
|
|
135
|
+
const fitted = 'settings' in read ? fit(read.settings, { ...fleet, givenBack: [] }) : read;
|
|
102
136
|
if ('trierarch' in fitted) {
|
|
103
137
|
return { kind: 'fits' };
|
|
104
138
|
}
|
|
@@ -106,14 +140,16 @@ export function checkPlacement(settings, trierarchs) {
|
|
|
106
140
|
}
|
|
107
141
|
/**
|
|
108
142
|
* Policy: where each unassigned request goes (docs/trierarch.md,
|
|
109
|
-
* "Assignment"). Oldest request first
|
|
143
|
+
* "Assignment"). Oldest request first; in a fleet that enabled models, only
|
|
144
|
+
* a request whose model is enabled, or that names none and runs on an enabled
|
|
145
|
+
* default (model governance, M3). Each to a trierarch whose ship
|
|
110
146
|
* carries every machine label it names, that offers its harness and workspace, takes its options against the schema it reports for
|
|
111
147
|
* that harness, did not give it back (#382), and has room (its cap above the requests assigned to it);
|
|
112
148
|
* of those, the most room as a share of its cap, then the oldest. What it
|
|
113
149
|
* assigns counts against the room of later requests in the same pass. A
|
|
114
150
|
* request none fits gets the reason, unless that reason is written already.
|
|
115
151
|
*/
|
|
116
|
-
export function place(requests, trierarchs) {
|
|
152
|
+
export function place(requests, { trierarchs, enabledModels }) {
|
|
117
153
|
const assigned = new Map(trierarchs.map((trierarch) => [trierarch.shipId, trierarch.assigned]));
|
|
118
154
|
const placements = [];
|
|
119
155
|
const oldestFirst = [...requests].sort((first, second) => first.requestedAt.getTime() - second.requestedAt.getTime() || first.shipId.localeCompare(second.shipId));
|
|
@@ -121,6 +157,7 @@ export function place(requests, trierarchs) {
|
|
|
121
157
|
const read = parsed(request.settings);
|
|
122
158
|
const fitted = 'settings' in read
|
|
123
159
|
? fit(read.settings, {
|
|
160
|
+
enabledModels,
|
|
124
161
|
trierarchs: trierarchs.map((trierarch) => ({ ...trierarch, assigned: assigned.get(trierarch.shipId) ?? trierarch.assigned })),
|
|
125
162
|
givenBack: request.givenBack,
|
|
126
163
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"placement.js","sourceRoot":"","sources":["../../../src/core/assignment/placement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,8BAA8B,EAAE,yBAAyB,EAAE,gBAAgB,EAA+D,MAAM,sBAAsB,CAAC;AAChL,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"placement.js","sourceRoot":"","sources":["../../../src/core/assignment/placement.ts"],"names":[],"mappings":"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"}
|
|
@@ -171,6 +171,13 @@ export interface FleetDoor {
|
|
|
171
171
|
text: string;
|
|
172
172
|
idempotencyKey: string;
|
|
173
173
|
}): Promise<Result<undefined, FleetRefusal>>;
|
|
174
|
+
/** Sends a ship a message of the given content type, stored once under its idempotency key. */
|
|
175
|
+
send(crewToken: string, message: {
|
|
176
|
+
shipId: ShipId;
|
|
177
|
+
contentType: string;
|
|
178
|
+
payload: string;
|
|
179
|
+
idempotencyKey: string;
|
|
180
|
+
}): Promise<Result<undefined, FleetRefusal>>;
|
|
174
181
|
}
|
|
175
182
|
/** A delivery to the trierarch plugin's own ship: what tells a ping apart, and who sent it. */
|
|
176
183
|
export interface PluginDelivery {
|
|
@@ -35,7 +35,8 @@ export interface InstallationRequests {
|
|
|
35
35
|
}
|
|
36
36
|
/**
|
|
37
37
|
* Outbound port: forgets everything the trierarch plugin holds of a fleet,
|
|
38
|
-
* in one go: its connection, its switch and the requests
|
|
38
|
+
* in one go: its connection, its switch, its enabled models and the requests
|
|
39
|
+
* that name it.
|
|
39
40
|
*/
|
|
40
41
|
export interface FleetForgetter {
|
|
41
42
|
forget(fleetId: FleetId): Promise<void>;
|
|
@@ -37,7 +37,8 @@ export type JoinMachine = (input: {
|
|
|
37
37
|
* plugin commissions its trierarch's ship, of type trierarch with crew:run
|
|
38
38
|
* beside the send and receive every agent ship has, under a new idempotency
|
|
39
39
|
* key, and answers its starting prompt with one ready-to-run setup line built
|
|
40
|
-
* from the fleet's URL, the ship's id and
|
|
40
|
+
* from the fleet's URL, the ship's id and secret, and the trierarch plugin's
|
|
41
|
+
* own ship: `aeolus-trierarch init`
|
|
41
42
|
* takes them as flags and never parses a prompt. The secret is never kept or
|
|
42
43
|
* logged.
|
|
43
44
|
*/
|
|
@@ -15,7 +15,8 @@ const TRIERARCH_PACKAGE = '@aeolus-fleet/trierarch';
|
|
|
15
15
|
* plugin commissions its trierarch's ship, of type trierarch with crew:run
|
|
16
16
|
* beside the send and receive every agent ship has, under a new idempotency
|
|
17
17
|
* key, and answers its starting prompt with one ready-to-run setup line built
|
|
18
|
-
* from the fleet's URL, the ship's id and
|
|
18
|
+
* from the fleet's URL, the ship's id and secret, and the trierarch plugin's
|
|
19
|
+
* own ship: `aeolus-trierarch init`
|
|
19
20
|
* takes them as flags and never parses a prompt. The secret is never kept or
|
|
20
21
|
* logged.
|
|
21
22
|
*/
|
|
@@ -35,7 +36,8 @@ export function createJoinMachine(deps) {
|
|
|
35
36
|
: refuse('FLEET_UNAVAILABLE', `The fleet did not commission the machine's ship: ${commissioned.error.message}`);
|
|
36
37
|
}
|
|
37
38
|
const { shipId, prompt, crewLines, secret } = commissioned.value;
|
|
38
|
-
|
|
39
|
+
// The trierarch takes the trusted repositories only from this ship (aeolus-fleet#384): a ship's type proves nothing.
|
|
40
|
+
const setupLine = `npx ${TRIERARCH_PACKAGE} init --fleet-url ${deps.fleetUrl} --ship-id ${shipId} --plugin-ship-id ${crew.shipId} --secret ${secret}`;
|
|
39
41
|
return ok({ shipId, name, prompt, crewLines, secret, setupLine });
|
|
40
42
|
};
|
|
41
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"join-machine.js","sourceRoot":"","sources":["../../../src/core/machines/join-machine.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAGxD,yDAAyD;AACzD,MAAM,CAAC,MAAM,cAAc,GAAG,WAAW,CAAC;AAE1C,2GAA2G;AAC3G,MAAM,gBAAgB,GAAG,CAAC,UAAU,CAAC,CAAC;AAEtC,wDAAwD;AACxD,MAAM,iBAAiB,GAAG,yBAAyB,CAAC;AA0BpD
|
|
1
|
+
{"version":3,"file":"join-machine.js","sourceRoot":"","sources":["../../../src/core/machines/join-machine.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAGxD,yDAAyD;AACzD,MAAM,CAAC,MAAM,cAAc,GAAG,WAAW,CAAC;AAE1C,2GAA2G;AAC3G,MAAM,gBAAgB,GAAG,CAAC,UAAU,CAAC,CAAC;AAEtC,wDAAwD;AACxD,MAAM,iBAAiB,GAAG,yBAAyB,CAAC;AA0BpD;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAgG;IAChI,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;QACxC,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACpE,OAAO,MAAM,CAAC,aAAa,EAAE,2BAA2B,UAAU,EAAE,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,MAAM,CAAC,eAAe,EAAE,gFAAgF,CAAC,CAAC;QACnH,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB,EAAE,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC5J,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;YACvB,OAAO,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU;gBAC3C,CAAC,CAAC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC;gBAClD,CAAC,CAAC,MAAM,CAAC,mBAAmB,EAAE,oDAAoD,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACpH,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC;QACjE,qHAAqH;QACrH,MAAM,SAAS,GAAG,OAAO,iBAAiB,qBAAqB,IAAI,CAAC,QAAQ,cAAc,MAAM,qBAAqB,IAAI,CAAC,MAAM,aAAa,MAAM,EAAE,CAAC;QACtJ,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IACpE,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { FleetId } from '@aeolus-fleet/common';
|
|
2
|
+
import type { EnabledModels } from './ports.js';
|
|
3
|
+
export type ListEnabledModels = (fleetId: FleetId) => Promise<string[]>;
|
|
4
|
+
/** Use case: the fleet's enabled models by id (model governance, M6); none while the fleet has no rule. */
|
|
5
|
+
export declare function createListEnabledModels(deps: {
|
|
6
|
+
models: EnabledModels;
|
|
7
|
+
}): ListEnabledModels;
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
/** Use case: the fleet's enabled models by id (model governance, M6); none while the fleet has no rule. */
|
|
2
|
+
export function createListEnabledModels(deps) {
|
|
3
|
+
return async (fleetId) => (await deps.models.list(fleetId)).toSorted();
|
|
4
|
+
}
|
|
5
|
+
//# sourceMappingURL=list-enabled-models.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"list-enabled-models.js","sourceRoot":"","sources":["../../../src/core/models/list-enabled-models.ts"],"names":[],"mappings":"AAMA,2GAA2G;AAC3G,MAAM,UAAU,uBAAuB,CAAC,IAA+B;IACrE,OAAO,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;AACzE,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { FleetId } from '@aeolus-fleet/common';
|
|
2
|
+
/**
|
|
3
|
+
* Outbound port: each fleet's enabled models (model governance, M1, M2), the
|
|
4
|
+
* exact model ids its agent ships may be crewed with; none is no rule.
|
|
5
|
+
* Enabling an enabled id or disabling one not held changes nothing.
|
|
6
|
+
*/
|
|
7
|
+
export interface EnabledModels {
|
|
8
|
+
list(fleetId: FleetId): Promise<string[]>;
|
|
9
|
+
enable(fleetId: FleetId, model: string): Promise<void>;
|
|
10
|
+
disable(fleetId: FleetId, model: string): Promise<void>;
|
|
11
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ports.js","sourceRoot":"","sources":["../../../src/core/models/ports.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { FleetId } from '@aeolus-fleet/common';
|
|
2
|
+
import type { EnabledModels } from './ports.js';
|
|
3
|
+
export type SetModelEnabled = (input: {
|
|
4
|
+
fleetId: FleetId;
|
|
5
|
+
model: string;
|
|
6
|
+
isEnabled: boolean;
|
|
7
|
+
}) => Promise<string[]>;
|
|
8
|
+
/**
|
|
9
|
+
* Use case: enables or disables one model for the fleet (model governance,
|
|
10
|
+
* M6) and answers the fleet's enabled models by id. Already so changes
|
|
11
|
+
* nothing; the next assignment pass places by the new set (M5).
|
|
12
|
+
*/
|
|
13
|
+
export declare function createSetModelEnabled(deps: {
|
|
14
|
+
models: EnabledModels;
|
|
15
|
+
}): SetModelEnabled;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Use case: enables or disables one model for the fleet (model governance,
|
|
3
|
+
* M6) and answers the fleet's enabled models by id. Already so changes
|
|
4
|
+
* nothing; the next assignment pass places by the new set (M5).
|
|
5
|
+
*/
|
|
6
|
+
export function createSetModelEnabled(deps) {
|
|
7
|
+
return async ({ fleetId, model, isEnabled }) => {
|
|
8
|
+
await (isEnabled ? deps.models.enable(fleetId, model) : deps.models.disable(fleetId, model));
|
|
9
|
+
return (await deps.models.list(fleetId)).toSorted();
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=set-model-enabled.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"set-model-enabled.js","sourceRoot":"","sources":["../../../src/core/models/set-model-enabled.ts"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,IAA+B;IACnE,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE;QAC7C,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QAC7F,OAAO,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;IACtD,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import type { ConsoleSessionOutput, FleetId,
|
|
1
|
+
import type { ConsoleSessionOutput, FleetId, ScopeName } from "@aeolus-fleet/common";
|
|
2
2
|
import { type DomainError } from "../shared/errors.js";
|
|
3
3
|
import { type Result } from "../shared/result.js";
|
|
4
4
|
import type { ConsoleSessions } from "./ports.js";
|
|
5
5
|
export type AuthenticateOperator = (cookie: string | undefined) => Promise<Result<{
|
|
6
6
|
fleetId: FleetId;
|
|
7
7
|
kind: ConsoleSessionOutput["kind"];
|
|
8
|
-
scopes: readonly
|
|
8
|
+
scopes: readonly ScopeName[];
|
|
9
9
|
}, DomainError<"NOT_THE_OPERATOR">>>;
|
|
10
10
|
/**
|
|
11
11
|
* Use case: whether a request comes from the operator. The trierarch plugin has no login
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ConsoleSessionOutput, FleetId,
|
|
1
|
+
import type { ConsoleSessionOutput, FleetId, ScopeName } from '@aeolus-fleet/common';
|
|
2
2
|
import type { FleetRefusal } from '../connection/ports.js';
|
|
3
3
|
import type { Result } from '../shared/result.js';
|
|
4
4
|
/**
|
|
@@ -10,6 +10,6 @@ export interface ConsoleSessions {
|
|
|
10
10
|
check(cookie: string): Promise<Result<{
|
|
11
11
|
fleetId: FleetId;
|
|
12
12
|
kind: ConsoleSessionOutput['kind'];
|
|
13
|
-
scopes: readonly
|
|
13
|
+
scopes: readonly ScopeName[];
|
|
14
14
|
}, FleetRefusal>>;
|
|
15
15
|
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { ShipId } from '@aeolus-fleet/common';
|
|
2
|
+
import type { PluginDelivery } from '../connection/ports.js';
|
|
3
|
+
/** Whether a delivery to the plugin's ship asked for the trusted repositories again; the next pass then sends them to its sender. */
|
|
4
|
+
export type ResendTrustedRepositories = (delivery: PluginDelivery) => boolean;
|
|
5
|
+
/**
|
|
6
|
+
* Use case: a trierarch asks for the trusted repositories again
|
|
7
|
+
* (aeolus-fleet#384), as one does when it starts knowing the trierarch
|
|
8
|
+
* plugin's ship: a machine set up before took no list until init kept that
|
|
9
|
+
* ship. Its sender is forgotten from what this process sent, so the next pass
|
|
10
|
+
* sends it the list as to a trierarch never sent it. The share pass sends only
|
|
11
|
+
* to trierarch ships, so another ship that asks gets nothing.
|
|
12
|
+
*/
|
|
13
|
+
export declare function createResendTrustedRepositories(deps: {
|
|
14
|
+
shared: Set<ShipId>;
|
|
15
|
+
}): ResendTrustedRepositories;
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { TRUSTED_REPOSITORIES_REQUEST_CONTENT_TYPE } from './trusted-repositories.js';
|
|
2
|
+
/**
|
|
3
|
+
* Use case: a trierarch asks for the trusted repositories again
|
|
4
|
+
* (aeolus-fleet#384), as one does when it starts knowing the trierarch
|
|
5
|
+
* plugin's ship: a machine set up before took no list until init kept that
|
|
6
|
+
* ship. Its sender is forgotten from what this process sent, so the next pass
|
|
7
|
+
* sends it the list as to a trierarch never sent it. The share pass sends only
|
|
8
|
+
* to trierarch ships, so another ship that asks gets nothing.
|
|
9
|
+
*/
|
|
10
|
+
export function createResendTrustedRepositories(deps) {
|
|
11
|
+
return (delivery) => {
|
|
12
|
+
if (delivery.contentType !== TRUSTED_REPOSITORIES_REQUEST_CONTENT_TYPE) {
|
|
13
|
+
return false;
|
|
14
|
+
}
|
|
15
|
+
deps.shared.delete(delivery.senderShipId);
|
|
16
|
+
return true;
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=resend-trusted-repositories.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resend-trusted-repositories.js","sourceRoot":"","sources":["../../../src/core/repositories/resend-trusted-repositories.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yCAAyC,EAAE,MAAM,2BAA2B,CAAC;AAKtF;;;;;;;GAOG;AACH,MAAM,UAAU,+BAA+B,CAAC,IAA6B;IAC3E,OAAO,CAAC,QAAQ,EAAE,EAAE;QAClB,IAAI,QAAQ,CAAC,WAAW,KAAK,yCAAyC,EAAE,CAAC;YACvE,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type { FleetId, ShipId } from '@aeolus-fleet/common';
|
|
2
|
+
import type { ConnectionStore, FleetDoor } from '../connection/ports.js';
|
|
3
|
+
import type { IdempotencyKeys } from '../machines/ports.js';
|
|
4
|
+
import { type DomainError } from '../shared/errors.js';
|
|
5
|
+
import { type Result } from '../shared/result.js';
|
|
6
|
+
import { type TrustedRepositories } from './trusted-repositories.js';
|
|
7
|
+
export type ShareTrustedRepositories = (fleetId: FleetId) => Promise<Result<{
|
|
8
|
+
shared: number;
|
|
9
|
+
}, DomainError<'NOT_CONNECTED' | 'FLEET_UNAVAILABLE'>>>;
|
|
10
|
+
/**
|
|
11
|
+
* Use case: one pass of sharing the trusted repositories with a fleet's
|
|
12
|
+
* trierarchs (aeolus-fleet#384). Every trierarch ship that is not retired gets
|
|
13
|
+
* the whole list as a message, once per process: `shared` remembers whom this
|
|
14
|
+
* process sent it, so a restart, which may come with a changed list, sends it
|
|
15
|
+
* to every trierarch again, under a new idempotency key. An empty list is sent
|
|
16
|
+
* too, so a trierarch stops cloning what left it. A send the fleet refuses
|
|
17
|
+
* leaves that trierarch for the next pass.
|
|
18
|
+
*/
|
|
19
|
+
export declare function createShareTrustedRepositories(deps: {
|
|
20
|
+
door: FleetDoor;
|
|
21
|
+
connections: ConnectionStore;
|
|
22
|
+
keys: IdempotencyKeys;
|
|
23
|
+
trustedRepositories: TrustedRepositories;
|
|
24
|
+
shared: Set<ShipId>;
|
|
25
|
+
}): ShareTrustedRepositories;
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { TRIERARCH_TYPE } from '../machines/join-machine.js';
|
|
2
|
+
import { refuse } from '../shared/errors.js';
|
|
3
|
+
import { ok } from '../shared/result.js';
|
|
4
|
+
import { TRUSTED_REPOSITORIES_CONTENT_TYPE, trustedRepositoriesPayload } from './trusted-repositories.js';
|
|
5
|
+
/** The refusal that means no answer came: the pass stops, and the next one tries again. */
|
|
6
|
+
const UNAVAILABLE = 'UNAVAILABLE';
|
|
7
|
+
/**
|
|
8
|
+
* Use case: one pass of sharing the trusted repositories with a fleet's
|
|
9
|
+
* trierarchs (aeolus-fleet#384). Every trierarch ship that is not retired gets
|
|
10
|
+
* the whole list as a message, once per process: `shared` remembers whom this
|
|
11
|
+
* process sent it, so a restart, which may come with a changed list, sends it
|
|
12
|
+
* to every trierarch again, under a new idempotency key. An empty list is sent
|
|
13
|
+
* too, so a trierarch stops cloning what left it. A send the fleet refuses
|
|
14
|
+
* leaves that trierarch for the next pass.
|
|
15
|
+
*/
|
|
16
|
+
export function createShareTrustedRepositories(deps) {
|
|
17
|
+
const unavailable = (refusal) => refuse('FLEET_UNAVAILABLE', `The fleet did not answer sharing the trusted repositories: ${refusal.message}`);
|
|
18
|
+
const payload = trustedRepositoriesPayload(deps.trustedRepositories);
|
|
19
|
+
return async (fleetId) => {
|
|
20
|
+
const crew = await deps.connections.find(fleetId);
|
|
21
|
+
if (!crew) {
|
|
22
|
+
return refuse('NOT_CONNECTED', 'The trierarch plugin is not connected to this fleet: connect it in the console');
|
|
23
|
+
}
|
|
24
|
+
const listed = await deps.door.listShips(crew.crewToken);
|
|
25
|
+
if (!listed.isOk) {
|
|
26
|
+
return unavailable(listed.error);
|
|
27
|
+
}
|
|
28
|
+
let shared = 0;
|
|
29
|
+
for (const ship of listed.value) {
|
|
30
|
+
if (ship.type !== TRIERARCH_TYPE || ship.status === 'retired' || deps.shared.has(ship.shipId)) {
|
|
31
|
+
continue;
|
|
32
|
+
}
|
|
33
|
+
const sent = await deps.door.send(crew.crewToken, { shipId: ship.shipId, contentType: TRUSTED_REPOSITORIES_CONTENT_TYPE, payload, idempotencyKey: deps.keys.next() });
|
|
34
|
+
if (!sent.isOk && sent.error.code === UNAVAILABLE) {
|
|
35
|
+
return unavailable(sent.error);
|
|
36
|
+
}
|
|
37
|
+
if (sent.isOk) {
|
|
38
|
+
deps.shared.add(ship.shipId);
|
|
39
|
+
shared += 1;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
return ok({ shared });
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=share-trusted-repositories.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"share-trusted-repositories.js","sourceRoot":"","sources":["../../../src/core/repositories/share-trusted-repositories.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,iCAAiC,EAAE,0BAA0B,EAA4B,MAAM,2BAA2B,CAAC;AAIpI,2FAA2F;AAC3F,MAAM,WAAW,GAAG,aAAa,CAAC;AAElC;;;;;;;;GAQG;AACH,MAAM,UAAU,8BAA8B,CAAC,IAM9C;IACC,MAAM,WAAW,GAAG,CAAC,OAAqB,EAAE,EAAE,CAAC,MAAM,CAAC,mBAAmB,EAAE,8DAA8D,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAC5J,MAAM,OAAO,GAAG,0BAA0B,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACrE,OAAO,KAAK,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,MAAM,CAAC,eAAe,EAAE,gFAAgF,CAAC,CAAC;QACnH,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACzD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,OAAO,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YAChC,IAAI,IAAI,CAAC,IAAI,KAAK,cAAc,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC9F,SAAS;YACX,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,WAAW,EAAE,iCAAiC,EAAE,OAAO,EAAE,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACtK,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBAClD,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC;YACD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACd,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC7B,MAAM,IAAI,CAAC,CAAC;YACd,CAAC;QACH,CAAC;QACD,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACxB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { type Result } from '../shared/result.js';
|
|
2
|
+
/** The list as read: by name, each URL one a trierarch may clone. Built only by `readTrustedRepositories`. */
|
|
3
|
+
export interface TrustedRepositories {
|
|
4
|
+
readonly repositories: readonly {
|
|
5
|
+
readonly name: string;
|
|
6
|
+
readonly url: string;
|
|
7
|
+
}[];
|
|
8
|
+
}
|
|
9
|
+
/** The content type of the message that carries the list to a trierarch. */
|
|
10
|
+
export declare const TRUSTED_REPOSITORIES_CONTENT_TYPE = "application/vnd.aeolus.trierarch.trusted-repositories+json";
|
|
11
|
+
/** The content type of the message a trierarch asks for the list again with, as it starts knowing the trierarch plugin's ship. */
|
|
12
|
+
export declare const TRUSTED_REPOSITORIES_REQUEST_CONTENT_TYPE = "application/vnd.aeolus.trierarch.trusted-repositories-request+json";
|
|
13
|
+
/**
|
|
14
|
+
* The list from the configuration's object of names to git URLs, or why not:
|
|
15
|
+
* each name a trierarch name, each URL one git clones with the machine's
|
|
16
|
+
* access, and the whole small enough to reach a trierarch in one message.
|
|
17
|
+
*/
|
|
18
|
+
export declare function readTrustedRepositories(listed: unknown): Result<TrustedRepositories, {
|
|
19
|
+
reason: string;
|
|
20
|
+
}>;
|
|
21
|
+
/** The list as a trierarch receives it: `{ "repositories": [{ "name", "url" }] }`. */
|
|
22
|
+
export declare function trustedRepositoriesPayload(list: TrustedRepositories): string;
|