@aeolus-fleet/trierarch-plugin 0.39.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/rest-fleet-door.js +1 -1
- 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 +56 -59
- 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 +2 -0
- package/dist/core/assignment/placement.js +6 -2
- 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/connection/ports.d.ts +2 -0
- 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/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/package.json +1 -1
- 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
package/dist/app.js
CHANGED
|
@@ -14,6 +14,8 @@ import { createPrismaUsageHistory } from './adapters/prisma/usage-history.js';
|
|
|
14
14
|
import { createPrismaFleetForgetter } from './adapters/prisma/fleet-forgetter.js';
|
|
15
15
|
import { createPrismaFleetSwitches } from './adapters/prisma/fleet-switches.js';
|
|
16
16
|
import { createPrismaInstallationRequests } from './adapters/prisma/installation-requests.js';
|
|
17
|
+
import { createPrismaMcpConfigurations } from './adapters/prisma/mcp-configurations.js';
|
|
18
|
+
import { createPrismaMcpDeliveries } from './adapters/prisma/mcp-deliveries.js';
|
|
17
19
|
import { trierarchPluginRouter } from './adapters/trpc/router.js';
|
|
18
20
|
import { createAnswerPings } from './core/connection/answer-pings.js';
|
|
19
21
|
import { createConnect } from './core/connection/connect.js';
|
|
@@ -31,10 +33,10 @@ import { createJoinMachine } from './core/machines/join-machine.js';
|
|
|
31
33
|
import { createNewSetupLine } from './core/machines/new-setup-line.js';
|
|
32
34
|
import { createDeclareNetworkRules } from './core/network/declare-network-rules.js';
|
|
33
35
|
import { createDeclareScopes } from './core/scopes/declare-scopes.js';
|
|
34
|
-
import {
|
|
35
|
-
import {
|
|
36
|
-
import {
|
|
37
|
-
import {
|
|
36
|
+
import { createReadMcpConfiguration } from './core/mcp-configuration/read-mcp-configuration.js';
|
|
37
|
+
import { createReplaceMcpConfiguration } from './core/mcp-configuration/replace-mcp-configuration.js';
|
|
38
|
+
import { createDistributeMcpConfiguration } from './core/mcp-configuration/distribute-mcp-configuration.js';
|
|
39
|
+
import { createTakeMcpConfigurationMessage } from './core/mcp-configuration/take-mcp-configuration-message.js';
|
|
38
40
|
import { createResendTrustedRepositories } from './core/repositories/resend-trusted-repositories.js';
|
|
39
41
|
import { createShareTrustedRepositories } from './core/repositories/share-trusted-repositories.js';
|
|
40
42
|
import { createWithdrawNetworkRules } from './core/network/withdraw-network-rules.js';
|
|
@@ -104,7 +106,9 @@ export function createTrierarchPluginApp(options) {
|
|
|
104
106
|
const silentAfterMs = options.silentAfterMs ?? DEFAULT_SILENT_AFTER_MS;
|
|
105
107
|
const listMachines = createListMachines({ door, connections, clock, silentAfterMs });
|
|
106
108
|
const models = createPrismaEnabledModels(prisma);
|
|
107
|
-
const
|
|
109
|
+
const mcpConfigurations = createPrismaMcpConfigurations(prisma);
|
|
110
|
+
const mcpDeliveries = createPrismaMcpDeliveries(prisma);
|
|
111
|
+
const assignCrews = createAssignCrews({ door, connections, models, configurations: mcpConfigurations, deliveries: mcpDeliveries, clock, silentAfterMs });
|
|
108
112
|
const labelMachines = createLabelMachines({ door, connections });
|
|
109
113
|
/** The fleets whose machine labels were last skipped, so the reason is logged once, not every pass. */
|
|
110
114
|
const skippedLabels = new Set();
|
|
@@ -208,56 +212,36 @@ export function createTrierarchPluginApp(options) {
|
|
|
208
212
|
shared,
|
|
209
213
|
});
|
|
210
214
|
const resendTrustedRepositories = createResendTrustedRepositories({ shared });
|
|
211
|
-
const
|
|
212
|
-
const shareMcpServers = createShareMcpServers({
|
|
215
|
+
const distributeMcpConfiguration = createDistributeMcpConfiguration({
|
|
213
216
|
door,
|
|
214
217
|
connections,
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
shared: sharedMcpServers,
|
|
218
|
-
});
|
|
219
|
-
const resendMcpServers = createResendMcpServers({ shared: sharedMcpServers });
|
|
220
|
-
/** Sends each trierarch the crew-time MCP servers once; a refusal is logged and the pass goes on. */
|
|
221
|
-
const shareMcpServersOnce = async (fleetId) => {
|
|
222
|
-
const shared = await shareMcpServers(fleetId);
|
|
223
|
-
if (!shared.isOk) {
|
|
224
|
-
server.log.warn({ fleet: fleetId, refusal: shared.error }, 'sharing the MCP servers refused; the next pass tries again');
|
|
225
|
-
}
|
|
226
|
-
else if (shared.value.shared > 0) {
|
|
227
|
-
server.log.info({ fleet: fleetId, ...shared.value }, 'MCP servers sent');
|
|
228
|
-
}
|
|
229
|
-
};
|
|
230
|
-
// The key this process last sealed the store to, per trierarch; a restart seals it to every trierarch again, and so does a trierarch asking.
|
|
231
|
-
const sealedSecrets = new Map();
|
|
232
|
-
const shareSecrets = createShareSecrets({
|
|
233
|
-
door,
|
|
234
|
-
connections,
|
|
235
|
-
keys: randomIdempotencyKeys,
|
|
236
|
-
secrets: options.secrets ?? { secrets: [] },
|
|
218
|
+
configurations: mcpConfigurations,
|
|
219
|
+
deliveries: mcpDeliveries,
|
|
237
220
|
sealer: sealedBoxSealer,
|
|
238
|
-
|
|
221
|
+
keys: randomIdempotencyKeys,
|
|
222
|
+
clock,
|
|
223
|
+
silentAfterMs,
|
|
239
224
|
});
|
|
240
|
-
const resendSecrets = createResendSecrets({ sealed: sealedSecrets });
|
|
241
225
|
/** The key last warned about per trierarch, so a key the sealer refuses is logged once, not every pass. */
|
|
242
226
|
const warnedUnsealable = new Map();
|
|
243
|
-
/**
|
|
244
|
-
const
|
|
245
|
-
const
|
|
246
|
-
if (!
|
|
247
|
-
server.log.warn({ fleet: fleetId, refusal:
|
|
227
|
+
/** Reconciles the fleet's MCP configuration with each trierarch (the fleet crew MCP design, section 5); a refusal is logged, never a value, and the pass goes on. */
|
|
228
|
+
const distributeOnce = async (fleetId) => {
|
|
229
|
+
const distributed = await distributeMcpConfiguration(fleetId);
|
|
230
|
+
if (!distributed.isOk) {
|
|
231
|
+
server.log.warn({ fleet: fleetId, refusal: distributed.error }, 'distributing the MCP configuration refused; the next pass tries again');
|
|
232
|
+
return;
|
|
248
233
|
}
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
server.log.warn({ fleet: fleetId, shipId, publicKey }, "a trierarch's sealing key refuses a sealed box: it gets no secrets until it states another key");
|
|
257
|
-
}
|
|
234
|
+
if (distributed.value.sent > 0) {
|
|
235
|
+
server.log.info({ fleet: fleetId, sent: distributed.value.sent }, 'MCP configuration sent sealed');
|
|
236
|
+
}
|
|
237
|
+
for (const { shipId, publicKey } of distributed.value.unsealable) {
|
|
238
|
+
if (warnedUnsealable.get(shipId) !== publicKey) {
|
|
239
|
+
warnedUnsealable.set(shipId, publicKey);
|
|
240
|
+
server.log.warn({ fleet: fleetId, shipId, publicKey }, "a trierarch's sealing key refuses a sealed box: it gets no MCP configuration until it states another key");
|
|
258
241
|
}
|
|
259
242
|
}
|
|
260
243
|
};
|
|
244
|
+
const takeMcpConfigurationMessage = createTakeMcpConfigurationMessage({ configurations: mcpConfigurations, deliveries: mcpDeliveries });
|
|
261
245
|
/** Sends each trierarch the trusted repositories once (aeolus-fleet#384); a refusal is logged and the pass goes on. */
|
|
262
246
|
const shareOnce = async (fleetId) => {
|
|
263
247
|
const shared = await shareTrustedRepositories(fleetId);
|
|
@@ -268,9 +252,11 @@ export function createTrierarchPluginApp(options) {
|
|
|
268
252
|
server.log.info({ fleet: fleetId, ...shared.value }, 'trusted repositories sent');
|
|
269
253
|
}
|
|
270
254
|
};
|
|
271
|
-
const checkCrewSettings = createCheckCrewSettings({ door, connections, models, clock, silentAfterMs });
|
|
255
|
+
const checkCrewSettings = createCheckCrewSettings({ door, connections, models, configurations: mcpConfigurations, deliveries: mcpDeliveries, clock, silentAfterMs });
|
|
272
256
|
const listEnabledModels = createListEnabledModels({ models });
|
|
273
257
|
const setModelEnabled = createSetModelEnabled({ models });
|
|
258
|
+
const readMcpConfiguration = createReadMcpConfiguration({ configurations: mcpConfigurations });
|
|
259
|
+
const replaceMcpConfiguration = createReplaceMcpConfiguration({ configurations: mcpConfigurations, clock });
|
|
274
260
|
const usage = createPrismaUsageHistory(prisma);
|
|
275
261
|
const readTokenUsage = createReadTokenUsage({ usage, door, connections });
|
|
276
262
|
const readUsageValues = createReadUsageValues({ usage, door, connections });
|
|
@@ -286,8 +272,7 @@ export function createTrierarchPluginApp(options) {
|
|
|
286
272
|
await declareOnce(crew.fleetId);
|
|
287
273
|
await declareScopesOnce(crew.fleetId);
|
|
288
274
|
await shareOnce(crew.fleetId);
|
|
289
|
-
await
|
|
290
|
-
await shareSecretsOnce(crew.fleetId);
|
|
275
|
+
await distributeOnce(crew.fleetId);
|
|
291
276
|
const assigned = await assignCrews(crew.fleetId);
|
|
292
277
|
await tellReasonsOnce(crew.fleetId);
|
|
293
278
|
await tellOnce(crew.fleetId);
|
|
@@ -306,11 +291,26 @@ export function createTrierarchPluginApp(options) {
|
|
|
306
291
|
const answerPings = createAnswerPings({
|
|
307
292
|
connections,
|
|
308
293
|
inbox: door.inbox,
|
|
309
|
-
// A store that fails leaves an ask unacked, handed again; said here, as the round only counts it.
|
|
310
|
-
answerAsk:
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
294
|
+
// A store that fails leaves an ask or a trierarch's MCP configuration message unacked, handed again; said here, as the round only counts it.
|
|
295
|
+
answerAsk: async (crew, delivery) => {
|
|
296
|
+
const taken = await takeMcpConfigurationMessage(crew, delivery).catch((error) => {
|
|
297
|
+
server.log.error({ err: error, fleet: crew.fleetId, senderShipId: delivery.senderShipId }, "a trierarch's MCP configuration message could not be kept; the fleet hands it again");
|
|
298
|
+
throw error;
|
|
299
|
+
});
|
|
300
|
+
if (taken.kind === 'ignored') {
|
|
301
|
+
server.log.warn({ fleet: crew.fleetId, senderShipId: delivery.senderShipId, contentType: delivery.contentType, reason: taken.reason }, "a trierarch's MCP configuration message was ignored");
|
|
302
|
+
}
|
|
303
|
+
else if (taken.kind !== 'notMcpConfiguration') {
|
|
304
|
+
server.log.info({ fleet: crew.fleetId, senderShipId: delivery.senderShipId, taken: taken.kind }, taken.kind === 'applied' ? 'a trierarch applied the MCP configuration' : 'a trierarch asked for the MCP configuration: the next pass sends it');
|
|
305
|
+
}
|
|
306
|
+
if (taken.kind !== 'notMcpConfiguration') {
|
|
307
|
+
return { kind: 'answered' };
|
|
308
|
+
}
|
|
309
|
+
return answerEnabledModelsAsk(crew, delivery).catch((error) => {
|
|
310
|
+
server.log.error({ err: error, fleet: crew.fleetId, senderShipId: delivery.senderShipId }, 'an enabled models ask could not be answered; the fleet hands it again');
|
|
311
|
+
throw error;
|
|
312
|
+
});
|
|
313
|
+
},
|
|
314
314
|
// A store that fails leaves the delivery unacked, handed again; said here, as the round only counts it.
|
|
315
315
|
keepUsage: (fleetId, delivery) => keepUsage(fleetId, delivery).catch((error) => {
|
|
316
316
|
server.log.error({ err: error, fleet: fleetId, senderShipId: delivery.senderShipId }, "a trierarch's usage could not be kept; the fleet hands it again");
|
|
@@ -328,12 +328,6 @@ export function createTrierarchPluginApp(options) {
|
|
|
328
328
|
if (resendTrustedRepositories(delivery)) {
|
|
329
329
|
server.log.info({ senderShipId }, 'a trierarch asked for the trusted repositories: the next pass sends them');
|
|
330
330
|
}
|
|
331
|
-
else if (resendMcpServers(delivery)) {
|
|
332
|
-
server.log.info({ senderShipId }, 'a trierarch asked for the MCP servers: the next pass sends them');
|
|
333
|
-
}
|
|
334
|
-
else if (resendSecrets(delivery)) {
|
|
335
|
-
server.log.info({ senderShipId }, 'a trierarch asked for the secrets: the next pass seals them to it');
|
|
336
|
-
}
|
|
337
331
|
else {
|
|
338
332
|
server.log.info({ contentType, senderShipId }, "the trierarch plugin's ship acked a message it does not handle");
|
|
339
333
|
}
|
|
@@ -392,6 +386,7 @@ export function createTrierarchPluginApp(options) {
|
|
|
392
386
|
createContext: ({ req }) => ({
|
|
393
387
|
cookie: req.headers.cookie,
|
|
394
388
|
origin: req.headers.origin,
|
|
389
|
+
consoleOrigin: options.consoleOrigin ?? new URL(options.fleetUrl).origin,
|
|
395
390
|
authenticateOperator: createAuthenticateOperator({ sessions: createFleetConsoleSessions(options.fleetUrl) }),
|
|
396
391
|
isConnected: async (fleetId) => (await connections.find(fleetId)) !== undefined,
|
|
397
392
|
isServed,
|
|
@@ -409,6 +404,8 @@ export function createTrierarchPluginApp(options) {
|
|
|
409
404
|
checkCrewSettings,
|
|
410
405
|
listEnabledModels,
|
|
411
406
|
setModelEnabled,
|
|
407
|
+
readMcpConfiguration,
|
|
408
|
+
replaceMcpConfiguration,
|
|
412
409
|
readTokenUsage,
|
|
413
410
|
readUsageValues,
|
|
414
411
|
readSubscriptionWindows,
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,11 +19,10 @@ async function start() {
|
|
|
19
19
|
const app = createTrierarchPluginApp({
|
|
20
20
|
databaseUrl: config.databaseUrl,
|
|
21
21
|
fleetUrl: config.fleetUrl,
|
|
22
|
+
consoleOrigin: config.consoleOrigin,
|
|
22
23
|
logger: { level: config.logLevel },
|
|
23
24
|
silentAfterMs: config.silentAfterMs,
|
|
24
25
|
trustedRepositories: config.trustedRepositories,
|
|
25
|
-
mcpServers: config.mcpServers,
|
|
26
|
-
secrets: config.secrets,
|
|
27
26
|
...(config.installationToken === undefined ? {} : { installationToken: config.installationToken }),
|
|
28
27
|
});
|
|
29
28
|
const restored = await app.restoreConnections();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aeolus-trierarch-plugin.js","sourceRoot":"","sources":["../../src/bin/aeolus-trierarch-plugin.ts"],"names":[],"mappings":";AACA;;;;;;;GAOG;AACH,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAExE,MAAM,KAAK,GAAG,gDAAgD,CAAC;AAE/D,KAAK,UAAU,KAAK;IAClB,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACvC,MAAM,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC1C,MAAM,GAAG,GAAG,wBAAwB,CAAC;QACnC,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE;QAClC,aAAa,EAAE,MAAM,CAAC,aAAa;QACnC,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;QAC/C,
|
|
1
|
+
{"version":3,"file":"aeolus-trierarch-plugin.js","sourceRoot":"","sources":["../../src/bin/aeolus-trierarch-plugin.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
import { type McpServers } from './core/mcp-servers/mcp-servers.js';
|
|
2
|
-
import { type Secrets } from './core/mcp-servers/secrets.js';
|
|
3
1
|
import { type TrustedRepositories } from './core/repositories/trusted-repositories.js';
|
|
4
2
|
export interface Config {
|
|
5
3
|
/** The trierarch plugin's own database (decision 0030), which may share the Postgres server with the fleet and squadrons. */
|
|
@@ -12,6 +10,12 @@ export interface Config {
|
|
|
12
10
|
* operator connects the trierarch plugin in the console.
|
|
13
11
|
*/
|
|
14
12
|
fleetUrl: string;
|
|
13
|
+
/**
|
|
14
|
+
* The console's origin, which a change of a fleet's MCP configuration must
|
|
15
|
+
* come from (its Origin header), as the fleet checks its own console's;
|
|
16
|
+
* the origin of FLEET_URL unless CONSOLE_ORIGIN says otherwise.
|
|
17
|
+
*/
|
|
18
|
+
consoleOrigin: string;
|
|
15
19
|
host: string;
|
|
16
20
|
port: number;
|
|
17
21
|
logLevel: string;
|
|
@@ -27,14 +31,6 @@ export interface Config {
|
|
|
27
31
|
passIntervalMs: number;
|
|
28
32
|
/** The repositories every trierarch may clone on demand, by name (aeolus-fleet#384); none by default. */
|
|
29
33
|
trustedRepositories: TrustedRepositories;
|
|
30
|
-
/** The crew-time MCP servers every trierarch offers sessions, by name (aeolus-fleet-trierarch#120); none by default. */
|
|
31
|
-
mcpServers: McpServers;
|
|
32
|
-
/**
|
|
33
|
-
* The secret store the crew-time MCP servers' credentials come from, by
|
|
34
|
-
* name (decision M5): each value leaves only sealed to a trierarch's key.
|
|
35
|
-
* Never logged; none by default.
|
|
36
|
-
*/
|
|
37
|
-
secrets: Secrets;
|
|
38
34
|
}
|
|
39
35
|
export declare class ConfigError extends Error {
|
|
40
36
|
name: string;
|
package/dist/config.js
CHANGED
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
import { DEFAULT_SILENT_AFTER_MS } from './core/machines/silent.js';
|
|
3
|
-
import { readMcpServers, withAip } from './core/mcp-servers/mcp-servers.js';
|
|
4
|
-
import { readSecrets } from './core/mcp-servers/secrets.js';
|
|
5
3
|
import { readTrustedRepositories } from './core/repositories/trusted-repositories.js';
|
|
6
4
|
/** The shortest installation token the trierarch plugin takes, as the fleet core does (decision 0020). */
|
|
7
5
|
const INSTALLATION_TOKEN_MIN_LENGTH = 32;
|
|
@@ -11,6 +9,10 @@ const MS_PER_SECOND = 1000;
|
|
|
11
9
|
const environmentSchema = z.object({
|
|
12
10
|
DATABASE_URL: z.url({ protocol: /^postgres(ql)?$/, error: 'must be a postgres:// or postgresql:// URL' }),
|
|
13
11
|
FLEET_URL: z.url({ protocol: /^https?$/, error: 'must be an http:// or https:// URL' }),
|
|
12
|
+
CONSOLE_ORIGIN: z
|
|
13
|
+
.url({ protocol: /^https?$/, error: 'must be an http:// or https:// origin' })
|
|
14
|
+
.refine((origin) => URL.canParse(origin) && new URL(origin).origin === origin.replace(/\/$/, ''), { error: 'must be an origin without a path, like https://console.example.com' })
|
|
15
|
+
.optional(),
|
|
14
16
|
HOST: z.string().min(1).default('127.0.0.1'),
|
|
15
17
|
PORT: z.coerce.number().int().min(0).max(65_535).default(4200),
|
|
16
18
|
LOG_LEVEL: z.enum(['fatal', 'error', 'warn', 'info', 'debug', 'trace', 'silent']).default('info'),
|
|
@@ -18,9 +20,6 @@ const environmentSchema = z.object({
|
|
|
18
20
|
TRIERARCH_SILENT_AFTER_SECONDS: z.coerce.number().int().positive().default(DEFAULT_SILENT_AFTER_MS / MS_PER_SECOND),
|
|
19
21
|
TRIERARCH_PASS_INTERVAL_SECONDS: z.coerce.number().int().positive().default(DEFAULT_PASS_INTERVAL_SECONDS),
|
|
20
22
|
TRUSTED_REPOSITORIES: z.string().default('{}'),
|
|
21
|
-
MCP_SERVERS: z.string().default('{}'),
|
|
22
|
-
MCP_SECRETS: z.string().default('{}'),
|
|
23
|
-
AIP: z.string().optional(),
|
|
24
23
|
});
|
|
25
24
|
/** What `aeolus-trierarch-plugin migrate` reads: the database alone. */
|
|
26
25
|
const databaseEnvironmentSchema = environmentSchema.pick({ DATABASE_URL: true });
|
|
@@ -49,59 +48,13 @@ function trustedRepositories(text) {
|
|
|
49
48
|
}
|
|
50
49
|
return read.value;
|
|
51
50
|
}
|
|
52
|
-
/** MCP_SERVERS as JSON of names to `{ url, tools }`; throws a ConfigError saying what is wrong. */
|
|
53
|
-
function mcpServers(text) {
|
|
54
|
-
let listed;
|
|
55
|
-
try {
|
|
56
|
-
listed = JSON.parse(text);
|
|
57
|
-
}
|
|
58
|
-
catch {
|
|
59
|
-
throw new ConfigError('MCP_SERVERS: must be JSON of names to { url, tools }');
|
|
60
|
-
}
|
|
61
|
-
const read = readMcpServers(listed);
|
|
62
|
-
if (!read.isOk) {
|
|
63
|
-
throw new ConfigError(`MCP_SERVERS: ${read.error.reason}`);
|
|
64
|
-
}
|
|
65
|
-
return read.value;
|
|
66
|
-
}
|
|
67
|
-
/** AIP as JSON `{ server, tokenSecret }` added to the list; throws a ConfigError saying what is wrong, never a value. */
|
|
68
|
-
function withAipFrom(text, servers) {
|
|
69
|
-
let listed;
|
|
70
|
-
try {
|
|
71
|
-
listed = JSON.parse(text);
|
|
72
|
-
}
|
|
73
|
-
catch {
|
|
74
|
-
throw new ConfigError('AIP: must be JSON of { server, tokenSecret }');
|
|
75
|
-
}
|
|
76
|
-
const read = withAip(servers, listed);
|
|
77
|
-
if (!read.isOk) {
|
|
78
|
-
throw new ConfigError(`AIP: ${read.error.reason.replace(/^the AIP: /, '')}`);
|
|
79
|
-
}
|
|
80
|
-
return read.value;
|
|
81
|
-
}
|
|
82
|
-
/** MCP_SECRETS as JSON of names to values, holding every secret a server's credential names; throws a ConfigError that never holds a value. */
|
|
83
|
-
function secrets(text, servers) {
|
|
84
|
-
let listed;
|
|
85
|
-
try {
|
|
86
|
-
listed = JSON.parse(text);
|
|
87
|
-
}
|
|
88
|
-
catch {
|
|
89
|
-
throw new ConfigError('MCP_SECRETS: must be JSON of names to values');
|
|
90
|
-
}
|
|
91
|
-
const read = readSecrets(listed, servers);
|
|
92
|
-
if (!read.isOk) {
|
|
93
|
-
throw new ConfigError(`MCP_SECRETS: ${read.error.reason}`);
|
|
94
|
-
}
|
|
95
|
-
return read.value;
|
|
96
|
-
}
|
|
97
51
|
/** The configuration from the environment; throws a ConfigError naming every variable that is wrong. */
|
|
98
52
|
export function loadConfig(environment) {
|
|
99
53
|
const variables = parsed(environmentSchema, environment);
|
|
100
|
-
const listed = mcpServers(variables.MCP_SERVERS);
|
|
101
|
-
const servers = variables.AIP === undefined ? listed : withAipFrom(variables.AIP, listed);
|
|
102
54
|
return {
|
|
103
55
|
databaseUrl: variables.DATABASE_URL,
|
|
104
56
|
fleetUrl: variables.FLEET_URL.replace(/\/$/, ''),
|
|
57
|
+
consoleOrigin: new URL(variables.CONSOLE_ORIGIN ?? variables.FLEET_URL).origin,
|
|
105
58
|
host: variables.HOST,
|
|
106
59
|
port: variables.PORT,
|
|
107
60
|
logLevel: variables.LOG_LEVEL,
|
|
@@ -109,8 +62,6 @@ export function loadConfig(environment) {
|
|
|
109
62
|
silentAfterMs: variables.TRIERARCH_SILENT_AFTER_SECONDS * MS_PER_SECOND,
|
|
110
63
|
passIntervalMs: variables.TRIERARCH_PASS_INTERVAL_SECONDS * MS_PER_SECOND,
|
|
111
64
|
trustedRepositories: trustedRepositories(variables.TRUSTED_REPOSITORIES),
|
|
112
|
-
mcpServers: servers,
|
|
113
|
-
secrets: secrets(variables.MCP_SECRETS, servers),
|
|
114
65
|
};
|
|
115
66
|
}
|
|
116
67
|
/** The database URL alone, for `aeolus-trierarch-plugin migrate`. */
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { FleetId } from '@aeolus-fleet/common';
|
|
2
2
|
import type { ConnectionStore, FleetDoor } from '../connection/ports.js';
|
|
3
|
+
import type { McpConfigurations, McpDeliveries } from '../mcp-configuration/ports.js';
|
|
3
4
|
import type { EnabledModels } from '../models/ports.js';
|
|
4
5
|
import type { Clock } from '../shared/clock.js';
|
|
5
6
|
import { type DomainError } from '../shared/errors.js';
|
|
@@ -16,7 +17,8 @@ export type AssignCrews = (fleetId: FleetId) => Promise<Result<AssignOutcome, Do
|
|
|
16
17
|
* "Assignment"). It reads the fleet whole each time: the unassigned requests
|
|
17
18
|
* of ships that await crew, and the trierarchs that report details and are
|
|
18
19
|
* not silent, with the requests assigned to each, and the fleet's enabled
|
|
19
|
-
* models as they are now (model governance, M5)
|
|
20
|
+
* models as they are now (model governance, M5), and whether each trierarch
|
|
21
|
+
* confirmed the fleet's current MCP configuration. Placement decides; each
|
|
20
22
|
* claim is optimistic, and one the fleet refuses because the request changed
|
|
21
23
|
* is no error: the next pass reads it again. A silent trierarch gets nothing
|
|
22
24
|
* new and keeps what it holds.
|
|
@@ -25,6 +27,8 @@ export declare function createAssignCrews(deps: {
|
|
|
25
27
|
door: FleetDoor;
|
|
26
28
|
connections: ConnectionStore;
|
|
27
29
|
models: EnabledModels;
|
|
30
|
+
configurations: McpConfigurations;
|
|
31
|
+
deliveries: McpDeliveries;
|
|
28
32
|
clock: Clock;
|
|
29
33
|
silentAfterMs: number;
|
|
30
34
|
}): AssignCrews;
|
|
@@ -9,7 +9,8 @@ const CHANGED = new Set(['CONFLICT', 'NOT_FOUND']);
|
|
|
9
9
|
* "Assignment"). It reads the fleet whole each time: the unassigned requests
|
|
10
10
|
* of ships that await crew, and the trierarchs that report details and are
|
|
11
11
|
* not silent, with the requests assigned to each, and the fleet's enabled
|
|
12
|
-
* models as they are now (model governance, M5)
|
|
12
|
+
* models as they are now (model governance, M5), and whether each trierarch
|
|
13
|
+
* confirmed the fleet's current MCP configuration. Placement decides; each
|
|
13
14
|
* claim is optimistic, and one the fleet refuses because the request changed
|
|
14
15
|
* is no error: the next pass reads it again. A silent trierarch gets nothing
|
|
15
16
|
* new and keeps what it holds.
|
|
@@ -21,7 +22,8 @@ export function createAssignCrews(deps) {
|
|
|
21
22
|
if (!crew) {
|
|
22
23
|
return refuse('NOT_CONNECTED', 'The trierarch plugin is not connected to this fleet: connect it in the console');
|
|
23
24
|
}
|
|
24
|
-
const
|
|
25
|
+
const [{ version }, deliveries] = await Promise.all([deps.configurations.read(fleetId), deps.deliveries.list(fleetId)]);
|
|
26
|
+
const read = await readPlacement(deps.door, { crewToken: crew.crewToken, now: deps.clock.now(), silentAfterMs: deps.silentAfterMs, mcp: { version, deliveries } });
|
|
25
27
|
if (!read.isOk) {
|
|
26
28
|
return unavailable(read.error);
|
|
27
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assign-crews.js","sourceRoot":"","sources":["../../../src/core/assignment/assign-crews.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"assign-crews.js","sourceRoot":"","sources":["../../../src/core/assignment/assign-crews.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAWpD,8HAA8H;AAC9H,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;AAEnD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAQjC;IACC,MAAM,WAAW,GAAG,CAAC,OAAqB,EAAE,EAAE,CAAC,MAAM,CAAC,mBAAmB,EAAE,4CAA4C,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IAC1I,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,CAAC,EAAE,OAAO,EAAE,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxH,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,GAAG,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;QACnK,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC;QACD,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC5C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEtD,MAAM,OAAO,GAAkB,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;QACtE,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,CAAC,EAAE,CAAC;YACvE,MAAM,IAAI,GACR,SAAS,CAAC,IAAI,KAAK,QAAQ;gBACzB,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,eAAe,EAAE,SAAS,CAAC,eAAe,EAAE,CAAC;gBACtH,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;YACjH,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChD,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC;YACD,IAAI,SAAS,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBACjC,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzC,CAAC;iBAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACrB,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC;YACpB,CAAC;QACH,CAAC;QACD,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { FleetId } from '@aeolus-fleet/common';
|
|
2
2
|
import type { ConnectionStore, FleetDoor } from '../connection/ports.js';
|
|
3
|
+
import type { McpConfigurations, McpDeliveries } from '../mcp-configuration/ports.js';
|
|
3
4
|
import type { EnabledModels } from '../models/ports.js';
|
|
4
5
|
import type { Clock } from '../shared/clock.js';
|
|
5
6
|
import { type DomainError } from '../shared/errors.js';
|
|
@@ -16,6 +17,8 @@ export declare function createCheckCrewSettings(deps: {
|
|
|
16
17
|
door: FleetDoor;
|
|
17
18
|
connections: ConnectionStore;
|
|
18
19
|
models: EnabledModels;
|
|
20
|
+
configurations: McpConfigurations;
|
|
21
|
+
deliveries: McpDeliveries;
|
|
19
22
|
clock: Clock;
|
|
20
23
|
silentAfterMs: number;
|
|
21
24
|
}): CheckCrewSettings;
|
|
@@ -14,7 +14,8 @@ export function createCheckCrewSettings(deps) {
|
|
|
14
14
|
if (!crew) {
|
|
15
15
|
return refuse('NOT_CONNECTED', 'The trierarch plugin is not connected to this fleet: connect it in the console');
|
|
16
16
|
}
|
|
17
|
-
const
|
|
17
|
+
const [{ version }, deliveries] = await Promise.all([deps.configurations.read(fleetId), deps.deliveries.list(fleetId)]);
|
|
18
|
+
const read = await readPlacement(deps.door, { crewToken: crew.crewToken, now: deps.clock.now(), silentAfterMs: deps.silentAfterMs, mcp: { version, deliveries } });
|
|
18
19
|
if (!read.isOk) {
|
|
19
20
|
return refuse('FLEET_UNAVAILABLE', `The fleet did not answer the check: ${read.error.message}`);
|
|
20
21
|
}
|
|
@@ -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":"AAMA,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,IAQvC;IACC,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,CAAC,EAAE,OAAO,EAAE,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxH,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,GAAG,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;QACnK,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"}
|
|
@@ -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
|
|
@@ -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`). */
|
|
@@ -132,7 +136,7 @@ function fit(settings, { trierarchs, enabledModels, givenBack }) {
|
|
|
132
136
|
if (serversRefusal !== undefined) {
|
|
133
137
|
return { reason: serversRefusal.slice(0, CREW_REQUEST_REASON_MAX_LENGTH), field: 'mcpServers' };
|
|
134
138
|
}
|
|
135
|
-
const withServers = offering.filter((
|
|
139
|
+
const withServers = offering.filter((offer) => (settings.mcpServers ?? []).every((name) => offeredServers(offer).includes(name)));
|
|
136
140
|
const withWorkspace = withServers.filter(({ trierarch }) => offersWorkspace(trierarch.details, settings.workspace));
|
|
137
141
|
if (withWorkspace.length === 0) {
|
|
138
142
|
return { reason: `no trierarch offering ${harnessWords} has ${workspaceName(settings.workspace)}`, field: 'workspace' };
|