@aeolus-fleet/trierarch-plugin 0.38.0 → 0.39.2
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 +16 -8
- package/dist/adapters/crypto/sealed-box-sealer.d.ts +1 -1
- package/dist/adapters/fleet/console-sessions.js +3 -3
- package/dist/adapters/fleet/console-sessions.js.map +1 -1
- package/dist/adapters/fleet/core-version.d.ts +1 -1
- package/dist/adapters/fleet/core-version.js +1 -1
- package/dist/adapters/fleet/rest-fleet-door.js +6 -5
- package/dist/adapters/fleet/rest-fleet-door.js.map +1 -1
- 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 +32 -0
- package/dist/adapters/prisma/generated/client.d.ts +32 -0
- package/dist/adapters/prisma/generated/commonInputTypes.d.ts +150 -0
- package/dist/adapters/prisma/generated/internal/class.d.ts +44 -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 +360 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +46 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +51 -0
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +46 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/McpConfiguration.d.ts +1004 -0
- package/dist/adapters/prisma/generated/models/McpConfiguration.js +2 -0
- package/dist/adapters/prisma/generated/models/McpConfiguration.js.map +1 -0
- package/dist/adapters/prisma/generated/models/McpConfigurationEvent.d.ts +1141 -0
- package/dist/adapters/prisma/generated/models/McpConfigurationEvent.js +2 -0
- package/dist/adapters/prisma/generated/models/McpConfigurationEvent.js.map +1 -0
- package/dist/adapters/prisma/generated/models/McpDelivery.d.ts +1204 -0
- package/dist/adapters/prisma/generated/models/McpDelivery.js +2 -0
- package/dist/adapters/prisma/generated/models/McpDelivery.js.map +1 -0
- package/dist/adapters/prisma/generated/models/McpSecret.d.ts +948 -0
- package/dist/adapters/prisma/generated/models/McpSecret.js +2 -0
- package/dist/adapters/prisma/generated/models/McpSecret.js.map +1 -0
- package/dist/adapters/prisma/generated/models.d.ts +4 -0
- package/dist/adapters/prisma/mcp-configurations.d.ts +11 -0
- package/dist/adapters/prisma/mcp-configurations.js +44 -0
- package/dist/adapters/prisma/mcp-configurations.js.map +1 -0
- package/dist/adapters/prisma/mcp-deliveries.d.ts +9 -0
- package/dist/adapters/prisma/mcp-deliveries.js +47 -0
- package/dist/adapters/prisma/mcp-deliveries.js.map +1 -0
- package/dist/adapters/trpc/router.d.ts +63 -5
- package/dist/adapters/trpc/router.js +60 -2
- package/dist/adapters/trpc/router.js.map +1 -1
- package/dist/app.d.ts +2 -6
- package/dist/app.js +78 -54
- package/dist/app.js.map +1 -1
- package/dist/bin/aeolus-trierarch-plugin.js +1 -2
- package/dist/bin/aeolus-trierarch-plugin.js.map +1 -1
- package/dist/config.d.ts +6 -10
- package/dist/config.js +5 -54
- package/dist/config.js.map +1 -1
- package/dist/core/assignment/assign-crews.d.ts +5 -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 +3 -0
- package/dist/core/assignment/check-crew-settings.js +2 -1
- package/dist/core/assignment/check-crew-settings.js.map +1 -1
- package/dist/core/assignment/placement.d.ts +6 -0
- package/dist/core/assignment/placement.js +12 -4
- package/dist/core/assignment/placement.js.map +1 -1
- package/dist/core/assignment/read-placement.d.ts +7 -1
- package/dist/core/assignment/read-placement.js +14 -2
- package/dist/core/assignment/read-placement.js.map +1 -1
- package/dist/core/assignment/tell-crew-request-reasons.d.ts +35 -0
- package/dist/core/assignment/tell-crew-request-reasons.js +110 -0
- package/dist/core/assignment/tell-crew-request-reasons.js.map +1 -0
- package/dist/core/connection/answer-pings.d.ts +13 -1
- package/dist/core/connection/answer-pings.js +11 -2
- package/dist/core/connection/answer-pings.js.map +1 -1
- package/dist/core/connection/ports.d.ts +23 -6
- package/dist/core/connection/ports.js +2 -1
- package/dist/core/connection/ports.js.map +1 -1
- package/dist/core/mcp-configuration/distribute-mcp-configuration.d.ts +38 -0
- package/dist/core/mcp-configuration/distribute-mcp-configuration.js +97 -0
- package/dist/core/mcp-configuration/distribute-mcp-configuration.js.map +1 -0
- package/dist/core/mcp-configuration/mcp-configuration.d.ts +107 -0
- package/dist/core/mcp-configuration/mcp-configuration.js +205 -0
- package/dist/core/mcp-configuration/mcp-configuration.js.map +1 -0
- package/dist/core/mcp-configuration/mcp-delivery.d.ts +59 -0
- package/dist/core/mcp-configuration/mcp-delivery.js +32 -0
- package/dist/core/mcp-configuration/mcp-delivery.js.map +1 -0
- package/dist/core/mcp-configuration/ports.d.ts +79 -0
- package/dist/core/mcp-configuration/ports.js.map +1 -0
- package/dist/core/mcp-configuration/read-mcp-configuration.d.ts +8 -0
- package/dist/core/mcp-configuration/read-mcp-configuration.js +6 -0
- package/dist/core/mcp-configuration/read-mcp-configuration.js.map +1 -0
- package/dist/core/mcp-configuration/replace-mcp-configuration.d.ts +24 -0
- package/dist/core/mcp-configuration/replace-mcp-configuration.js +30 -0
- package/dist/core/mcp-configuration/replace-mcp-configuration.js.map +1 -0
- package/dist/core/mcp-configuration/sealing-key.js.map +1 -0
- package/dist/core/mcp-configuration/take-mcp-configuration-message.d.ts +30 -0
- package/dist/core/mcp-configuration/take-mcp-configuration-message.js +74 -0
- package/dist/core/mcp-configuration/take-mcp-configuration-message.js.map +1 -0
- package/dist/core/models/answer-enabled-models-asks.d.ts +18 -0
- package/dist/core/models/answer-enabled-models-asks.js +32 -0
- package/dist/core/models/answer-enabled-models-asks.js.map +1 -0
- package/dist/core/operator/authenticate-operator.d.ts +3 -1
- package/dist/core/operator/authenticate-operator.js +7 -4
- package/dist/core/operator/authenticate-operator.js.map +1 -1
- package/dist/core/operator/ports.d.ts +2 -1
- package/dist/core/shared/errors.d.ts +1 -1
- package/dist/core/shared/errors.js.map +1 -1
- package/dist/core/usage/ship-names.d.ts +1 -1
- package/dist/core/usage/ship-names.js +2 -1
- package/dist/core/usage/ship-names.js.map +1 -1
- package/package.json +3 -3
- package/src/adapters/prisma/migrations/20261109120000_mcp_configurations/migration.sql +35 -0
- package/src/adapters/prisma/migrations/20261109130000_mcp_deliveries/migration.sql +15 -0
- package/src/adapters/prisma/schema.prisma +65 -0
- package/dist/core/mcp-servers/mcp-servers.d.ts +0 -46
- package/dist/core/mcp-servers/mcp-servers.js +0 -112
- package/dist/core/mcp-servers/mcp-servers.js.map +0 -1
- package/dist/core/mcp-servers/ports.d.ts +0 -13
- package/dist/core/mcp-servers/ports.js.map +0 -1
- package/dist/core/mcp-servers/resend-mcp-servers.d.ts +0 -15
- package/dist/core/mcp-servers/resend-mcp-servers.js +0 -19
- package/dist/core/mcp-servers/resend-mcp-servers.js.map +0 -1
- package/dist/core/mcp-servers/resend-secrets.d.ts +0 -15
- package/dist/core/mcp-servers/resend-secrets.js +0 -19
- package/dist/core/mcp-servers/resend-secrets.js.map +0 -1
- package/dist/core/mcp-servers/sealing-key.js.map +0 -1
- package/dist/core/mcp-servers/secrets.d.ts +0 -31
- package/dist/core/mcp-servers/secrets.js +0 -90
- package/dist/core/mcp-servers/secrets.js.map +0 -1
- package/dist/core/mcp-servers/share-mcp-servers.d.ts +0 -25
- package/dist/core/mcp-servers/share-mcp-servers.js +0 -45
- package/dist/core/mcp-servers/share-mcp-servers.js.map +0 -1
- package/dist/core/mcp-servers/share-secrets.d.ts +0 -36
- package/dist/core/mcp-servers/share-secrets.js +0 -71
- package/dist/core/mcp-servers/share-secrets.js.map +0 -1
- /package/dist/core/{mcp-servers → mcp-configuration}/ports.js +0 -0
- /package/dist/core/{mcp-servers → mcp-configuration}/sealing-key.d.ts +0 -0
- /package/dist/core/{mcp-servers → mcp-configuration}/sealing-key.js +0 -0
|
@@ -21,6 +21,8 @@ export interface PlacementTrierarch {
|
|
|
21
21
|
assigned: number;
|
|
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
|
+
/** Whether it confirmed the fleet's current MCP configuration for the key it reports: until then it offers no MCP server (the fleet crew MCP design, section 5). */
|
|
25
|
+
isMcpConfigurationCurrent: boolean;
|
|
24
26
|
}
|
|
25
27
|
/**
|
|
26
28
|
* What placement places by: the fleet's trierarchs as they are now, and the
|
|
@@ -56,6 +58,10 @@ export type PlacementCheck = {
|
|
|
56
58
|
kind: 'noRoom';
|
|
57
59
|
reason: string;
|
|
58
60
|
};
|
|
61
|
+
/** How a reason opens when the request waits on a model that is not available (R3): one the requester is told. */
|
|
62
|
+
export declare const MODEL_NOT_AVAILABLE_OPENING = "model not available: ";
|
|
63
|
+
/** How a reason opens when every trierarch that fits gave the request back: one the requester is told. */
|
|
64
|
+
export declare const GIVEN_BACK_OPENING = "given back by every trierarch that fits; last: ";
|
|
59
65
|
/**
|
|
60
66
|
* Policy: whether settings would be placed now, before anything is requested
|
|
61
67
|
* (#245): by the same rules as placement, against the trierarchs as they are.
|
|
@@ -41,7 +41,7 @@ function workspaceName(workspace) {
|
|
|
41
41
|
*/
|
|
42
42
|
function mcpServersRefusal(offering, request) {
|
|
43
43
|
const { named, harnessWords } = request;
|
|
44
|
-
const offered = offering.map(
|
|
44
|
+
const offered = offering.map(offeredServers);
|
|
45
45
|
if (offered.some((servers) => named.every((name) => servers.includes(name)))) {
|
|
46
46
|
return undefined;
|
|
47
47
|
}
|
|
@@ -50,6 +50,10 @@ function mcpServersRefusal(offering, request) {
|
|
|
50
50
|
? `no trierarch offering ${harnessWords} offers MCP servers ${named.join(', ')} together`
|
|
51
51
|
: `no trierarch offering ${harnessWords} offers MCP server ${missing}`;
|
|
52
52
|
}
|
|
53
|
+
/** The MCP servers a trierarch's harness offers: none until the trierarch confirmed the fleet's current MCP configuration. */
|
|
54
|
+
function offeredServers({ trierarch, harness }) {
|
|
55
|
+
return trierarch.isMcpConfigurationCurrent ? (harness.mcpServers ?? []) : [];
|
|
56
|
+
}
|
|
53
57
|
/** A harness options schema that reports a default model (`properties.model.default`). */
|
|
54
58
|
const defaultModelSchema = z.object({ properties: z.object({ model: z.object({ default: z.string() }) }) });
|
|
55
59
|
/** A harness options schema that lists the models it reports (`properties.model.enum`). */
|
|
@@ -59,9 +63,13 @@ function isDefaultEnabled(schema, enabledModels) {
|
|
|
59
63
|
const read = defaultModelSchema.safeParse(schema);
|
|
60
64
|
return read.success && enabledModels.includes(read.data.properties.model.default);
|
|
61
65
|
}
|
|
66
|
+
/** How a reason opens when the request waits on a model that is not available (R3): one the requester is told. */
|
|
67
|
+
export const MODEL_NOT_AVAILABLE_OPENING = 'model not available: ';
|
|
68
|
+
/** How a reason opens when every trierarch that fits gave the request back: one the requester is told. */
|
|
69
|
+
export const GIVEN_BACK_OPENING = 'given back by every trierarch that fits; last: ';
|
|
62
70
|
/** Why a request waits on a model that is not available, within what a reason may hold. */
|
|
63
71
|
function modelNotAvailableReason(what) {
|
|
64
|
-
return
|
|
72
|
+
return `${MODEL_NOT_AVAILABLE_OPENING}${what}`.slice(0, CREW_REQUEST_REASON_MAX_LENGTH);
|
|
65
73
|
}
|
|
66
74
|
/**
|
|
67
75
|
* Why a request naming a model the fleet did not enable waits, or undefined
|
|
@@ -87,7 +95,7 @@ function roomShare(trierarch) {
|
|
|
87
95
|
/** Why a request waits when every trierarch that fits gave it back: the last reason, within what a reason may hold. */
|
|
88
96
|
function givenBackReason(givenBack) {
|
|
89
97
|
const last = givenBack.at(-1)?.reason ?? '';
|
|
90
|
-
return
|
|
98
|
+
return `${GIVEN_BACK_OPENING}${last}`.slice(0, CREW_REQUEST_REASON_MAX_LENGTH);
|
|
91
99
|
}
|
|
92
100
|
/**
|
|
93
101
|
* The trierarch to claim for the settings, or why none fits: a named model
|
|
@@ -128,7 +136,7 @@ function fit(settings, { trierarchs, enabledModels, givenBack }) {
|
|
|
128
136
|
if (serversRefusal !== undefined) {
|
|
129
137
|
return { reason: serversRefusal.slice(0, CREW_REQUEST_REASON_MAX_LENGTH), field: 'mcpServers' };
|
|
130
138
|
}
|
|
131
|
-
const withServers = offering.filter((
|
|
139
|
+
const withServers = offering.filter((offer) => (settings.mcpServers ?? []).every((name) => offeredServers(offer).includes(name)));
|
|
132
140
|
const withWorkspace = withServers.filter(({ trierarch }) => offersWorkspace(trierarch.details, settings.workspace));
|
|
133
141
|
if (withWorkspace.length === 0) {
|
|
134
142
|
return { reason: `no trierarch offering ${harnessWords} has ${workspaceName(settings.workspace)}`, field: 'workspace' };
|
|
@@ -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;AAoDxB,wEAAwE;AACxE,SAAS,MAAM,CAAC,KAAY,EAAE,SAAmB,EAAE;IACjD,MAAM,IAAI,GAAG,CAAC,GAAG,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9D,OAAO,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC;AACnE,CAAC;AAED,2GAA2G;AAC3G,SAAS,eAAe,CAAC,MAA8D;IACrF,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAC9B,OAAO,OAAO,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAC5H,CAAC;AAED;;;;GAIG;AACH,SAAS,cAAc,CAAC,MAA8D,EAAE,OAAgC;IACtH,IAAI,OAAkB,CAAC;IACvB,IAAI,CAAC;QACH,OAAO,GAAG,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,sEAAsE,CAAC;IAChF,CAAC;IACD,MAAM,QAAQ,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1H,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;IAC1D,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,eAAe,CAAC,OAA+B,EAAE,SAAoC;IAC5F,OAAO,SAAS,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;AAC9J,CAAC;AAED,SAAS,aAAa,CAAC,SAAoC;IACzD,OAAO,SAAS,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,cAAc,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,SAAS,CAAC,IAAI,EAAE,CAAC;AAC3G,CAAC;AAED;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,QAA6E,EAAE,OAA2D;IACnK,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;IACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;IACxE,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7E,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC1F,OAAO,OAAO,KAAK,SAAS;QAC1B,CAAC,CAAC,yBAAyB,YAAY,uBAAuB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW;QACzF,CAAC,CAAC,yBAAyB,YAAY,sBAAsB,OAAO,EAAE,CAAC;AAC3E,CAAC;AAED,0FAA0F;AAC1F,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AAE5G,2FAA2F;AAC3F,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AAEhH,mIAAmI;AACnI,SAAS,gBAAgB,CAAC,MAA8D,EAAE,aAAgC;IACxH,MAAM,IAAI,GAAG,kBAAkB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAClD,OAAO,IAAI,CAAC,OAAO,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AACpF,CAAC;AAED,2FAA2F;AAC3F,SAAS,uBAAuB,CAAC,IAAY;IAC3C,OAAO,wBAAwB,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,8BAA8B,CAAC,CAAC;AACjF,CAAC;AAED;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,QAAsB,EAAE,aAAgC;IACjF,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;IACrC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QACtH,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,uBAAuB,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AAC1H,CAAC;AAED,yGAAyG;AACzG,SAAS,YAAY,CAAC,MAA8D,EAAE,KAAc;IAClG,MAAM,IAAI,GAAG,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC/C,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC1E,CAAC;AAED,gEAAgE;AAChE,SAAS,SAAS,CAAC,SAA6B;IAC9C,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;AAC5F,CAAC;AAED,uHAAuH;AACvH,SAAS,eAAe,CAAC,SAAwC;IAC/D,MAAM,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC;IAC5C,OAAO,kDAAkD,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,8BAA8B,CAAC,CAAC;AAC3G,CAAC;AAED;;;;;;GAMG;AACH,SAAS,GAAG,CAAC,QAAsB,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAiE;IAC1I,MAAM,QAAQ,GAAG,iBAAiB,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IAC5D,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,MAAM,EAAE,0BAA0B,EAAE,CAAC;IAChD,CAAC;IACD,MAAM,aAAa,GAAG,QAAQ,CAAC,aAAa,IAAI,EAAE,CAAC;IACnD,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC/H,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,uFAAuF;QACvF,OAAO,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC;IAC/C,CAAC;IACD,yFAAyF;IACzF,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC;IAC/B,MAAM,YAAY,GAAG,KAAK,IAAI,qBAAqB,CAAC;IACpD,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QAC9C,MAAM,OAAO,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC;QAC1I,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IACH,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,MAAM,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,+BAA+B,KAAK,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IACtI,CAAC;IACD,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;IAC1C,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;QACvI,OAAO,EAAE,MAAM,EAAE,uBAAuB,CAAC,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IACzI,CAAC;IACD,MAAM,cAAc,GAAG,iBAAiB,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,UAAU,IAAI,EAAE,EAAE,YAAY,EAAE,CAAC,CAAC;IACvG,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,8BAA8B,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC;IAClG,CAAC;IACD,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC7I,MAAM,aAAa,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;IACpH,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,EAAE,MAAM,EAAE,yBAAyB,YAAY,QAAQ,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAC1H,CAAC;IACD,MAAM,QAAQ,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;IACrJ,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC;IACvE,MAAM,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC;IAChC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,EAAE,MAAM,EAAE,wCAAwC,YAAY,KAAK,YAAY,EAAE,OAAO,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IAC9H,CAAC;IACD,0FAA0F;IAC1F,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,CAAC;IAC/K,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,EAAE,MAAM,EAAE,uBAAuB,CAAC,gCAAgC,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;IAC/G,CAAC;IACD,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,KAAK,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IACnJ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,EAAE,MAAM,EAAE,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;IAChD,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI;SAChB,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;SACxE,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IAClL,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,+BAA+B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;AACvI,CAAC;AAED,kHAAkH;AAClH,SAAS,MAAM,CAAC,QAAiB;IAC/B,MAAM,IAAI,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACxC,OAAO,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AACjD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,QAAiB,EAAE,KAAqB;IACrE,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC9B,MAAM,MAAM,GAAG,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3F,IAAI,WAAW,IAAI,MAAM,EAAE,CAAC;QAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC1B,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;AAClJ,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,KAAK,CAAC,QAAqC,EAAE,EAAE,UAAU,EAAE,aAAa,EAAkB;IACxG,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAChG,MAAM,UAAU,GAAgB,EAAE,CAAC;IACnC,MAAM,WAAW,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACnK,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtC,MAAM,MAAM,GACV,UAAU,IAAI,IAAI;YAChB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACjB,aAAa;gBACb,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC7H,SAAS,EAAE,OAAO,CAAC,SAAS;aAC7B,CAAC;YACJ,CAAC,CAAC,IAAI,CAAC;QACX,IAAI,WAAW,IAAI,MAAM,EAAE,CAAC;YAC1B,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACxF,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;QACxG,CAAC;aAAM,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC;YAC5C,UAAU,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QACtF,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
1
|
+
{"version":3,"file":"placement.js","sourceRoot":"","sources":["../../../src/core/assignment/placement.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,22 @@
|
|
|
1
1
|
import type { FleetDoor, FleetRefusal } from '../connection/ports.js';
|
|
2
|
+
import { type McpDelivery } from '../mcp-configuration/mcp-delivery.js';
|
|
2
3
|
import { type Result } from '../shared/result.js';
|
|
3
4
|
import type { PlacementRequest, PlacementTrierarch } from './placement.js';
|
|
4
5
|
/**
|
|
5
6
|
* What placement reads from the fleet, whole, each time (docs/trierarch.md,
|
|
6
7
|
* "Assignment"): the unassigned requests of ships that await crew, and the
|
|
7
8
|
* trierarchs that report details and are not silent, with the requests
|
|
8
|
-
* assigned to each. A silent trierarch gets nothing new.
|
|
9
|
+
* assigned to each. A silent trierarch gets nothing new. With them, whether
|
|
10
|
+
* each confirmed the fleet's current MCP configuration for the key it reports.
|
|
9
11
|
*/
|
|
10
12
|
export declare function readPlacement(door: FleetDoor, at: {
|
|
11
13
|
crewToken: string;
|
|
12
14
|
now: Date;
|
|
13
15
|
silentAfterMs: number;
|
|
16
|
+
mcp: {
|
|
17
|
+
version: number;
|
|
18
|
+
deliveries: readonly McpDelivery[];
|
|
19
|
+
};
|
|
14
20
|
}): Promise<Result<{
|
|
15
21
|
requests: PlacementRequest[];
|
|
16
22
|
trierarchs: PlacementTrierarch[];
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import { trierarchReportDetailsSchema } from '@aeolus-fleet/common';
|
|
2
2
|
import { TRIERARCH_TYPE } from '../machines/join-machine.js';
|
|
3
3
|
import { isSilent } from '../machines/silent.js';
|
|
4
|
+
import { isMcpConfigurationCurrent } from '../mcp-configuration/mcp-delivery.js';
|
|
5
|
+
import { readSealingKey } from '../mcp-configuration/sealing-key.js';
|
|
4
6
|
import { ok } from '../shared/result.js';
|
|
5
7
|
/**
|
|
6
8
|
* What placement reads from the fleet, whole, each time (docs/trierarch.md,
|
|
7
9
|
* "Assignment"): the unassigned requests of ships that await crew, and the
|
|
8
10
|
* trierarchs that report details and are not silent, with the requests
|
|
9
|
-
* assigned to each. A silent trierarch gets nothing new.
|
|
11
|
+
* assigned to each. A silent trierarch gets nothing new. With them, whether
|
|
12
|
+
* each confirmed the fleet's current MCP configuration for the key it reports.
|
|
10
13
|
*/
|
|
11
14
|
export async function readPlacement(door, at) {
|
|
12
15
|
const listed = await door.listShips(at.crewToken);
|
|
@@ -28,7 +31,16 @@ export async function readPlacement(door, at) {
|
|
|
28
31
|
const details = trierarchReportDetailsSchema.safeParse(read.value.report?.details);
|
|
29
32
|
if (isTrierarch && details.success) {
|
|
30
33
|
const assigned = listed.value.filter((each) => each.crewRequest?.assignedTo === ship.shipId).length;
|
|
31
|
-
|
|
34
|
+
const publicKey = readSealingKey(read.value.report?.details);
|
|
35
|
+
const delivery = at.mcp.deliveries.find((each) => each.trierarchShipId === ship.shipId);
|
|
36
|
+
trierarchs.push({
|
|
37
|
+
shipId: ship.shipId,
|
|
38
|
+
commissionedAt: read.value.commissionedAt,
|
|
39
|
+
details: details.data,
|
|
40
|
+
assigned,
|
|
41
|
+
labelValueIds: ship.labels.map((label) => label.valueId),
|
|
42
|
+
isMcpConfigurationCurrent: publicKey !== undefined && isMcpConfigurationCurrent(delivery, { version: at.mcp.version, publicKey }),
|
|
43
|
+
});
|
|
32
44
|
}
|
|
33
45
|
if (isRequest && ship.crewRequest !== null) {
|
|
34
46
|
requests.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-placement.js","sourceRoot":"","sources":["../../../src/core/assignment/read-placement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAGpE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAGtD
|
|
1
|
+
{"version":3,"file":"read-placement.js","sourceRoot":"","sources":["../../../src/core/assignment/read-placement.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { type FleetId } from '@aeolus-fleet/common';
|
|
2
|
+
import { type ConnectionStore, type FleetDoor } from '../connection/ports.js';
|
|
3
|
+
import { type DomainError } from '../shared/errors.js';
|
|
4
|
+
import { type Result } from '../shared/result.js';
|
|
5
|
+
/**
|
|
6
|
+
* What a pass told: the tells the fleet holds that this process had not
|
|
7
|
+
* counted before; those it did not answer, tried again next pass; and those
|
|
8
|
+
* argo's tell was refused, tried no more. After a restart a tell the fleet
|
|
9
|
+
* held already counts once more: the fleet answers a repeat under its key
|
|
10
|
+
* with OK and stores nothing, so the process cannot tell the two apart.
|
|
11
|
+
*/
|
|
12
|
+
export interface TellOutcome {
|
|
13
|
+
told: number;
|
|
14
|
+
untold: number;
|
|
15
|
+
refused: number;
|
|
16
|
+
}
|
|
17
|
+
export type TellCrewRequestReasons = (fleetId: FleetId) => Promise<Result<TellOutcome, DomainError<'NOT_CONNECTED' | 'FLEET_UNAVAILABLE'>>>;
|
|
18
|
+
/**
|
|
19
|
+
* Use case: telling the ship that made a crew request why it waits
|
|
20
|
+
* (docs/design/enabled-models-for-ships.md, R4 and R5), after each
|
|
21
|
+
* assignment pass. Only a model that is not available and a request every
|
|
22
|
+
* trierarch that fits gave back are told, once per ship, settings version and
|
|
23
|
+
* kind: the fleet stores each tell once under its idempotency key, so a
|
|
24
|
+
* restart and a rewritten reason tell nothing again, and `told` keeps this
|
|
25
|
+
* process from sending one twice. A request with no requester, or whose
|
|
26
|
+
* requester is retired, is told to argo under the same key, and so is one
|
|
27
|
+
* whose message the fleet refuses for good. A tell the fleet does not answer
|
|
28
|
+
* is left out of `told`, so the next pass tries it again; one argo's tell is
|
|
29
|
+
* refused for good is tried no more. The other requests are told either way.
|
|
30
|
+
*/
|
|
31
|
+
export declare function createTellCrewRequestReasons(deps: {
|
|
32
|
+
door: FleetDoor;
|
|
33
|
+
connections: ConnectionStore;
|
|
34
|
+
told: Set<string>;
|
|
35
|
+
}): TellCrewRequestReasons;
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
import { argoMessage, CREW_REQUEST_REASON_CONTENT_TYPE } from '@aeolus-fleet/common';
|
|
2
|
+
import { EVERY_SHIP_STATUS } from '../connection/ports.js';
|
|
3
|
+
import { refuse } from '../shared/errors.js';
|
|
4
|
+
import { ok } from '../shared/result.js';
|
|
5
|
+
import { GIVEN_BACK_OPENING, MODEL_NOT_AVAILABLE_OPENING } from './placement.js';
|
|
6
|
+
/** The refusal of a repeated idempotency key with a different request: told before, with an earlier wording of the reason. */
|
|
7
|
+
const HELD_ALREADY = 'CONFLICT';
|
|
8
|
+
/**
|
|
9
|
+
* The refusals that pass: no answer, busy after every wait, a server failure,
|
|
10
|
+
* the plugin's own crew ended, or the fleet's message limit, which lifts. The
|
|
11
|
+
* fleet stored nothing, so the same tell is made again next pass; every other
|
|
12
|
+
* refusal is final for it.
|
|
13
|
+
*/
|
|
14
|
+
const NOT_ANSWERED = new Set(['UNAVAILABLE', 'SERVICE_UNAVAILABLE', 'INTERNAL_SERVER_ERROR', 'LEASE_ENDED', 'MESSAGE_LIMIT_REACHED']);
|
|
15
|
+
function kindOf(reason) {
|
|
16
|
+
if (reason.startsWith(MODEL_NOT_AVAILABLE_OPENING)) {
|
|
17
|
+
return 'model';
|
|
18
|
+
}
|
|
19
|
+
return reason.startsWith(GIVEN_BACK_OPENING) ? 'givenBack' : undefined;
|
|
20
|
+
}
|
|
21
|
+
function isWaiting(ship) {
|
|
22
|
+
return ship.status === 'awaitingCrew' && ship.crewRequest !== null && ship.crewRequest.assignedTo === null && ship.crewRequest.reason !== null;
|
|
23
|
+
}
|
|
24
|
+
function whyArgo(inPlaceOf) {
|
|
25
|
+
switch (inPlaceOf.kind) {
|
|
26
|
+
case 'none':
|
|
27
|
+
return 'It records no requester';
|
|
28
|
+
case 'retired':
|
|
29
|
+
return `Ship ${inPlaceOf.name} made it and is retired`;
|
|
30
|
+
case 'refused':
|
|
31
|
+
return `Ship ${inPlaceOf.name} made it, and the fleet refused the message to it (${inPlaceOf.refusal.code}: ${inPlaceOf.refusal.message})`;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
/** What argo is told in place of a requester: the ship, the reason, and why the requester is not told. */
|
|
35
|
+
function argoText(ship, inPlaceOf) {
|
|
36
|
+
const { reason, settingsVersion } = ship.crewRequest;
|
|
37
|
+
return argoMessage({
|
|
38
|
+
headline: `Ship ${ship.name} waits: ${reason}`,
|
|
39
|
+
body: `Ship ${ship.name}'s crew request (settings version ${String(settingsVersion)}) waits: ${reason}. ${whyArgo(inPlaceOf)}, so the trierarch plugin tells argo.`,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* Use case: telling the ship that made a crew request why it waits
|
|
44
|
+
* (docs/design/enabled-models-for-ships.md, R4 and R5), after each
|
|
45
|
+
* assignment pass. Only a model that is not available and a request every
|
|
46
|
+
* trierarch that fits gave back are told, once per ship, settings version and
|
|
47
|
+
* kind: the fleet stores each tell once under its idempotency key, so a
|
|
48
|
+
* restart and a rewritten reason tell nothing again, and `told` keeps this
|
|
49
|
+
* process from sending one twice. A request with no requester, or whose
|
|
50
|
+
* requester is retired, is told to argo under the same key, and so is one
|
|
51
|
+
* whose message the fleet refuses for good. A tell the fleet does not answer
|
|
52
|
+
* is left out of `told`, so the next pass tries it again; one argo's tell is
|
|
53
|
+
* refused for good is tried no more. The other requests are told either way.
|
|
54
|
+
*/
|
|
55
|
+
export function createTellCrewRequestReasons(deps) {
|
|
56
|
+
return async (fleetId) => {
|
|
57
|
+
const crew = await deps.connections.find(fleetId);
|
|
58
|
+
if (!crew) {
|
|
59
|
+
return refuse('NOT_CONNECTED', 'The trierarch plugin is not connected to this fleet: connect it in the console');
|
|
60
|
+
}
|
|
61
|
+
// Retired ships too: a requester that retired is told to argo, so it must be seen as retired.
|
|
62
|
+
const listed = await deps.door.listShips(crew.crewToken, { statuses: EVERY_SHIP_STATUS });
|
|
63
|
+
if (!listed.isOk) {
|
|
64
|
+
return refuse('FLEET_UNAVAILABLE', `The fleet did not answer the crew request reasons: ${listed.error.message}`);
|
|
65
|
+
}
|
|
66
|
+
const ships = new Map(listed.value.map((ship) => [ship.shipId, ship]));
|
|
67
|
+
const outcome = { told: 0, untold: 0, refused: 0 };
|
|
68
|
+
for (const ship of listed.value.filter(isWaiting)) {
|
|
69
|
+
const kind = kindOf(ship.crewRequest.reason);
|
|
70
|
+
if (kind === undefined) {
|
|
71
|
+
continue;
|
|
72
|
+
}
|
|
73
|
+
const idempotencyKey = `trierarch-plugin:crew-request-reason:${ship.shipId}:${String(ship.crewRequest.settingsVersion)}:${kind}`;
|
|
74
|
+
if (deps.told.has(idempotencyKey)) {
|
|
75
|
+
continue;
|
|
76
|
+
}
|
|
77
|
+
const { requestedBy } = ship.crewRequest;
|
|
78
|
+
const tellArgo = (inPlaceOf) => deps.door.tellArgo(crew.crewToken, { text: argoText(ship, inPlaceOf), idempotencyKey });
|
|
79
|
+
let sent;
|
|
80
|
+
if (requestedBy === null) {
|
|
81
|
+
sent = await tellArgo({ kind: 'none' });
|
|
82
|
+
}
|
|
83
|
+
else if (ships.get(requestedBy.shipId)?.status === 'retired') {
|
|
84
|
+
sent = await tellArgo({ kind: 'retired', name: requestedBy.name });
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
const message = { shipId: ship.shipId, shipName: ship.name, settingsVersion: ship.crewRequest.settingsVersion, reason: ship.crewRequest.reason };
|
|
88
|
+
sent = await deps.door.send(crew.crewToken, { shipId: requestedBy.shipId, contentType: CREW_REQUEST_REASON_CONTENT_TYPE, payload: JSON.stringify(message), idempotencyKey });
|
|
89
|
+
// A final refusal stores nothing under the key: argo is told under it in place of the requester.
|
|
90
|
+
if (!sent.isOk && !NOT_ANSWERED.has(sent.error.code) && sent.error.code !== HELD_ALREADY) {
|
|
91
|
+
sent = await tellArgo({ kind: 'refused', name: requestedBy.name, refusal: sent.error });
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
if (!sent.isOk && NOT_ANSWERED.has(sent.error.code)) {
|
|
95
|
+
outcome.untold += 1;
|
|
96
|
+
continue;
|
|
97
|
+
}
|
|
98
|
+
// CONFLICT: the fleet holds a tell under this key already, with an earlier wording of the reason.
|
|
99
|
+
if (sent.isOk) {
|
|
100
|
+
outcome.told += 1;
|
|
101
|
+
}
|
|
102
|
+
else if (sent.error.code !== HELD_ALREADY) {
|
|
103
|
+
outcome.refused += 1;
|
|
104
|
+
}
|
|
105
|
+
deps.told.add(idempotencyKey);
|
|
106
|
+
}
|
|
107
|
+
return ok(outcome);
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
//# sourceMappingURL=tell-crew-request-reasons.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tell-crew-request-reasons.js","sourceRoot":"","sources":["../../../src/core/assignment/tell-crew-request-reasons.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { KeepUsage } from '../usage/keep-usage.js';
|
|
2
|
-
import type { ConnectionStore, PluginDelivery, PluginInbox } from './ports.js';
|
|
2
|
+
import type { ConnectionStore, PluginCrew, PluginDelivery, PluginInbox } from './ports.js';
|
|
3
3
|
/**
|
|
4
4
|
* What a round did: pings answered, trierarchs' usage kept, usage not handled
|
|
5
5
|
* and why, other deliveries acked as kept by the fleet, and calls the fleet
|
|
@@ -15,6 +15,17 @@ export interface PingRound {
|
|
|
15
15
|
}[];
|
|
16
16
|
refused: number;
|
|
17
17
|
}
|
|
18
|
+
/** What became of a delivery that may be an ask: not one; answered; its reply refused by the fleet; or left waiting. */
|
|
19
|
+
export type AnsweredAsk = {
|
|
20
|
+
readonly kind: 'notAsk';
|
|
21
|
+
} | {
|
|
22
|
+
readonly kind: 'answered';
|
|
23
|
+
} | {
|
|
24
|
+
readonly kind: 'refused';
|
|
25
|
+
} | {
|
|
26
|
+
readonly kind: 'left';
|
|
27
|
+
};
|
|
28
|
+
export type AnswerAsk = (crew: PluginCrew, delivery: PluginDelivery) => Promise<AnsweredAsk>;
|
|
18
29
|
export type AnswerPings = () => Promise<PingRound>;
|
|
19
30
|
/**
|
|
20
31
|
* Use case: the trierarch plugin's own ship takes what waits for it in each
|
|
@@ -27,4 +38,5 @@ export declare function createAnswerPings(deps: {
|
|
|
27
38
|
connections: ConnectionStore;
|
|
28
39
|
inbox: PluginInbox;
|
|
29
40
|
keepUsage: KeepUsage;
|
|
41
|
+
answerAsk: AnswerAsk;
|
|
30
42
|
}): AnswerPings;
|
|
@@ -27,17 +27,26 @@ export function createAnswerPings(deps) {
|
|
|
27
27
|
round.refused += 1;
|
|
28
28
|
continue;
|
|
29
29
|
}
|
|
30
|
+
// The reply is stored before the ask is acked: a crash answers again under the same key.
|
|
31
|
+
const asked = await deps.answerAsk(crew, delivery).catch(() => undefined);
|
|
32
|
+
if (asked === undefined || asked.kind === 'refused') {
|
|
33
|
+
round.refused += 1;
|
|
34
|
+
continue;
|
|
35
|
+
}
|
|
36
|
+
if (asked.kind === 'left') {
|
|
37
|
+
continue;
|
|
38
|
+
}
|
|
30
39
|
const acked = await deps.inbox.ack(crew.crewToken, delivery.deliveryId);
|
|
31
40
|
if (!acked.isOk) {
|
|
32
41
|
round.refused += 1;
|
|
33
42
|
}
|
|
34
|
-
else if (usage.kind === 'kept') {
|
|
43
|
+
else if (asked.kind === 'notAsk' && usage.kind === 'kept') {
|
|
35
44
|
round.keptUsage += 1;
|
|
36
45
|
}
|
|
37
46
|
else if (usage.kind === 'notHandled') {
|
|
38
47
|
round.notHandled.push({ delivery, reason: usage.reason });
|
|
39
48
|
}
|
|
40
|
-
else {
|
|
49
|
+
else if (asked.kind === 'notAsk') {
|
|
41
50
|
round.acked.push(delivery);
|
|
42
51
|
}
|
|
43
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"answer-pings.js","sourceRoot":"","sources":["../../../src/core/connection/answer-pings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"answer-pings.js","sourceRoot":"","sources":["../../../src/core/connection/answer-pings.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { CrewLine, DeliveryId, FleetId, LabelId, LabelValueId, NetworkRule, ShipId } from '@aeolus-fleet/common';
|
|
1
|
+
import type { CrewLine, DeliveryId, FleetId, LabelId, LabelValueId, MessageId, NetworkRule, ShipId } from '@aeolus-fleet/common';
|
|
2
2
|
import type { Result } from '../shared/result.js';
|
|
3
3
|
/**
|
|
4
4
|
* Why the fleet refused a ship call: its code (CONFLICT, UNAUTHORIZED,
|
|
@@ -15,12 +15,16 @@ export interface IssuedPrompt {
|
|
|
15
15
|
crewLines: CrewLine[];
|
|
16
16
|
secret: string;
|
|
17
17
|
}
|
|
18
|
+
/** Where a ship stands, as the fleet lists it. */
|
|
19
|
+
export type ShipStatus = 'awaitingCrew' | 'crewed' | 'retired';
|
|
20
|
+
/** Every status a ship can have: what a read that must see retired ships asks for. */
|
|
21
|
+
export declare const EVERY_SHIP_STATUS: readonly ShipStatus[];
|
|
18
22
|
/** A ship as `fleet.list` lists it: what the trierarch plugin reads of it. */
|
|
19
23
|
export interface ListedShip {
|
|
20
24
|
shipId: ShipId;
|
|
21
25
|
name: string;
|
|
22
26
|
type: string;
|
|
23
|
-
status:
|
|
27
|
+
status: ShipStatus;
|
|
24
28
|
/** When its session last called the fleet; null while no session crews it. */
|
|
25
29
|
lastSeenAt: Date | null;
|
|
26
30
|
/** The model its crew last stated (decision 0018); null until one states any. */
|
|
@@ -31,7 +35,9 @@ export interface ListedShip {
|
|
|
31
35
|
/**
|
|
32
36
|
* Its crew request, without its settings: their version, when the session
|
|
33
37
|
* its trierarch runs now started, or null while none runs, and the
|
|
34
|
-
* trierarchs that gave it back, oldest first (#382)
|
|
38
|
+
* trierarchs that gave it back, oldest first (#382), and the ship that last
|
|
39
|
+
* made it, null for a request made before the fleet recorded it; null when
|
|
40
|
+
* it holds none.
|
|
35
41
|
*/
|
|
36
42
|
crewRequest: {
|
|
37
43
|
settingsVersion: number;
|
|
@@ -43,6 +49,10 @@ export interface ListedShip {
|
|
|
43
49
|
trierarchShipId: ShipId;
|
|
44
50
|
reason: string;
|
|
45
51
|
}[];
|
|
52
|
+
requestedBy: {
|
|
53
|
+
shipId: ShipId;
|
|
54
|
+
name: string;
|
|
55
|
+
} | null;
|
|
46
56
|
} | null;
|
|
47
57
|
/** The label values it carries, every owner's, with their labels (#102). */
|
|
48
58
|
labels: {
|
|
@@ -117,8 +127,10 @@ export interface FleetDoor {
|
|
|
117
127
|
limits(crewToken: string): Promise<Result<{
|
|
118
128
|
retentionDays: number | null;
|
|
119
129
|
}, FleetRefusal>>;
|
|
120
|
-
/**
|
|
121
|
-
listShips(crewToken: string
|
|
130
|
+
/** The fleet's active ships, retired ones too when the statuses ask for them, as `fleet.list` answers (fleet:read). */
|
|
131
|
+
listShips(crewToken: string, filter?: {
|
|
132
|
+
statuses: readonly ShipStatus[];
|
|
133
|
+
}): Promise<Result<ListedShip[], FleetRefusal>>;
|
|
122
134
|
/** Claims a ship's crew request for a trierarch (crew:assign), only while it is unassigned: a lost claim is CONFLICT. */
|
|
123
135
|
assignCrew(crewToken: string, claim: {
|
|
124
136
|
shipId: ShipId;
|
|
@@ -176,21 +188,26 @@ export interface FleetDoor {
|
|
|
176
188
|
text: string;
|
|
177
189
|
idempotencyKey: string;
|
|
178
190
|
}): Promise<Result<undefined, FleetRefusal>>;
|
|
179
|
-
/** Sends a ship a message of the given content type, stored once under its idempotency key. */
|
|
191
|
+
/** Sends a ship a message of the given content type, stored once under its idempotency key; a reply names the message it answers. */
|
|
180
192
|
send(crewToken: string, message: {
|
|
181
193
|
shipId: ShipId;
|
|
182
194
|
contentType: string;
|
|
183
195
|
payload: string;
|
|
184
196
|
idempotencyKey: string;
|
|
197
|
+
inReplyTo?: MessageId;
|
|
185
198
|
}): Promise<Result<undefined, FleetRefusal>>;
|
|
186
199
|
}
|
|
187
200
|
/** A delivery to the trierarch plugin's own ship: what tells a ping apart, and who sent it. */
|
|
188
201
|
export interface PluginDelivery {
|
|
189
202
|
deliveryId: DeliveryId;
|
|
203
|
+
/** The message the delivery carries: what a reply names. */
|
|
204
|
+
messageId: MessageId;
|
|
190
205
|
contentType: string;
|
|
191
206
|
senderShipId: ShipId;
|
|
192
207
|
/** The sender's type as the fleet read it, never as the sender says. */
|
|
193
208
|
senderType: string;
|
|
209
|
+
/** The sender's status as the fleet read it: a confirmation counts only from a crewed trierarch. */
|
|
210
|
+
senderStatus: ShipStatus;
|
|
194
211
|
payload: string;
|
|
195
212
|
}
|
|
196
213
|
/** Outbound port: the deliveries to the trierarch plugin's own ship, as its crew takes, acks and pongs them. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ports.js","sourceRoot":"","sources":["../../../src/core/connection/ports.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"ports.js","sourceRoot":"","sources":["../../../src/core/connection/ports.ts"],"names":[],"mappings":"AAwBA,sFAAsF;AACtF,MAAM,CAAC,MAAM,iBAAiB,GAA0B,CAAC,cAAc,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
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 { Clock } from '../shared/clock.js';
|
|
5
|
+
import { type DomainError } from '../shared/errors.js';
|
|
6
|
+
import { type Result } from '../shared/result.js';
|
|
7
|
+
import type { McpConfigurations, McpDeliveries, Sealer } from './ports.js';
|
|
8
|
+
export type DistributeMcpConfiguration = (fleetId: FleetId) => Promise<Result<{
|
|
9
|
+
sent: number;
|
|
10
|
+
unsealable: {
|
|
11
|
+
shipId: ShipId;
|
|
12
|
+
publicKey: string;
|
|
13
|
+
}[];
|
|
14
|
+
}, DomainError<'NOT_CONNECTED' | 'FLEET_UNAVAILABLE'>>>;
|
|
15
|
+
/**
|
|
16
|
+
* Use case: one pass of reconciling a fleet's MCP configuration with its
|
|
17
|
+
* trierarchs (the fleet crew MCP design, section 5). It reads the set once,
|
|
18
|
+
* then every trierarch ship that is crewed and not silent and states a
|
|
19
|
+
* sealing key: what `nextMcpSend` says it needs is sent as the plugin's ship,
|
|
20
|
+
* the complete set at its version with every secret sealed to that key, an
|
|
21
|
+
* empty set too. A new attempt is kept, under its new idempotency key, before
|
|
22
|
+
* it is sent; one the fleet did not take is sent again, the same message
|
|
23
|
+
* under the same key. A trierarch seen not crewed is forgotten, so its next
|
|
24
|
+
* lease is sent the set again and confirms again. A trierarch without a key
|
|
25
|
+
* is sent nothing, and so is one whose key the sealer refuses: it is named in
|
|
26
|
+
* `unsealable`. A fleet that does not answer stops the pass; one that refuses
|
|
27
|
+
* a send leaves that trierarch for the next pass.
|
|
28
|
+
*/
|
|
29
|
+
export declare function createDistributeMcpConfiguration(deps: {
|
|
30
|
+
door: FleetDoor;
|
|
31
|
+
connections: ConnectionStore;
|
|
32
|
+
configurations: McpConfigurations;
|
|
33
|
+
deliveries: McpDeliveries;
|
|
34
|
+
sealer: Sealer;
|
|
35
|
+
keys: IdempotencyKeys;
|
|
36
|
+
clock: Clock;
|
|
37
|
+
silentAfterMs: number;
|
|
38
|
+
}): DistributeMcpConfiguration;
|