@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.
Files changed (135) hide show
  1. package/README.md +16 -8
  2. package/dist/adapters/crypto/sealed-box-sealer.d.ts +1 -1
  3. package/dist/adapters/fleet/console-sessions.js +3 -3
  4. package/dist/adapters/fleet/console-sessions.js.map +1 -1
  5. package/dist/adapters/fleet/core-version.d.ts +1 -1
  6. package/dist/adapters/fleet/core-version.js +1 -1
  7. package/dist/adapters/fleet/rest-fleet-door.js +6 -5
  8. package/dist/adapters/fleet/rest-fleet-door.js.map +1 -1
  9. package/dist/adapters/prisma/fleet-forgetter.d.ts +1 -1
  10. package/dist/adapters/prisma/fleet-forgetter.js +2 -2
  11. package/dist/adapters/prisma/fleet-forgetter.js.map +1 -1
  12. package/dist/adapters/prisma/generated/browser.d.ts +32 -0
  13. package/dist/adapters/prisma/generated/client.d.ts +32 -0
  14. package/dist/adapters/prisma/generated/commonInputTypes.d.ts +150 -0
  15. package/dist/adapters/prisma/generated/internal/class.d.ts +44 -0
  16. package/dist/adapters/prisma/generated/internal/class.js +4 -4
  17. package/dist/adapters/prisma/generated/internal/class.js.map +1 -1
  18. package/dist/adapters/prisma/generated/internal/prismaNamespace.d.ts +360 -1
  19. package/dist/adapters/prisma/generated/internal/prismaNamespace.js +46 -1
  20. package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
  21. package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +51 -0
  22. package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +46 -1
  23. package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
  24. package/dist/adapters/prisma/generated/models/McpConfiguration.d.ts +1004 -0
  25. package/dist/adapters/prisma/generated/models/McpConfiguration.js +2 -0
  26. package/dist/adapters/prisma/generated/models/McpConfiguration.js.map +1 -0
  27. package/dist/adapters/prisma/generated/models/McpConfigurationEvent.d.ts +1141 -0
  28. package/dist/adapters/prisma/generated/models/McpConfigurationEvent.js +2 -0
  29. package/dist/adapters/prisma/generated/models/McpConfigurationEvent.js.map +1 -0
  30. package/dist/adapters/prisma/generated/models/McpDelivery.d.ts +1204 -0
  31. package/dist/adapters/prisma/generated/models/McpDelivery.js +2 -0
  32. package/dist/adapters/prisma/generated/models/McpDelivery.js.map +1 -0
  33. package/dist/adapters/prisma/generated/models/McpSecret.d.ts +948 -0
  34. package/dist/adapters/prisma/generated/models/McpSecret.js +2 -0
  35. package/dist/adapters/prisma/generated/models/McpSecret.js.map +1 -0
  36. package/dist/adapters/prisma/generated/models.d.ts +4 -0
  37. package/dist/adapters/prisma/mcp-configurations.d.ts +11 -0
  38. package/dist/adapters/prisma/mcp-configurations.js +44 -0
  39. package/dist/adapters/prisma/mcp-configurations.js.map +1 -0
  40. package/dist/adapters/prisma/mcp-deliveries.d.ts +9 -0
  41. package/dist/adapters/prisma/mcp-deliveries.js +47 -0
  42. package/dist/adapters/prisma/mcp-deliveries.js.map +1 -0
  43. package/dist/adapters/trpc/router.d.ts +63 -5
  44. package/dist/adapters/trpc/router.js +60 -2
  45. package/dist/adapters/trpc/router.js.map +1 -1
  46. package/dist/app.d.ts +2 -6
  47. package/dist/app.js +78 -54
  48. package/dist/app.js.map +1 -1
  49. package/dist/bin/aeolus-trierarch-plugin.js +1 -2
  50. package/dist/bin/aeolus-trierarch-plugin.js.map +1 -1
  51. package/dist/config.d.ts +6 -10
  52. package/dist/config.js +5 -54
  53. package/dist/config.js.map +1 -1
  54. package/dist/core/assignment/assign-crews.d.ts +5 -1
  55. package/dist/core/assignment/assign-crews.js +4 -2
  56. package/dist/core/assignment/assign-crews.js.map +1 -1
  57. package/dist/core/assignment/check-crew-settings.d.ts +3 -0
  58. package/dist/core/assignment/check-crew-settings.js +2 -1
  59. package/dist/core/assignment/check-crew-settings.js.map +1 -1
  60. package/dist/core/assignment/placement.d.ts +6 -0
  61. package/dist/core/assignment/placement.js +12 -4
  62. package/dist/core/assignment/placement.js.map +1 -1
  63. package/dist/core/assignment/read-placement.d.ts +7 -1
  64. package/dist/core/assignment/read-placement.js +14 -2
  65. package/dist/core/assignment/read-placement.js.map +1 -1
  66. package/dist/core/assignment/tell-crew-request-reasons.d.ts +35 -0
  67. package/dist/core/assignment/tell-crew-request-reasons.js +110 -0
  68. package/dist/core/assignment/tell-crew-request-reasons.js.map +1 -0
  69. package/dist/core/connection/answer-pings.d.ts +13 -1
  70. package/dist/core/connection/answer-pings.js +11 -2
  71. package/dist/core/connection/answer-pings.js.map +1 -1
  72. package/dist/core/connection/ports.d.ts +23 -6
  73. package/dist/core/connection/ports.js +2 -1
  74. package/dist/core/connection/ports.js.map +1 -1
  75. package/dist/core/mcp-configuration/distribute-mcp-configuration.d.ts +38 -0
  76. package/dist/core/mcp-configuration/distribute-mcp-configuration.js +97 -0
  77. package/dist/core/mcp-configuration/distribute-mcp-configuration.js.map +1 -0
  78. package/dist/core/mcp-configuration/mcp-configuration.d.ts +107 -0
  79. package/dist/core/mcp-configuration/mcp-configuration.js +205 -0
  80. package/dist/core/mcp-configuration/mcp-configuration.js.map +1 -0
  81. package/dist/core/mcp-configuration/mcp-delivery.d.ts +59 -0
  82. package/dist/core/mcp-configuration/mcp-delivery.js +32 -0
  83. package/dist/core/mcp-configuration/mcp-delivery.js.map +1 -0
  84. package/dist/core/mcp-configuration/ports.d.ts +79 -0
  85. package/dist/core/mcp-configuration/ports.js.map +1 -0
  86. package/dist/core/mcp-configuration/read-mcp-configuration.d.ts +8 -0
  87. package/dist/core/mcp-configuration/read-mcp-configuration.js +6 -0
  88. package/dist/core/mcp-configuration/read-mcp-configuration.js.map +1 -0
  89. package/dist/core/mcp-configuration/replace-mcp-configuration.d.ts +24 -0
  90. package/dist/core/mcp-configuration/replace-mcp-configuration.js +30 -0
  91. package/dist/core/mcp-configuration/replace-mcp-configuration.js.map +1 -0
  92. package/dist/core/mcp-configuration/sealing-key.js.map +1 -0
  93. package/dist/core/mcp-configuration/take-mcp-configuration-message.d.ts +30 -0
  94. package/dist/core/mcp-configuration/take-mcp-configuration-message.js +74 -0
  95. package/dist/core/mcp-configuration/take-mcp-configuration-message.js.map +1 -0
  96. package/dist/core/models/answer-enabled-models-asks.d.ts +18 -0
  97. package/dist/core/models/answer-enabled-models-asks.js +32 -0
  98. package/dist/core/models/answer-enabled-models-asks.js.map +1 -0
  99. package/dist/core/operator/authenticate-operator.d.ts +3 -1
  100. package/dist/core/operator/authenticate-operator.js +7 -4
  101. package/dist/core/operator/authenticate-operator.js.map +1 -1
  102. package/dist/core/operator/ports.d.ts +2 -1
  103. package/dist/core/shared/errors.d.ts +1 -1
  104. package/dist/core/shared/errors.js.map +1 -1
  105. package/dist/core/usage/ship-names.d.ts +1 -1
  106. package/dist/core/usage/ship-names.js +2 -1
  107. package/dist/core/usage/ship-names.js.map +1 -1
  108. package/package.json +3 -3
  109. package/src/adapters/prisma/migrations/20261109120000_mcp_configurations/migration.sql +35 -0
  110. package/src/adapters/prisma/migrations/20261109130000_mcp_deliveries/migration.sql +15 -0
  111. package/src/adapters/prisma/schema.prisma +65 -0
  112. package/dist/core/mcp-servers/mcp-servers.d.ts +0 -46
  113. package/dist/core/mcp-servers/mcp-servers.js +0 -112
  114. package/dist/core/mcp-servers/mcp-servers.js.map +0 -1
  115. package/dist/core/mcp-servers/ports.d.ts +0 -13
  116. package/dist/core/mcp-servers/ports.js.map +0 -1
  117. package/dist/core/mcp-servers/resend-mcp-servers.d.ts +0 -15
  118. package/dist/core/mcp-servers/resend-mcp-servers.js +0 -19
  119. package/dist/core/mcp-servers/resend-mcp-servers.js.map +0 -1
  120. package/dist/core/mcp-servers/resend-secrets.d.ts +0 -15
  121. package/dist/core/mcp-servers/resend-secrets.js +0 -19
  122. package/dist/core/mcp-servers/resend-secrets.js.map +0 -1
  123. package/dist/core/mcp-servers/sealing-key.js.map +0 -1
  124. package/dist/core/mcp-servers/secrets.d.ts +0 -31
  125. package/dist/core/mcp-servers/secrets.js +0 -90
  126. package/dist/core/mcp-servers/secrets.js.map +0 -1
  127. package/dist/core/mcp-servers/share-mcp-servers.d.ts +0 -25
  128. package/dist/core/mcp-servers/share-mcp-servers.js +0 -45
  129. package/dist/core/mcp-servers/share-mcp-servers.js.map +0 -1
  130. package/dist/core/mcp-servers/share-secrets.d.ts +0 -36
  131. package/dist/core/mcp-servers/share-secrets.js +0 -71
  132. package/dist/core/mcp-servers/share-secrets.js.map +0 -1
  133. /package/dist/core/{mcp-servers → mcp-configuration}/ports.js +0 -0
  134. /package/dist/core/{mcp-servers → mcp-configuration}/sealing-key.d.ts +0 -0
  135. /package/dist/core/{mcp-servers → mcp-configuration}/sealing-key.js +0 -0
@@ -0,0 +1,24 @@
1
+ import type { FleetId } from '@aeolus-fleet/common';
2
+ import type { Clock } from '../shared/clock.js';
3
+ import { type DomainError } from '../shared/errors.js';
4
+ import { type Result } from '../shared/result.js';
5
+ import { type McpReplacement } from './mcp-configuration.js';
6
+ import type { McpActor, McpConfigurations } from './ports.js';
7
+ export type ReplaceMcpConfiguration = (request: {
8
+ fleetId: FleetId;
9
+ actor: McpActor;
10
+ replacement: McpReplacement;
11
+ }) => Promise<Result<{
12
+ version: number;
13
+ }, DomainError<'VERSION_CONFLICT' | 'INVALID_CONFIGURATION'>>>;
14
+ /**
15
+ * Use case: a manager replaces their fleet's MCP configuration whole (design
16
+ * section 4): read the current set, replace it by the model's rules, then save
17
+ * it with its value-free event, only while the version is still the one
18
+ * read. A writer that lost to another of the same version is answered the
19
+ * conflict, nothing written. Success means saved, not yet applied anywhere.
20
+ */
21
+ export declare function createReplaceMcpConfiguration(deps: {
22
+ configurations: McpConfigurations;
23
+ clock: Clock;
24
+ }): ReplaceMcpConfiguration;
@@ -0,0 +1,30 @@
1
+ import { refuse } from '../shared/errors.js';
2
+ import { ok } from '../shared/result.js';
3
+ import { replaceMcpConfiguration } from './mcp-configuration.js';
4
+ /**
5
+ * Use case: a manager replaces their fleet's MCP configuration whole (design
6
+ * section 4): read the current set, replace it by the model's rules, then save
7
+ * it with its value-free event, only while the version is still the one
8
+ * read. A writer that lost to another of the same version is answered the
9
+ * conflict, nothing written. Success means saved, not yet applied anywhere.
10
+ */
11
+ export function createReplaceMcpConfiguration(deps) {
12
+ return async ({ fleetId, actor, replacement }) => {
13
+ const current = await deps.configurations.read(fleetId);
14
+ const replaced = replaceMcpConfiguration({ fleetId, current }, replacement);
15
+ if (!replaced.isOk) {
16
+ return replaced;
17
+ }
18
+ const { configuration, changed } = replaced.value;
19
+ const saved = await deps.configurations.replace(fleetId, {
20
+ expectedVersion: current.version,
21
+ configuration,
22
+ event: { type: 'McpConfigurationReplaced', fleetId, version: configuration.version, actor, changed, at: deps.clock.now() },
23
+ });
24
+ if (saved === 'conflict') {
25
+ return refuse('VERSION_CONFLICT', `The MCP configuration changed from version ${String(current.version)} meanwhile: read it again before replacing it`);
26
+ }
27
+ return ok({ version: configuration.version });
28
+ };
29
+ }
30
+ //# sourceMappingURL=replace-mcp-configuration.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"replace-mcp-configuration.js","sourceRoot":"","sources":["../../../src/core/mcp-configuration/replace-mcp-configuration.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAuB,MAAM,wBAAwB,CAAC;AAKtF;;;;;;GAMG;AACH,MAAM,UAAU,6BAA6B,CAAC,IAAyD;IACrG,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE;QAC/C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,uBAAuB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,WAAW,CAAC,CAAC;QAC5E,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACnB,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC;QAClD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE;YACvD,eAAe,EAAE,OAAO,CAAC,OAAO;YAChC,aAAa;YACb,KAAK,EAAE,EAAE,IAAI,EAAE,0BAA0B,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE;SAC3H,CAAC,CAAC;QACH,IAAI,KAAK,KAAK,UAAU,EAAE,CAAC;YACzB,OAAO,MAAM,CAAC,kBAAkB,EAAE,8CAA8C,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,+CAA+C,CAAC,CAAC;QAC1J,CAAC;QACD,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC;IAChD,CAAC,CAAC;AACJ,CAAC"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sealing-key.js","sourceRoot":"","sources":["../../../src/core/mcp-configuration/sealing-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,gFAAgF;AAChF,MAAM,MAAM,GAAG,iBAAiB,CAAC;AAEjC,+GAA+G;AAC/G,MAAM,iBAAiB,GAAG,wCAAwC,CAAC;AAEnE,2EAA2E;AAC3E,MAAM,QAAQ,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC;AAEtC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,QAAQ,CAAC,EAAE,CAAC;CAClJ,CAAC,CAAC;AAEH;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,OAAgB;IAC7C,MAAM,IAAI,GAAG,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC9C,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;AACnE,CAAC"}
@@ -0,0 +1,30 @@
1
+ import type { PluginCrew, PluginDelivery } from '../connection/ports.js';
2
+ import type { McpConfigurations, McpDeliveries } from './ports.js';
3
+ /** What became of a delivery to the plugin's ship: not of the MCP configuration; a confirmation recorded; a request marked; or ignored, and why. */
4
+ export type TakenMcpMessage = {
5
+ readonly kind: 'notMcpConfiguration';
6
+ } | {
7
+ readonly kind: 'applied';
8
+ } | {
9
+ readonly kind: 'requested';
10
+ } | {
11
+ readonly kind: 'ignored';
12
+ readonly reason: string;
13
+ };
14
+ export type TakeMcpConfigurationMessage = (crew: PluginCrew, delivery: PluginDelivery) => Promise<TakenMcpMessage>;
15
+ /**
16
+ * Use case: a trierarch's message about its fleet's MCP configuration to the
17
+ * plugin's ship (the fleet crew MCP design, section 5). The fleet names the
18
+ * sender and its status; the payload's identity must agree with this fleet
19
+ * and this plugin ship, and never authorises itself. A confirmation counts
20
+ * only from a crewed trierarch, for the fleet's current version and the key
21
+ * its last attempt was sealed to: it is recorded against that trierarch. A
22
+ * request, which a trierarch sends when its lease starts, forgets its
23
+ * confirmation and marks it so the next pass sends it a new copy. Anything
24
+ * else of the contract is ignored, recording nothing, with a reason that
25
+ * holds no payload.
26
+ */
27
+ export declare function createTakeMcpConfigurationMessage(deps: {
28
+ configurations: McpConfigurations;
29
+ deliveries: McpDeliveries;
30
+ }): TakeMcpConfigurationMessage;
@@ -0,0 +1,74 @@
1
+ import { idSchema } from '@aeolus-fleet/common';
2
+ import { z } from 'zod';
3
+ import { TRIERARCH_TYPE } from '../machines/join-machine.js';
4
+ import { MCP_CONFIGURATION_APPLIED_CONTENT_TYPE, MCP_CONFIGURATION_REQUEST_CONTENT_TYPE } from './mcp-configuration.js';
5
+ const appliedSchema = z.strictObject({ fleetId: idSchema('fleet'), pluginShipId: idSchema('ship'), version: z.int().nonnegative(), publicKey: z.string() });
6
+ const requestSchema = z.strictObject({ fleetId: idSchema('fleet'), pluginShipId: idSchema('ship') });
7
+ const OTHER_IDENTITY = 'it names another fleet or plugin ship';
8
+ /** Whether the payload names this fleet and this plugin ship, as the configured identity is. */
9
+ function isOwn(crew, named) {
10
+ return named.fleetId === crew.fleetId && named.pluginShipId === crew.shipId;
11
+ }
12
+ /** The payload read by the schema, or undefined for text that is not JSON or does not fit it. */
13
+ function readPayload(payload, schema) {
14
+ try {
15
+ const read = schema.safeParse(JSON.parse(payload));
16
+ return read.success ? read.data : undefined;
17
+ }
18
+ catch {
19
+ // Not JSON: not a message of this contract.
20
+ return undefined;
21
+ }
22
+ }
23
+ /**
24
+ * Use case: a trierarch's message about its fleet's MCP configuration to the
25
+ * plugin's ship (the fleet crew MCP design, section 5). The fleet names the
26
+ * sender and its status; the payload's identity must agree with this fleet
27
+ * and this plugin ship, and never authorises itself. A confirmation counts
28
+ * only from a crewed trierarch, for the fleet's current version and the key
29
+ * its last attempt was sealed to: it is recorded against that trierarch. A
30
+ * request, which a trierarch sends when its lease starts, forgets its
31
+ * confirmation and marks it so the next pass sends it a new copy. Anything
32
+ * else of the contract is ignored, recording nothing, with a reason that
33
+ * holds no payload.
34
+ */
35
+ export function createTakeMcpConfigurationMessage(deps) {
36
+ return async (crew, delivery) => {
37
+ const isApplied = delivery.contentType === MCP_CONFIGURATION_APPLIED_CONTENT_TYPE;
38
+ if (!isApplied && delivery.contentType !== MCP_CONFIGURATION_REQUEST_CONTENT_TYPE) {
39
+ return { kind: 'notMcpConfiguration' };
40
+ }
41
+ if (delivery.senderType !== TRIERARCH_TYPE || delivery.senderStatus !== 'crewed') {
42
+ return { kind: 'ignored', reason: 'its sender is not a crewed trierarch' };
43
+ }
44
+ if (!isApplied) {
45
+ const request = readPayload(delivery.payload, requestSchema);
46
+ if (request === undefined) {
47
+ return { kind: 'ignored', reason: 'its payload is not { fleetId, pluginShipId }' };
48
+ }
49
+ if (!isOwn(crew, request)) {
50
+ return { kind: 'ignored', reason: OTHER_IDENTITY };
51
+ }
52
+ await deps.deliveries.markRequested(crew.fleetId, delivery.senderShipId);
53
+ return { kind: 'requested' };
54
+ }
55
+ const read = readPayload(delivery.payload, appliedSchema);
56
+ if (read === undefined) {
57
+ return { kind: 'ignored', reason: 'its payload is not { fleetId, pluginShipId, version, publicKey }' };
58
+ }
59
+ if (!isOwn(crew, read)) {
60
+ return { kind: 'ignored', reason: OTHER_IDENTITY };
61
+ }
62
+ const { version } = await deps.configurations.read(crew.fleetId);
63
+ if (read.version !== version) {
64
+ return { kind: 'ignored', reason: `it confirms version ${String(read.version)}, not the current version ${String(version)}` };
65
+ }
66
+ const attempt = (await deps.deliveries.list(crew.fleetId)).find((each) => each.trierarchShipId === delivery.senderShipId)?.attempt;
67
+ if (attempt?.version !== read.version || attempt.publicKey !== read.publicKey) {
68
+ return { kind: 'ignored', reason: 'it confirms a version and key it was not sent' };
69
+ }
70
+ await deps.deliveries.recordApplied(crew.fleetId, { trierarchShipId: delivery.senderShipId, applied: { version: read.version, publicKey: read.publicKey } });
71
+ return { kind: 'applied' };
72
+ };
73
+ }
74
+ //# sourceMappingURL=take-mcp-configuration-message.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"take-mcp-configuration-message.js","sourceRoot":"","sources":["../../../src/core/mcp-configuration/take-mcp-configuration-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,sCAAsC,EAAE,sCAAsC,EAAE,MAAM,wBAAwB,CAAC;AAQxH,MAAM,aAAa,GAAG,CAAC,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAE5J,MAAM,aAAa,GAAG,CAAC,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAErG,MAAM,cAAc,GAAG,uCAAuC,CAAC;AAE/D,gGAAgG;AAChG,SAAS,KAAK,CAAC,IAAgB,EAAE,KAAgD;IAC/E,OAAO,KAAK,CAAC,OAAO,KAAK,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC,YAAY,KAAK,IAAI,CAAC,MAAM,CAAC;AAC9E,CAAC;AAED,iGAAiG;AACjG,SAAS,WAAW,CAAI,OAAe,EAAE,MAAoB;IAC3D,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9C,CAAC;IAAC,MAAM,CAAC;QACP,4CAA4C;QAC5C,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,iCAAiC,CAAC,IAAsE;IACtH,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;QAC9B,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,KAAK,sCAAsC,CAAC;QAClF,IAAI,CAAC,SAAS,IAAI,QAAQ,CAAC,WAAW,KAAK,sCAAsC,EAAE,CAAC;YAClF,OAAO,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC;QACzC,CAAC;QACD,IAAI,QAAQ,CAAC,UAAU,KAAK,cAAc,IAAI,QAAQ,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;YACjF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,sCAAsC,EAAE,CAAC;QAC7E,CAAC;QACD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YAC7D,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;gBAC1B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,8CAA8C,EAAE,CAAC;YACrF,CAAC;YACD,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;gBAC1B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;YACrD,CAAC;YACD,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,YAAY,CAAC,CAAC;YACzE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;QAC/B,CAAC;QACD,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC1D,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,kEAAkE,EAAE,CAAC;QACzG,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;YACvB,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;QACrD,CAAC;QACD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACjE,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;YAC7B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,uBAAuB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,6BAA6B,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;QAChI,CAAC;QACD,MAAM,OAAO,GAAG,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,KAAK,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;QACnI,IAAI,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;YAC9E,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,+CAA+C,EAAE,CAAC;QACtF,CAAC;QACD,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,eAAe,EAAE,QAAQ,CAAC,YAAY,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC7J,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC7B,CAAC,CAAC;AACJ,CAAC"}
@@ -0,0 +1,18 @@
1
+ import type { AnswerAsk } from '../connection/answer-pings.js';
2
+ import type { FleetDoor } from '../connection/ports.js';
3
+ import type { IsServed } from '../installation/served.js';
4
+ import type { EnabledModels } from './ports.js';
5
+ /**
6
+ * Use case: any ship asks the plugin's ship for the fleet's enabled models
7
+ * (the enabled models design, R1). The reply is sent inReplyTo the ask with the
8
+ * fleet's set as it is now, sorted; an empty list is no rule (decision 0063).
9
+ * The key is made from the ask's message id, so a crash after the reply answers
10
+ * again and the fleet stores the reply once; a reply it holds already, whatever the set was then, is the answer. A fleet the plugin does not serve
11
+ * leaves the ask waiting (R6). A store that fails rejects, so the ask is not
12
+ * acked and is handed again.
13
+ */
14
+ export declare function createAnswerEnabledModelsAsks(deps: {
15
+ door: FleetDoor;
16
+ models: EnabledModels;
17
+ isServed: IsServed;
18
+ }): AnswerAsk;
@@ -0,0 +1,32 @@
1
+ import { ENABLED_MODELS_ASK_CONTENT_TYPE, ENABLED_MODELS_CONTENT_TYPE, enabledModelsSchema } from '@aeolus-fleet/common';
2
+ const ALREADY_ANSWERED = 'CONFLICT';
3
+ /**
4
+ * Use case: any ship asks the plugin's ship for the fleet's enabled models
5
+ * (the enabled models design, R1). The reply is sent inReplyTo the ask with the
6
+ * fleet's set as it is now, sorted; an empty list is no rule (decision 0063).
7
+ * The key is made from the ask's message id, so a crash after the reply answers
8
+ * again and the fleet stores the reply once; a reply it holds already, whatever the set was then, is the answer. A fleet the plugin does not serve
9
+ * leaves the ask waiting (R6). A store that fails rejects, so the ask is not
10
+ * acked and is handed again.
11
+ */
12
+ export function createAnswerEnabledModelsAsks(deps) {
13
+ return async (crew, delivery) => {
14
+ if (delivery.contentType !== ENABLED_MODELS_ASK_CONTENT_TYPE) {
15
+ return { kind: 'notAsk' };
16
+ }
17
+ if (!(await deps.isServed(crew.fleetId))) {
18
+ return { kind: 'left' };
19
+ }
20
+ const models = (await deps.models.list(crew.fleetId)).toSorted();
21
+ const sent = await deps.door.send(crew.crewToken, {
22
+ shipId: delivery.senderShipId,
23
+ contentType: ENABLED_MODELS_CONTENT_TYPE,
24
+ payload: JSON.stringify(enabledModelsSchema.parse({ models })),
25
+ idempotencyKey: `trierarch-plugin:enabled-models:${delivery.messageId}`,
26
+ inReplyTo: delivery.messageId,
27
+ });
28
+ // CONFLICT: the fleet holds a reply under this key already, sent before a crash or a lost ack, when the set was another; it is answered.
29
+ return { kind: sent.isOk || sent.error.code === ALREADY_ANSWERED ? 'answered' : 'refused' };
30
+ };
31
+ }
32
+ //# sourceMappingURL=answer-enabled-models-asks.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"answer-enabled-models-asks.js","sourceRoot":"","sources":["../../../src/core/models/answer-enabled-models-asks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,+BAA+B,EAAE,2BAA2B,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAOzH,MAAM,gBAAgB,GAAG,UAAU,CAAC;AAEpC;;;;;;;;GAQG;AACH,MAAM,UAAU,6BAA6B,CAAC,IAAoE;IAChH,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;QAC9B,IAAI,QAAQ,CAAC,WAAW,KAAK,+BAA+B,EAAE,CAAC;YAC7D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YACzC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAC1B,CAAC;QACD,MAAM,MAAM,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACjE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YAChD,MAAM,EAAE,QAAQ,CAAC,YAAY;YAC7B,WAAW,EAAE,2BAA2B;YACxC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YAC9D,cAAc,EAAE,mCAAmC,QAAQ,CAAC,SAAS,EAAE;YACvE,SAAS,EAAE,QAAQ,CAAC,SAAS;SAC9B,CAAC,CAAC;QACH,yIAAyI;QACzI,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;IAC9F,CAAC,CAAC;AACJ,CAAC"}
@@ -5,6 +5,7 @@ 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
+ accountId?: string;
8
9
  scopes: readonly ScopeName[];
9
10
  }, DomainError<"NOT_THE_OPERATOR">>>;
10
11
  /**
@@ -15,7 +16,8 @@ export type AuthenticateOperator = (cookie: string | undefined) => Promise<Resul
15
16
  * operator there is let through as the operator of their own fleet. A
16
17
  * viewer session is let through too, with the viewer ship's scopes, which
17
18
  * the fleet answers; what each scope may call is the API's to check
18
- * (decision 0022).
19
+ * (decision 0022). An account's session carries its account, which a
20
+ * change records as its actor.
19
21
  */
20
22
  export declare function createAuthenticateOperator(deps: {
21
23
  sessions: ConsoleSessions;
@@ -8,7 +8,8 @@ import { ok } from "../shared/result.js";
8
8
  * operator there is let through as the operator of their own fleet. A
9
9
  * viewer session is let through too, with the viewer ship's scopes, which
10
10
  * the fleet answers; what each scope may call is the API's to check
11
- * (decision 0022).
11
+ * (decision 0022). An account's session carries its account, which a
12
+ * change records as its actor.
12
13
  */
13
14
  export function createAuthenticateOperator(deps) {
14
15
  const refusal = refuse("NOT_THE_OPERATOR", "Sign in to the console of your fleet");
@@ -20,10 +21,12 @@ export function createAuthenticateOperator(deps) {
20
21
  if (!session.isOk) {
21
22
  return refusal;
22
23
  }
24
+ const { fleetId, kind, accountId, scopes } = session.value;
23
25
  return ok({
24
- fleetId: session.value.fleetId,
25
- kind: session.value.kind,
26
- scopes: session.value.scopes,
26
+ fleetId,
27
+ kind,
28
+ ...(accountId !== undefined && { accountId }),
29
+ scopes,
27
30
  });
28
31
  };
29
32
  }
@@ -1 +1 @@
1
- {"version":3,"file":"authenticate-operator.js","sourceRoot":"","sources":["../../../src/core/operator/authenticate-operator.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAgBtD;;;;;;;;;GASG;AACH,MAAM,UAAU,0BAA0B,CAAC,IAE1C;IACC,MAAM,OAAO,GAAG,MAAM,CACpB,kBAAkB,EAClB,sCAAsC,CACvC,CAAC;IACF,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE;QACtB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,OAAO,EAAE,CAAC;YACR,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO;YAC9B,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI;YACxB,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM;SAC7B,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"authenticate-operator.js","sourceRoot":"","sources":["../../../src/core/operator/authenticate-operator.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAiBtD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,0BAA0B,CAAC,IAE1C;IACC,MAAM,OAAO,GAAG,MAAM,CACpB,kBAAkB,EAClB,sCAAsC,CACvC,CAAC;IACF,OAAO,KAAK,EAAE,MAAM,EAAE,EAAE;QACtB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3D,OAAO,EAAE,CAAC;YACR,OAAO;YACP,IAAI;YACJ,GAAG,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,SAAS,EAAE,CAAC;YAC7C,MAAM;SACP,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
@@ -4,12 +4,13 @@ import type { Result } from '../shared/result.js';
4
4
  /**
5
5
  * Outbound port: asks the fleet whether a forwarded console session cookie is
6
6
  * a signed-in operator's or a viewer's (`console.session`, decisions 0012 and
7
- * 0022), with its ship's scopes.
7
+ * 0022), with its ship's scopes and, for an account's session, its account.
8
8
  */
9
9
  export interface ConsoleSessions {
10
10
  check(cookie: string): Promise<Result<{
11
11
  fleetId: FleetId;
12
12
  kind: ConsoleSessionOutput['kind'];
13
+ accountId?: string;
13
14
  scopes: readonly ScopeName[];
14
15
  }, FleetRefusal>>;
15
16
  }
@@ -1,6 +1,6 @@
1
1
  import { type Err } from './result.js';
2
2
  /** Every reason the trierarch plugin's core refuses a request. */
3
- export type DomainErrorKind = 'ALREADY_CONNECTED' | 'SECRET_REFUSED' | 'OTHER_FLEET' | 'MISSING_SCOPES' | 'NOT_THE_OPERATOR' | 'REQUEST_ID_USED' | 'NOT_CONNECTED' | 'NAME_TAKEN' | 'NEEDS_SCOPE' | 'FLEET_UNAVAILABLE' | 'NOT_A_MACHINE' | 'FLEET_REFUSED' | 'INVALID_RANGE';
3
+ export type DomainErrorKind = 'ALREADY_CONNECTED' | 'SECRET_REFUSED' | 'OTHER_FLEET' | 'MISSING_SCOPES' | 'NOT_THE_OPERATOR' | 'REQUEST_ID_USED' | 'NOT_CONNECTED' | 'NAME_TAKEN' | 'NEEDS_SCOPE' | 'FLEET_UNAVAILABLE' | 'NOT_A_MACHINE' | 'FLEET_REFUSED' | 'INVALID_RANGE' | 'VERSION_CONFLICT' | 'INVALID_CONFIGURATION';
4
4
  /** Why the core refused a request. Adapters map the kind to their own error shape; the message is safe to show. */
5
5
  export interface DomainError<K extends DomainErrorKind = DomainErrorKind> {
6
6
  readonly kind: K;
@@ -1 +1 @@
1
- {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/core/shared/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAY,MAAM,aAAa,CAAC;AAwB5C,qDAAqD;AACrD,MAAM,UAAU,MAAM,CAA4B,IAAO,EAAE,OAAe;IACxE,OAAO,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAChC,CAAC"}
1
+ {"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/core/shared/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAY,MAAM,aAAa,CAAC;AA0B5C,qDAAqD;AACrD,MAAM,UAAU,MAAM,CAA4B,IAAO,EAAE,OAAe;IACxE,OAAO,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AAChC,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import type { FleetId } from '@aeolus-fleet/common';
2
- import type { ConnectionStore, FleetDoor } from '../connection/ports.js';
2
+ import { type ConnectionStore, type FleetDoor } from '../connection/ports.js';
3
3
  import { type DomainError } from '../shared/errors.js';
4
4
  import { type Result } from '../shared/result.js';
5
5
  import type { UsageBreakdown } from './token-usage.js';
@@ -1,3 +1,4 @@
1
+ import { EVERY_SHIP_STATUS } from '../connection/ports.js';
1
2
  import { refuse } from '../shared/errors.js';
2
3
  import { ok } from '../shared/result.js';
3
4
  /**
@@ -13,7 +14,7 @@ export async function readShipNames(deps, read) {
13
14
  if (!crew) {
14
15
  return refuse('NOT_CONNECTED', 'The trierarch plugin is not connected to this fleet: connect it in the console');
15
16
  }
16
- const listed = await deps.door.listShips(crew.crewToken);
17
+ const listed = await deps.door.listShips(crew.crewToken, { statuses: EVERY_SHIP_STATUS });
17
18
  if (!listed.isOk) {
18
19
  return refuse('FLEET_UNAVAILABLE', `The fleet did not answer its ships: ${listed.error.message}`);
19
20
  }
@@ -1 +1 @@
1
- {"version":3,"file":"ship-names.js","sourceRoot":"","sources":["../../../src/core/usage/ship-names.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAGtD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAuD,EACvD,IAAqE;IAErE,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,KAAK,MAAM,EAAE,CAAC;QAC9D,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,MAAM,CAAC,eAAe,EAAE,gFAAgF,CAAC,CAAC;IACnH,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACzD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjB,OAAO,MAAM,CAAC,mBAAmB,EAAE,uCAAuC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IACpG,CAAC;IACD,OAAO,EAAE,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAoB,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7F,CAAC;AAED,yHAAyH;AACzH,MAAM,UAAU,WAAW,CAAC,KAAoB,EAAE,SAAkD;IAClG,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC5D,CAAC"}
1
+ {"version":3,"file":"ship-names.js","sourceRoot":"","sources":["../../../src/core/usage/ship-names.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAwC,MAAM,wBAAwB,CAAC;AACjG,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAGtD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,IAAuD,EACvD,IAAqE;IAErE,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,SAAS,KAAK,MAAM,EAAE,CAAC;QAC9D,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,MAAM,CAAC,eAAe,EAAE,gFAAgF,CAAC,CAAC;IACnH,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAC1F,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjB,OAAO,MAAM,CAAC,mBAAmB,EAAE,uCAAuC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IACpG,CAAC;IACD,OAAO,EAAE,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAoB,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAC7F,CAAC;AAED,yHAAyH;AACzH,MAAM,UAAU,WAAW,CAAC,KAAoB,EAAE,SAAkD;IAClG,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC5D,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aeolus-fleet/trierarch-plugin",
3
- "version": "0.38.0",
3
+ "version": "0.39.2",
4
4
  "description": "Brings your machines into an Aeolus fleet and places crew requests on them.",
5
5
  "keywords": [
6
6
  "aeolus",
@@ -49,7 +49,7 @@
49
49
  "postpack": "rm LICENSE"
50
50
  },
51
51
  "dependencies": {
52
- "@aeolus-fleet/common": "^0.38.1",
52
+ "@aeolus-fleet/common": "^0.38.4",
53
53
  "@prisma/adapter-pg": "^7.10.0",
54
54
  "@prisma/client": "^7.10.0",
55
55
  "@trpc/server": "^11.19.0",
@@ -59,7 +59,7 @@
59
59
  "zod": "^4.6.5"
60
60
  },
61
61
  "devDependencies": {
62
- "@aeolus-fleet/core": "^0.38.0",
62
+ "@aeolus-fleet/core": "^0.38.4",
63
63
  "@testcontainers/postgresql": "^12.2.0",
64
64
  "@types/libsodium-wrappers": "^0.8.2"
65
65
  }
@@ -0,0 +1,35 @@
1
+ -- CreateTable
2
+ CREATE TABLE "mcp_configurations" (
3
+ "fleet_id" TEXT NOT NULL,
4
+ "version" INTEGER NOT NULL,
5
+ "servers" JSONB NOT NULL,
6
+ "replaced_at" TIMESTAMPTZ(3) NOT NULL,
7
+
8
+ CONSTRAINT "mcp_configurations_pkey" PRIMARY KEY ("fleet_id")
9
+ );
10
+
11
+ -- CreateTable
12
+ CREATE TABLE "mcp_secrets" (
13
+ "fleet_id" TEXT NOT NULL,
14
+ "name" TEXT NOT NULL,
15
+ "value" TEXT NOT NULL,
16
+
17
+ CONSTRAINT "mcp_secrets_pkey" PRIMARY KEY ("fleet_id","name")
18
+ );
19
+
20
+ -- CreateTable
21
+ CREATE TABLE "mcp_configuration_events" (
22
+ "id" BIGSERIAL NOT NULL,
23
+ "fleet_id" TEXT NOT NULL,
24
+ "version" INTEGER NOT NULL,
25
+ "actor_kind" TEXT NOT NULL,
26
+ "actor_account_id" TEXT,
27
+ "changed_servers" TEXT[],
28
+ "changed_secrets" TEXT[],
29
+ "at" TIMESTAMPTZ(3) NOT NULL,
30
+
31
+ CONSTRAINT "mcp_configuration_events_pkey" PRIMARY KEY ("id")
32
+ );
33
+
34
+ -- CreateIndex
35
+ CREATE UNIQUE INDEX "mcp_configuration_events_fleet_id_version_key" ON "mcp_configuration_events"("fleet_id", "version");
@@ -0,0 +1,15 @@
1
+ -- CreateTable
2
+ CREATE TABLE "mcp_deliveries" (
3
+ "fleet_id" TEXT NOT NULL,
4
+ "trierarch_ship_id" TEXT NOT NULL,
5
+ "attempt_version" INTEGER,
6
+ "attempt_public_key" TEXT,
7
+ "attempt_idempotency_key" TEXT,
8
+ "attempt_payload" TEXT,
9
+ "attempt_sent_at" TIMESTAMPTZ(3),
10
+ "applied_version" INTEGER,
11
+ "applied_public_key" TEXT,
12
+ "is_requested" BOOLEAN NOT NULL DEFAULT false,
13
+
14
+ CONSTRAINT "mcp_deliveries_pkey" PRIMARY KEY ("fleet_id","trierarch_ship_id")
15
+ );
@@ -145,3 +145,68 @@ model SubscriptionReading {
145
145
  @@id([fleetId, machineShipId, harness, windowMinutes, readAt])
146
146
  @@map("subscription_readings")
147
147
  }
148
+
149
+ /// Each fleet's one current MCP configuration (the fleet crew MCP design,
150
+ /// section 4): its version, which guards every replacement, and its servers as
151
+ /// the model saved them. No row before the fleet's first replacement: version 0
152
+ /// with nothing. Its secrets are in mcp_secrets, so this row holds no value.
153
+ model McpConfiguration {
154
+ fleetId String @id @map("fleet_id")
155
+ version Int
156
+ servers Json
157
+ replacedAt DateTime @map("replaced_at") @db.Timestamptz(3)
158
+
159
+ @@map("mcp_configurations")
160
+ }
161
+
162
+ /// The secrets of each fleet's MCP configuration, with their values: the
163
+ /// plugin's credential store, readable to the service and its database
164
+ /// administrators. Replaced with the set, in the same transaction.
165
+ model McpSecret {
166
+ fleetId String @map("fleet_id")
167
+ name String
168
+ value String
169
+
170
+ @@id([fleetId, name])
171
+ @@map("mcp_secrets")
172
+ }
173
+
174
+ /// One row per replacement of a fleet's MCP configuration, written in the same
175
+ /// transaction: the version it saved, the console session's kind and account,
176
+ /// and the server and secret names it changed. Never a value.
177
+ model McpConfigurationEvent {
178
+ id BigInt @id @default(autoincrement())
179
+ fleetId String @map("fleet_id")
180
+ version Int
181
+ actorKind String @map("actor_kind")
182
+ actorAccountId String? @map("actor_account_id")
183
+ changedServers String[] @map("changed_servers")
184
+ changedSecrets String[] @map("changed_secrets")
185
+ at DateTime @db.Timestamptz(3)
186
+
187
+ @@unique([fleetId, version])
188
+ @@map("mcp_configuration_events")
189
+ }
190
+
191
+ /// The delivery of a fleet's MCP configuration to one of its trierarch ships
192
+ /// (the fleet crew MCP design, section 5): the attempt last made, kept under its
193
+ /// idempotency key before it is sent, with the very message, as the fleet takes
194
+ /// a key only for one message; the version and key the trierarch confirmed it
195
+ /// applied; and whether it asked for the set since. Its secrets are only sealed
196
+ /// to the trierarch's key. Forgotten when the trierarch is seen not crewed.
197
+ model McpDelivery {
198
+ fleetId String @map("fleet_id")
199
+ trierarchShipId String @map("trierarch_ship_id")
200
+ attemptVersion Int? @map("attempt_version")
201
+ attemptPublicKey String? @map("attempt_public_key")
202
+ attemptIdempotencyKey String? @map("attempt_idempotency_key")
203
+ attemptPayload String? @map("attempt_payload")
204
+ /// Null while the fleet is not known to have taken the attempt.
205
+ attemptSentAt DateTime? @map("attempt_sent_at") @db.Timestamptz(3)
206
+ appliedVersion Int? @map("applied_version")
207
+ appliedPublicKey String? @map("applied_public_key")
208
+ isRequested Boolean @default(false) @map("is_requested")
209
+
210
+ @@id([fleetId, trierarchShipId])
211
+ @@map("mcp_deliveries")
212
+ }
@@ -1,46 +0,0 @@
1
- import { type Result } from '../shared/result.js';
2
- /** What the trierarch's proxy adds to what it forwards to a server: the header, set to the named secret's value verbatim. */
3
- export interface McpCredential {
4
- readonly secret: string;
5
- readonly header: string;
6
- }
7
- /** A server on the list, with its credential when it needs one. */
8
- export interface McpServer {
9
- readonly name: string;
10
- readonly url: string;
11
- readonly tools: readonly string[];
12
- readonly credential?: McpCredential;
13
- }
14
- /** The AIP every trierarch is sent: its server, and the secret of the store that holds its token, by name. */
15
- export interface Aip {
16
- readonly server: string;
17
- readonly tokenSecret: string;
18
- }
19
- /** The list as read: by name, each URL one a session may reach and each with the tools it may call. Built only by `readMcpServers`. */
20
- export interface McpServers {
21
- readonly servers: readonly McpServer[];
22
- readonly aip?: Aip;
23
- }
24
- /** The content type of the message that carries the list to a trierarch. */
25
- export declare const MCP_SERVERS_CONTENT_TYPE = "application/vnd.aeolus.trierarch.mcp-servers+json";
26
- /** The content type of the message a trierarch asks for the list again with, as it starts knowing the trierarch plugin's ship. */
27
- export declare const MCP_SERVERS_REQUEST_CONTENT_TYPE = "application/vnd.aeolus.trierarch.mcp-servers-request+json";
28
- /**
29
- * The list from the configuration's object of names to `{ url, tools }`, or
30
- * why not: each name a trierarch name, each server a credential-free URL with
31
- * at least one tool, and the whole small enough to reach a trierarch in one
32
- * message.
33
- */
34
- export declare function readMcpServers(listed: unknown): Result<McpServers, {
35
- reason: string;
36
- }>;
37
- /**
38
- * The list carrying the AIP from the configuration's `{ server, tokenSecret }`,
39
- * or why not. The reason never holds a value it was given: a field is told by
40
- * its name.
41
- */
42
- export declare function withAip(list: McpServers, listed: unknown): Result<McpServers, {
43
- reason: string;
44
- }>;
45
- /** The list as a trierarch receives it: `{ "servers": [{ "name", "url", "transport", "tools", "credential"? }], "aip"?: { "server", "tokenSecret" } }`. */
46
- export declare function mcpServersPayload(list: McpServers): string;