@aeolus-fleet/trierarch-plugin 0.41.0 → 0.42.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (93) hide show
  1. package/README.md +9 -2
  2. package/dist/adapters/fleet/core-version.d.ts +1 -1
  3. package/dist/adapters/fleet/core-version.js +1 -1
  4. package/dist/adapters/fleet/rest-fleet-door.js +1 -1
  5. package/dist/adapters/fleet/rest-fleet-door.js.map +1 -1
  6. package/dist/adapters/fleet/ship-wakeups.d.ts +11 -0
  7. package/dist/adapters/fleet/ship-wakeups.js +127 -0
  8. package/dist/adapters/fleet/ship-wakeups.js.map +1 -0
  9. package/dist/adapters/http/plugin-dispatch.d.ts +24 -0
  10. package/dist/adapters/http/plugin-dispatch.js +22 -0
  11. package/dist/adapters/http/plugin-dispatch.js.map +1 -0
  12. package/dist/adapters/http/plugin-server.d.ts +6 -0
  13. package/dist/adapters/http/plugin-server.js +11 -0
  14. package/dist/adapters/http/plugin-server.js.map +1 -0
  15. package/dist/adapters/http/repository-procedures.d.ts +38 -0
  16. package/dist/adapters/http/repository-procedures.js +36 -0
  17. package/dist/adapters/http/repository-procedures.js.map +1 -0
  18. package/dist/adapters/prisma/fleet-forgetter.js +1 -1
  19. package/dist/adapters/prisma/fleet-forgetter.js.map +1 -1
  20. package/dist/adapters/prisma/generated/browser.d.ts +15 -0
  21. package/dist/adapters/prisma/generated/client.d.ts +15 -0
  22. package/dist/adapters/prisma/generated/internal/class.d.ts +33 -0
  23. package/dist/adapters/prisma/generated/internal/class.js +4 -4
  24. package/dist/adapters/prisma/generated/internal/class.js.map +1 -1
  25. package/dist/adapters/prisma/generated/internal/prismaNamespace.d.ts +251 -1
  26. package/dist/adapters/prisma/generated/internal/prismaNamespace.js +23 -1
  27. package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
  28. package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +25 -0
  29. package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +23 -1
  30. package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
  31. package/dist/adapters/prisma/generated/models/PluginDispatchReservation.d.ts +975 -0
  32. package/dist/adapters/prisma/generated/models/PluginDispatchReservation.js +2 -0
  33. package/dist/adapters/prisma/generated/models/PluginDispatchReservation.js.map +1 -0
  34. package/dist/adapters/prisma/generated/models/RepositoryEvent.d.ts +1062 -0
  35. package/dist/adapters/prisma/generated/models/RepositoryEvent.js +2 -0
  36. package/dist/adapters/prisma/generated/models/RepositoryEvent.js.map +1 -0
  37. package/dist/adapters/prisma/generated/models/RepositoryList.d.ts +973 -0
  38. package/dist/adapters/prisma/generated/models/RepositoryList.js +2 -0
  39. package/dist/adapters/prisma/generated/models/RepositoryList.js.map +1 -0
  40. package/dist/adapters/prisma/generated/models.d.ts +3 -0
  41. package/dist/adapters/prisma/installation-requests.js +1 -1
  42. package/dist/adapters/prisma/installation-requests.js.map +1 -1
  43. package/dist/adapters/prisma/plugin-reservations.d.ts +7 -0
  44. package/dist/adapters/prisma/plugin-reservations.js +12 -0
  45. package/dist/adapters/prisma/plugin-reservations.js.map +1 -0
  46. package/dist/adapters/prisma/repositories.d.ts +4 -0
  47. package/dist/adapters/prisma/repositories.js +22 -0
  48. package/dist/adapters/prisma/repositories.js.map +1 -0
  49. package/dist/adapters/trpc/router.d.ts +43 -0
  50. package/dist/adapters/trpc/router.js +20 -1
  51. package/dist/adapters/trpc/router.js.map +1 -1
  52. package/dist/app.d.ts +3 -1
  53. package/dist/app.js +48 -7
  54. package/dist/app.js.map +1 -1
  55. package/dist/bin/aeolus-trierarch-plugin.js +3 -0
  56. package/dist/bin/aeolus-trierarch-plugin.js.map +1 -1
  57. package/dist/config.d.ts +3 -0
  58. package/dist/config.js +18 -0
  59. package/dist/config.js.map +1 -1
  60. package/dist/core/connection/answer-pings.d.ts +2 -1
  61. package/dist/core/connection/answer-pings.js +7 -1
  62. package/dist/core/connection/answer-pings.js.map +1 -1
  63. package/dist/core/connection/ports.d.ts +6 -1
  64. package/dist/core/connection/watch-fleet-inboxes.d.ts +19 -0
  65. package/dist/core/connection/watch-fleet-inboxes.js +57 -0
  66. package/dist/core/connection/watch-fleet-inboxes.js.map +1 -0
  67. package/dist/core/installation/installation-connect.d.ts +25 -0
  68. package/dist/core/installation/installation-connect.js +23 -0
  69. package/dist/core/installation/installation-connect.js.map +1 -0
  70. package/dist/core/installation/ports.d.ts +3 -3
  71. package/dist/core/machines/join-machine.d.ts +2 -2
  72. package/dist/core/machines/join-machine.js +3 -3
  73. package/dist/core/machines/join-machine.js.map +1 -1
  74. package/dist/core/machines/setup-line.d.ts +12 -0
  75. package/dist/core/machines/setup-line.js +23 -0
  76. package/dist/core/machines/setup-line.js.map +1 -1
  77. package/dist/core/repositories/manage-repositories.d.ts +38 -0
  78. package/dist/core/repositories/manage-repositories.js +24 -0
  79. package/dist/core/repositories/manage-repositories.js.map +1 -0
  80. package/dist/core/repositories/repository-list.d.ts +23 -0
  81. package/dist/core/repositories/repository-list.js +20 -0
  82. package/dist/core/repositories/repository-list.js.map +1 -0
  83. package/dist/core/scopes/declare-scopes.js +2 -2
  84. package/dist/core/scopes/declare-scopes.js.map +1 -1
  85. package/dist/core/scopes/plugin-scopes.d.ts +1 -0
  86. package/dist/core/scopes/plugin-scopes.js +2 -1
  87. package/dist/core/scopes/plugin-scopes.js.map +1 -1
  88. package/dist/core/shared/errors.d.ts +1 -1
  89. package/dist/core/shared/errors.js.map +1 -1
  90. package/package.json +3 -3
  91. package/src/adapters/prisma/migrations/20261118000000_repository_lists/migration.sql +14 -0
  92. package/src/adapters/prisma/migrations/20261118000001_plugin_reservations/migration.sql +8 -0
  93. package/src/adapters/prisma/schema.prisma +34 -0
@@ -19,6 +19,7 @@ async function start() {
19
19
  const app = createTrierarchPluginApp({
20
20
  databaseUrl: config.databaseUrl,
21
21
  fleetUrl: config.fleetUrl,
22
+ pluginSecrets: config.pluginSecrets,
22
23
  consoleOrigin: config.consoleOrigin,
23
24
  logger: { level: config.logLevel },
24
25
  silentAfterMs: config.silentAfterMs,
@@ -39,6 +40,8 @@ async function start() {
39
40
  });
40
41
  }
41
42
  await app.server.listen({ host: config.host, port: config.port });
43
+ if (config.pluginSecrets.length > 0)
44
+ await app.pluginServer.listen({ host: config.pluginInternalHost, port: config.pluginInternalPort });
42
45
  }
43
46
  try {
44
47
  switch (process.argv[2] ?? '') {
@@ -1 +1 @@
1
- {"version":3,"file":"aeolus-trierarch-plugin.js","sourceRoot":"","sources":["../../src/bin/aeolus-trierarch-plugin.ts"],"names":[],"mappings":"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"}
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
@@ -25,6 +25,9 @@ export interface Config {
25
25
  * a self-hosted trierarch plugin needs; set, a fleet is served once switched on.
26
26
  */
27
27
  installationToken: string | undefined;
28
+ pluginSecrets: string[];
29
+ pluginInternalHost: string;
30
+ pluginInternalPort: number;
28
31
  /** A trierarch whose last seen is older than this is silent: it gets no new requests, and keeps those it holds. */
29
32
  silentAfterMs: number;
30
33
  /** How often the assignment runs a pass for each fleet it serves and is connected to. */
package/dist/config.js CHANGED
@@ -1,3 +1,4 @@
1
+ import { isIP } from 'node:net';
1
2
  import { z } from 'zod';
2
3
  import { DEFAULT_SILENT_AFTER_MS } from './core/machines/silent.js';
3
4
  import { readTrustedRepositories } from './core/repositories/trusted-repositories.js';
@@ -6,6 +7,14 @@ const INSTALLATION_TOKEN_MIN_LENGTH = 32;
6
7
  /** How often the assignment runs a pass per fleet, by default. */
7
8
  const DEFAULT_PASS_INTERVAL_SECONDS = 10;
8
9
  const MS_PER_SECOND = 1000;
10
+ function isPrivateListener(host) {
11
+ if (host === 'localhost' || host === '::1')
12
+ return true;
13
+ if (isIP(host) !== 4)
14
+ return false;
15
+ const [first, second] = host.split('.').map(Number);
16
+ return first === 127 || first === 10 || (first === 172 && second !== undefined && second >= 16 && second <= 31) || (first === 192 && second === 168);
17
+ }
9
18
  const environmentSchema = z.object({
10
19
  DATABASE_URL: z.url({ protocol: /^postgres(ql)?$/, error: 'must be a postgres:// or postgresql:// URL' }),
11
20
  FLEET_URL: z.url({ protocol: /^https?$/, error: 'must be an http:// or https:// URL' }),
@@ -17,6 +26,10 @@ const environmentSchema = z.object({
17
26
  PORT: z.coerce.number().int().min(0).max(65_535).default(4200),
18
27
  LOG_LEVEL: z.enum(['fatal', 'error', 'warn', 'info', 'debug', 'trace', 'silent']).default('info'),
19
28
  INSTALLATION_TOKEN: z.string().min(INSTALLATION_TOKEN_MIN_LENGTH, { error: `must hold at least ${String(INSTALLATION_TOKEN_MIN_LENGTH)} characters` }).optional(),
29
+ PLUGIN_SECRET: z.string().min(32).optional(),
30
+ PLUGIN_NEXT_SECRET: z.string().min(32).optional(),
31
+ PLUGIN_INTERNAL_HOST: z.string().refine(isPrivateListener, { error: 'must be a loopback or private IPv4 address' }).default('127.0.0.1'),
32
+ PLUGIN_INTERNAL_PORT: z.coerce.number().int().min(1).max(65_535).default(4201),
20
33
  TRIERARCH_SILENT_AFTER_SECONDS: z.coerce.number().int().positive().default(DEFAULT_SILENT_AFTER_MS / MS_PER_SECOND),
21
34
  TRIERARCH_PASS_INTERVAL_SECONDS: z.coerce.number().int().positive().default(DEFAULT_PASS_INTERVAL_SECONDS),
22
35
  TRUSTED_REPOSITORIES: z.string().default('{}'),
@@ -51,6 +64,8 @@ function trustedRepositories(text) {
51
64
  /** The configuration from the environment; throws a ConfigError naming every variable that is wrong. */
52
65
  export function loadConfig(environment) {
53
66
  const variables = parsed(environmentSchema, environment);
67
+ if (variables.PLUGIN_NEXT_SECRET !== undefined && variables.PLUGIN_SECRET === undefined)
68
+ throw new ConfigError('PLUGIN_NEXT_SECRET requires PLUGIN_SECRET');
54
69
  return {
55
70
  databaseUrl: variables.DATABASE_URL,
56
71
  fleetUrl: variables.FLEET_URL.replace(/\/$/, ''),
@@ -59,6 +74,9 @@ export function loadConfig(environment) {
59
74
  port: variables.PORT,
60
75
  logLevel: variables.LOG_LEVEL,
61
76
  installationToken: variables.INSTALLATION_TOKEN,
77
+ pluginSecrets: [variables.PLUGIN_SECRET, variables.PLUGIN_NEXT_SECRET].filter((secret) => secret !== undefined),
78
+ pluginInternalHost: variables.PLUGIN_INTERNAL_HOST,
79
+ pluginInternalPort: variables.PLUGIN_INTERNAL_PORT,
62
80
  silentAfterMs: variables.TRIERARCH_SILENT_AFTER_SECONDS * MS_PER_SECOND,
63
81
  passIntervalMs: variables.TRIERARCH_PASS_INTERVAL_SECONDS * MS_PER_SECOND,
64
82
  trustedRepositories: trustedRepositories(variables.TRUSTED_REPOSITORIES),
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ import { type FleetId } from '@aeolus-fleet/common';
1
2
  import type { KeepUsage } from '../usage/keep-usage.js';
2
3
  import type { ConnectionStore, PluginCrew, PluginDelivery, PluginInbox } from './ports.js';
3
4
  /**
@@ -26,7 +27,7 @@ export type AnsweredAsk = {
26
27
  readonly kind: 'left';
27
28
  };
28
29
  export type AnswerAsk = (crew: PluginCrew, delivery: PluginDelivery) => Promise<AnsweredAsk>;
29
- export type AnswerPings = () => Promise<PingRound>;
30
+ export type AnswerPings = (fleetId?: FleetId) => Promise<PingRound>;
30
31
  /**
31
32
  * Use case: the trierarch plugin's own ship takes what waits for it in each
32
33
  * fleet it is connected to, as any crewed ship does (blueprint, "Ping"):
@@ -7,11 +7,17 @@ import { isPingContentType, RECEIVE_MAX_UPPER_BOUND } from '@aeolus-fleet/common
7
7
  * usage design); anything else is acked, and the fleet keeps it in its history.
8
8
  */
9
9
  export function createAnswerPings(deps) {
10
- return async () => {
10
+ return async (fleetId) => {
11
11
  const round = { ponged: 0, acked: [], keptUsage: 0, notHandled: [], refused: 0 };
12
12
  for (const crew of await deps.connections.connected()) {
13
+ if (fleetId !== undefined && crew.fleetId !== fleetId) {
14
+ continue;
15
+ }
13
16
  const taken = await deps.inbox.receive(crew.crewToken, RECEIVE_MAX_UPPER_BOUND);
14
17
  if (!taken.isOk) {
18
+ if (taken.error.code === 'LEASE_ENDED' && (await deps.connections.find(crew.fleetId))?.crewToken === crew.crewToken) {
19
+ await deps.connections.drop(crew.fleetId);
20
+ }
15
21
  round.refused += 1;
16
22
  continue;
17
23
  }
@@ -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;AAyBlF;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAsG;IACtI,OAAO,KAAK,IAAI,EAAE;QAChB,MAAM,KAAK,GAAc,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;QAC5F,KAAK,MAAM,IAAI,IAAI,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC;YACtD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC;YAChF,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAChB,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;gBACnB,SAAS;YACX,CAAC;YACD,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBACnC,IAAI,iBAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;oBAC1E,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACpC,KAAK,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACrC,SAAS;gBACX,CAAC;gBACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;gBAClF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;oBACnB,SAAS;gBACX,CAAC;gBACD,yFAAyF;gBACzF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;gBAC1E,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBACpD,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;oBACnB,SAAS;gBACX,CAAC;gBACD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAC1B,SAAS;gBACX,CAAC;gBACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;gBACxE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;oBAChB,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;gBACrB,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAC5D,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC;gBACvB,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBACvC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC5D,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACnC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"answer-pings.js","sourceRoot":"","sources":["../../../src/core/connection/answer-pings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAgB,MAAM,sBAAsB,CAAC;AAyBhG;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAsG;IACtI,OAAO,KAAK,EAAE,OAAO,EAAE,EAAE;QACvB,MAAM,KAAK,GAAc,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;QAC5F,KAAK,MAAM,IAAI,IAAI,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC;YACtD,IAAI,OAAO,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;gBAAC,SAAS;YAAC,CAAC;YACpE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,CAAC;YAChF,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAChB,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,SAAS,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;oBACpH,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC5C,CAAC;gBACD,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;gBACnB,SAAS;YACX,CAAC;YACD,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBACnC,IAAI,iBAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;oBAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;oBAC1E,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACpC,KAAK,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBACrC,SAAS;gBACX,CAAC;gBACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;gBAClF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;oBACnB,SAAS;gBACX,CAAC;gBACD,yFAAyF;gBACzF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;gBAC1E,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBACpD,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;oBACnB,SAAS;gBACX,CAAC;gBACD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAC1B,SAAS;gBACX,CAAC;gBACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;gBACxE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;oBAChB,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;gBACrB,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAC5D,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC;gBACvB,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBACvC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC5D,CAAC;qBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACnC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC7B,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC"}
@@ -113,10 +113,11 @@ export interface FleetDoor {
113
113
  /**
114
114
  * Commissions a ship as the crew token's ship (fleet:commission) under a new
115
115
  * idempotency key, with the fleet scopes given beside the send and receive
116
- * every agent ship has: its id and its starting prompt, issued once.
116
+ * every ship has: its id and its starting prompt, issued once.
117
117
  */
118
118
  commission(crewToken: string, ship: {
119
119
  name: string;
120
+ kind: 'trierarch';
120
121
  type: string;
121
122
  scopes: string[];
122
123
  idempotencyKey: string;
@@ -174,6 +175,10 @@ export interface FleetDoor {
174
175
  listScopes(crewToken: string): Promise<Result<{
175
176
  namespace: string;
176
177
  declaredBy: ShipId | null;
178
+ scopes: {
179
+ scope: string;
180
+ description: string;
181
+ }[];
177
182
  }[], FleetRefusal>>;
178
183
  /** Takes up its ship's one plugin namespace with its whole list of scopes (scopes:declare, decision 0046). */
179
184
  declareScopes(crewToken: string, declaration: {
@@ -0,0 +1,19 @@
1
+ /** Maintains one wake stream per served fleet, bound to the lease that opened it. */
2
+ import type { FleetId } from '@aeolus-fleet/common';
3
+ import type { ConnectionStore } from './ports.js';
4
+ interface StreamEvents {
5
+ look: () => Promise<void>;
6
+ ended: () => Promise<void>;
7
+ }
8
+ interface WatchFleetInboxesDependencies {
9
+ connections: ConnectionStore;
10
+ isServed: (fleetId: FleetId) => Promise<boolean>;
11
+ answer: (fleetId: FleetId) => Promise<void>;
12
+ start: (crewToken: string, events: StreamEvents) => () => void;
13
+ }
14
+ /** Reconciliation notices connection changes without polling core's inbox. */
15
+ export declare function createWatchFleetInboxes(deps: WatchFleetInboxesDependencies): {
16
+ reconcile: () => Promise<void>;
17
+ close: () => void;
18
+ };
19
+ export {};
@@ -0,0 +1,57 @@
1
+ /** Reconciliation notices connection changes without polling core's inbox. */
2
+ export function createWatchFleetInboxes(deps) {
3
+ const streams = new Map();
4
+ let isClosed = false;
5
+ const isActive = () => !isClosed;
6
+ const stop = (fleetId) => {
7
+ streams.get(fleetId)?.stop();
8
+ streams.delete(fleetId);
9
+ };
10
+ return {
11
+ reconcile: async () => {
12
+ if (isClosed) {
13
+ return;
14
+ }
15
+ const served = new Set();
16
+ for (const crew of await deps.connections.connected()) {
17
+ if (!(await deps.isServed(crew.fleetId)) || !isActive()) {
18
+ continue;
19
+ }
20
+ served.add(crew.fleetId);
21
+ if (streams.get(crew.fleetId)?.crewToken === crew.crewToken) {
22
+ continue;
23
+ }
24
+ stop(crew.fleetId);
25
+ const matches = async () => (await deps.connections.find(crew.fleetId))?.crewToken === crew.crewToken;
26
+ const cancel = deps.start(crew.crewToken, {
27
+ look: async () => {
28
+ if (isActive() && await matches() && await deps.isServed(crew.fleetId)) {
29
+ await deps.answer(crew.fleetId);
30
+ }
31
+ },
32
+ ended: async () => {
33
+ if (await matches()) {
34
+ await deps.connections.drop(crew.fleetId);
35
+ }
36
+ if (streams.get(crew.fleetId)?.crewToken === crew.crewToken) {
37
+ stop(crew.fleetId);
38
+ }
39
+ },
40
+ });
41
+ streams.set(crew.fleetId, { crewToken: crew.crewToken, stop: cancel });
42
+ }
43
+ for (const fleetId of streams.keys()) {
44
+ if (!served.has(fleetId)) {
45
+ stop(fleetId);
46
+ }
47
+ }
48
+ },
49
+ close: () => {
50
+ isClosed = true;
51
+ for (const fleetId of streams.keys()) {
52
+ stop(fleetId);
53
+ }
54
+ },
55
+ };
56
+ }
57
+ //# sourceMappingURL=watch-fleet-inboxes.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"watch-fleet-inboxes.js","sourceRoot":"","sources":["../../../src/core/connection/watch-fleet-inboxes.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,25 @@
1
+ /** The installation hands over a commissioned ship, replaying only successful requests. */
2
+ import type { FleetId, ShipId } from '@aeolus-fleet/common';
3
+ import type { Connect, ConnectRefusal } from '../connection/connect.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 { InstallationRequests, RequestHasher } from './ports.js';
8
+ import type { IsServed } from './served.js';
9
+ export type InstallationConnect = (input: {
10
+ requestId: string;
11
+ fleetId: FleetId;
12
+ shipId: ShipId;
13
+ secret: string;
14
+ }) => Promise<Result<{
15
+ isEnabled: true;
16
+ isConnected: true;
17
+ }, ConnectRefusal | DomainError<'OFF' | 'REQUEST_ID_USED'>>>;
18
+ /** Checks the fleet's switch before replay, then delegates every hand-over check to Connect. */
19
+ export declare function createInstallationConnect(deps: {
20
+ requests: InstallationRequests;
21
+ hasher: RequestHasher;
22
+ clock: Clock;
23
+ isServed: IsServed;
24
+ connect: Connect;
25
+ }): InstallationConnect;
@@ -0,0 +1,23 @@
1
+ import { refuse } from '../shared/errors.js';
2
+ import { ok } from '../shared/result.js';
3
+ import { earlierAnswer } from './request-id.js';
4
+ /** Checks the fleet's switch before replay, then delegates every hand-over check to Connect. */
5
+ export function createInstallationConnect(deps) {
6
+ return async ({ requestId, fleetId, shipId, secret }) => {
7
+ if (!(await deps.isServed(fleetId))) {
8
+ return refuse('OFF', 'The trierarch plugin is off for this fleet');
9
+ }
10
+ const requestHash = deps.hasher.hash(`connect ${fleetId} ${shipId}`);
11
+ const earlier = await earlierAnswer(deps.requests, { requestId, requestHash });
12
+ if (earlier !== undefined) {
13
+ return 'isOk' in earlier ? earlier : ok({ isEnabled: true, isConnected: true });
14
+ }
15
+ const connected = await deps.connect({ operatorFleetId: fleetId, shipId, secret });
16
+ if (!connected.isOk) {
17
+ return connected;
18
+ }
19
+ await deps.requests.record({ requestId, kind: 'connect', requestHash, fleetId, isEnabled: null, at: deps.clock.now() });
20
+ return ok({ isEnabled: true, isConnected: true });
21
+ };
22
+ }
23
+ //# sourceMappingURL=installation-connect.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"installation-connect.js","sourceRoot":"","sources":["../../../src/core/installation/installation-connect.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAUhD,gGAAgG;AAChG,MAAM,UAAU,yBAAyB,CAAC,IAMzC;IACC,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;QACtD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YACpC,OAAO,MAAM,CAAC,KAAK,EAAE,4CAA4C,CAAC,CAAC;QACrE,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,OAAO,IAAI,MAAM,EAAE,CAAC,CAAC;QACrE,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,CAAC;QAC/E,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;QAClF,CAAC;QACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QACnF,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YACpB,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACxH,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC;AACJ,CAAC"}
@@ -17,12 +17,12 @@ export interface FleetSwitches {
17
17
  }
18
18
  /**
19
19
  * A request the installation answered, by the caller's request id. A switch
20
- * names its fleet and what it set, and goes with its fleet; a delete names
21
- * nothing of the fleet, only the request's hash.
20
+ * or connect receipt goes with its fleet; only a switch keeps what it set.
21
+ * A delete names nothing of the fleet, only the request's hash.
22
22
  */
23
23
  export interface InstallationRequest {
24
24
  requestId: string;
25
- kind: 'setEnabled' | 'deleteFleet';
25
+ kind: 'setEnabled' | 'deleteFleet' | 'connect';
26
26
  requestHash: string;
27
27
  fleetId: FleetId | null;
28
28
  isEnabled: boolean | null;
@@ -36,8 +36,8 @@ export type JoinMachine = (input: {
36
36
  * needs trierarch:join, which the trierarch plugin declares and
37
37
  * enforces; argo holds every scope, though the fleet lists only core's for
38
38
  * it, so argo always may. The trierarch
39
- * plugin commissions its trierarch's ship, of type trierarch with crew:run
40
- * beside the send and receive every agent ship has, under a new idempotency
39
+ * plugin commissions its trierarch's ship, of kind and type trierarch with crew:run
40
+ * beside the send and receive every ship has, under a new idempotency
41
41
  * key, and answers its starting prompt with one ready-to-run setup line built
42
42
  * from the fleet's URL, the ship's id and secret, and the trierarch plugin's
43
43
  * own ship: `aeolus-trierarch init`
@@ -11,8 +11,8 @@ const TRIERARCH_SCOPES = ['crew:run'];
11
11
  * needs trierarch:join, which the trierarch plugin declares and
12
12
  * enforces; argo holds every scope, though the fleet lists only core's for
13
13
  * it, so argo always may. The trierarch
14
- * plugin commissions its trierarch's ship, of type trierarch with crew:run
15
- * beside the send and receive every agent ship has, under a new idempotency
14
+ * plugin commissions its trierarch's ship, of kind and type trierarch with crew:run
15
+ * beside the send and receive every ship has, under a new idempotency
16
16
  * key, and answers its starting prompt with one ready-to-run setup line built
17
17
  * from the fleet's URL, the ship's id and secret, and the trierarch plugin's
18
18
  * own ship: `aeolus-trierarch init`
@@ -33,7 +33,7 @@ export function createJoinMachine(deps) {
33
33
  if (!crew) {
34
34
  return refuse('NOT_CONNECTED', 'The trierarch plugin is not connected to this fleet: connect it in the console');
35
35
  }
36
- const commissioned = await deps.door.commission(crew.crewToken, { name, type: TRIERARCH_TYPE, scopes: TRIERARCH_SCOPES, idempotencyKey: deps.keys.next() });
36
+ const commissioned = await deps.door.commission(crew.crewToken, { name, kind: 'trierarch', type: TRIERARCH_TYPE, scopes: TRIERARCH_SCOPES, idempotencyKey: deps.keys.next() });
37
37
  if (!commissioned.isOk) {
38
38
  return commissioned.error.code === 'CONFLICT'
39
39
  ? refuse('NAME_TAKEN', commissioned.error.message)
@@ -1 +1 @@
1
- {"version":3,"file":"join-machine.js","sourceRoot":"","sources":["../../../src/core/machines/join-machine.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAqB,MAAM,iBAAiB,CAAC;AAEtF,yDAAyD;AACzD,MAAM,CAAC,MAAM,cAAc,GAAG,WAAW,CAAC;AAE1C,2GAA2G;AAC3G,MAAM,gBAAgB,GAAG,CAAC,UAAU,CAAC,CAAC;AA0BtC;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAgG;IAChI,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE;QACjD,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACpE,OAAO,MAAM,CAAC,aAAa,EAAE,2BAA2B,UAAU,EAAE,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,OAAO,GAAG,mBAAmB,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,MAAM,CAAC,eAAe,EAAE,gFAAgF,CAAC,CAAC;QACnH,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB,EAAE,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC5J,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;YACvB,OAAO,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU;gBAC3C,CAAC,CAAC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC;gBAClD,CAAC,CAAC,MAAM,CAAC,mBAAmB,EAAE,oDAAoD,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACpH,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC;QACjE,MAAM,SAAS,GAAG,WAAW,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACrH,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClH,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"join-machine.js","sourceRoot":"","sources":["../../../src/core/machines/join-machine.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAoB,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAqB,MAAM,iBAAiB,CAAC;AAEtF,yDAAyD;AACzD,MAAM,CAAC,MAAM,cAAc,GAAG,WAAW,CAAC;AAE1C,2GAA2G;AAC3G,MAAM,gBAAgB,GAAG,CAAC,UAAU,CAAC,CAAC;AA0BtC;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAgG;IAChI,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE;QACjD,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACpE,OAAO,MAAM,CAAC,aAAa,EAAE,2BAA2B,UAAU,EAAE,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,OAAO,GAAG,mBAAmB,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QACnD,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,MAAM,CAAC,eAAe,EAAE,gFAAgF,CAAC,CAAC;QACnH,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB,EAAE,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC/K,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;YACvB,OAAO,YAAY,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU;gBAC3C,CAAC,CAAC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC;gBAClD,CAAC,CAAC,MAAM,CAAC,mBAAmB,EAAE,oDAAoD,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QACpH,CAAC;QACD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC;QACjE,MAAM,SAAS,GAAG,WAAW,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACrH,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClH,CAAC,CAAC;AACJ,CAAC"}
@@ -20,6 +20,18 @@ export interface SetupOptions {
20
20
  /** Harnesses that run without permission questions: only those picked in `harnesses` are carried. */
21
21
  unattended?: readonly SetupHarness[];
22
22
  repositories?: RepositoriesChoice;
23
+ folders?: {
24
+ kind: 'list';
25
+ entries: readonly {
26
+ name: string;
27
+ path: string;
28
+ }[];
29
+ } | {
30
+ kind: 'none';
31
+ };
32
+ maxShips?: number;
33
+ maxRunning?: number;
34
+ service?: 'yes' | 'no';
23
35
  }
24
36
  export type SetupOptionsRefusal = DomainError<'INVALID_SETUP_OPTION'>;
25
37
  /**
@@ -4,6 +4,8 @@ import { ok } from '../shared/result.js';
4
4
  const INSTALL_SCRIPT_URL = 'https://raw.githubusercontent.com/ThomasHendrickx/aeolus-fleet-trierarch/main/install.sh';
5
5
  /** The harnesses the trierarch's setup offers, each with an adapter (join design, decision 2). */
6
6
  export const SETUP_HARNESSES = ['claude-code', 'codex', 'copilot'];
7
+ /** The trierarch's existing workspace name limit (go/internal/cli/commands.go). */
8
+ const FOLDER_NAME_MAX_LENGTH = 100;
7
9
  /**
8
10
  * The trierarch reads `--repositories` as one value split at a comma or a
9
11
  * semicolon (aeolus-fleet-trierarch, repositoryselection.go), and a repeated
@@ -12,6 +14,22 @@ export const SETUP_HARNESSES = ['claude-code', 'codex', 'copilot'];
12
14
  * not split: it takes any character. A NUL ends a shell word, so none is taken.
13
15
  */
14
16
  export function checkedSetupOptions(options) {
17
+ const folders = options.folders?.kind === 'list' ? options.folders.entries : [];
18
+ if (folders.some(({ name }) => !/^[a-z0-9][a-z0-9._-]*$/.test(name) || name.length > FOLDER_NAME_MAX_LENGTH)) {
19
+ return refuse('INVALID_SETUP_OPTION', 'A folder name uses lowercase letters, digits, dots, underscores or hyphens, starts with a letter or digit, and has at most 100 characters');
20
+ }
21
+ if (folders.some(({ path }) => path.length === 0)) {
22
+ return refuse('INVALID_SETUP_OPTION', 'A folder path is not empty');
23
+ }
24
+ if (new Set(folders.map(({ name }) => name)).size !== folders.length) {
25
+ return refuse('INVALID_SETUP_OPTION', 'Each folder has a different name');
26
+ }
27
+ if (folders.some(({ name, path }) => name.includes('\0') || path.includes('\0'))) {
28
+ return refuse('INVALID_SETUP_OPTION', 'A folder name or path holds no NUL');
29
+ }
30
+ if ([options.maxShips, options.maxRunning].some((limit) => limit !== undefined && (!Number.isSafeInteger(limit) || limit <= 0))) {
31
+ return refuse('INVALID_SETUP_OPTION', 'Ship and session limits are whole numbers greater than zero');
32
+ }
15
33
  const choice = options.repositories;
16
34
  const values = choice?.kind === 'list' ? choice.entries : choice?.kind === 'folder' ? [choice.path] : [];
17
35
  if (values.some((value) => value.includes('\0'))) {
@@ -46,6 +64,11 @@ function optionFlagsOf(options) {
46
64
  ...(entries.length > 0 ? [`--repositories ${shellQuoted(entries.join(','))}`] : []),
47
65
  ...(choice?.kind === 'folder' ? [`--repositories-in ${shellQuoted(choice.path)}`] : []),
48
66
  ...(choice?.kind === 'none' ? ['--no-repositories'] : []),
67
+ ...(options.folders?.kind === 'list' ? options.folders.entries.map(({ name, path }) => `--folder ${shellQuoted(name)} ${shellQuoted(path)}`) : []),
68
+ ...(options.folders?.kind === 'none' ? ['--no-folders'] : []),
69
+ ...(options.maxShips !== undefined ? [`--max-ships ${options.maxShips}`] : []),
70
+ ...(options.maxRunning !== undefined ? [`--max-running ${options.maxRunning}`] : []),
71
+ ...(options.service !== undefined ? [`--service ${options.service}`] : []),
49
72
  ];
50
73
  }
51
74
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"setup-line.js","sourceRoot":"","sources":["../../../src/core/machines/setup-line.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"setup-line.js","sourceRoot":"","sources":["../../../src/core/machines/setup-line.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,38 @@
1
+ import type { FleetId, PluginCallContext } from '@aeolus-fleet/common';
2
+ import { type Result } from '../shared/result.js';
3
+ import { type RepositoryList } from './repository-list.js';
4
+ type ActorContext = Pick<PluginCallContext, 'fleetId' | 'actor' | 'requestId' | 'scopes'>;
5
+ type Change = {
6
+ readonly kind: 'add';
7
+ readonly name: string;
8
+ readonly url: string;
9
+ readonly expectedVersion: number;
10
+ } | {
11
+ readonly kind: 'remove';
12
+ readonly name: string;
13
+ readonly expectedVersion: number;
14
+ };
15
+ interface Event {
16
+ actor: PluginCallContext['actor'];
17
+ operation: Change['kind'];
18
+ name: string;
19
+ version: number;
20
+ requestId: string;
21
+ }
22
+ interface Refusal {
23
+ reason: string;
24
+ }
25
+ export interface RepositoryStore {
26
+ read(fleetId: FleetId): Promise<RepositoryList>;
27
+ save(fleetId: FleetId, change: {
28
+ expectedVersion: number;
29
+ next: RepositoryList;
30
+ event: Event;
31
+ }): Promise<boolean>;
32
+ }
33
+ /** Applies scope and optimistic version checks to each verified dispatch. */
34
+ export declare function createManageRepositories(store: RepositoryStore): {
35
+ list: (context: ActorContext) => Promise<Result<RepositoryList, Refusal>>;
36
+ change: (context: ActorContext, change: Change) => Promise<Result<RepositoryList, Refusal>>;
37
+ };
38
+ export {};
@@ -0,0 +1,24 @@
1
+ import { REPOSITORIES_SCOPE } from '../scopes/plugin-scopes.js';
2
+ import { err, ok } from '../shared/result.js';
3
+ import { changeRepositoryList } from './repository-list.js';
4
+ /** Applies scope and optimistic version checks to each verified dispatch. */
5
+ export function createManageRepositories(store) {
6
+ return {
7
+ list: async (context) => {
8
+ if (!context.scopes.includes(REPOSITORIES_SCOPE))
9
+ return err({ reason: 'forbidden' });
10
+ return ok(await store.read(context.fleetId));
11
+ },
12
+ change: async (context, change) => {
13
+ if (!context.scopes.includes(REPOSITORIES_SCOPE))
14
+ return err({ reason: 'forbidden' });
15
+ const current = await store.read(context.fleetId);
16
+ const changed = changeRepositoryList(current, change);
17
+ if (!changed.isOk || changed.value.version === current.version)
18
+ return changed;
19
+ const isSaved = await store.save(context.fleetId, { expectedVersion: current.version, next: changed.value, event: { actor: context.actor, operation: change.kind, name: change.name, version: changed.value.version, requestId: context.requestId } });
20
+ return isSaved ? changed : err({ reason: 'version conflict' });
21
+ },
22
+ };
23
+ }
24
+ //# sourceMappingURL=manage-repositories.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"manage-repositories.js","sourceRoot":"","sources":["../../../src/core/repositories/manage-repositories.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAuB,MAAM,sBAAsB,CAAC;AAYjF,6EAA6E;AAC7E,MAAM,UAAU,wBAAwB,CAAC,KAAsB;IAC7D,OAAO;QACL,IAAI,EAAE,KAAK,EAAE,OAAqB,EAA4C,EAAE;YAC9E,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC;gBAAE,OAAO,GAAG,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;YACtF,OAAO,EAAE,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAC/C,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,OAAqB,EAAE,MAAc,EAA4C,EAAE;YAChG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC;gBAAE,OAAO,GAAG,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;YACtF,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAClD,MAAM,OAAO,GAAG,oBAAoB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACtD,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO;gBAAE,OAAO,OAAO,CAAC;YAC/E,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,eAAe,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;YACvP,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC;QACjE,CAAC;KACF,CAAC;AACJ,CAAC"}
@@ -0,0 +1,23 @@
1
+ import { type Result } from '../shared/result.js';
2
+ export interface RepositoryList {
3
+ readonly version: number;
4
+ readonly repositories: readonly {
5
+ readonly name: string;
6
+ readonly url: string;
7
+ }[];
8
+ }
9
+ type Change = {
10
+ readonly kind: 'add';
11
+ readonly name: string;
12
+ readonly url: string;
13
+ readonly expectedVersion: number;
14
+ } | {
15
+ readonly kind: 'remove';
16
+ readonly name: string;
17
+ readonly expectedVersion: number;
18
+ };
19
+ /** Validates a change against the current version before it can be stored. */
20
+ export declare function changeRepositoryList(current: RepositoryList, change: Change): Result<RepositoryList, {
21
+ reason: string;
22
+ }>;
23
+ export {};
@@ -0,0 +1,20 @@
1
+ import { readTrustedRepositories } from './trusted-repositories.js';
2
+ import { err, ok } from '../shared/result.js';
3
+ /** Validates a change against the current version before it can be stored. */
4
+ export function changeRepositoryList(current, change) {
5
+ if (change.expectedVersion !== current.version)
6
+ return err({ reason: 'version conflict' });
7
+ const existing = current.repositories.find((entry) => entry.name === change.name);
8
+ if (change.kind === 'add' && existing && existing.url !== change.url)
9
+ return err({ reason: 'name conflict' });
10
+ if ((change.kind === 'add' && existing) || (change.kind === 'remove' && !existing))
11
+ return ok(current);
12
+ const entries = current.repositories.filter((entry) => entry.name !== change.name);
13
+ if (change.kind === 'add')
14
+ entries.push({ name: change.name, url: change.url });
15
+ const validated = readTrustedRepositories(Object.fromEntries(entries.map(({ name, url }) => [name, url])));
16
+ if (!validated.isOk)
17
+ return validated;
18
+ return ok({ version: current.version + 1, repositories: validated.value.repositories });
19
+ }
20
+ //# sourceMappingURL=repository-list.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"repository-list.js","sourceRoot":"","sources":["../../../src/core/repositories/repository-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;AAS3D,8EAA8E;AAC9E,MAAM,UAAU,oBAAoB,CAAC,OAAuB,EAAE,MAAc;IAC1E,IAAI,MAAM,CAAC,eAAe,KAAK,OAAO,CAAC,OAAO;QAAE,OAAO,GAAG,CAAC,EAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAC3F,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC;IAClF,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,IAAI,QAAQ,IAAI,QAAQ,CAAC,GAAG,KAAK,MAAM,CAAC,GAAG;QAAE,OAAO,GAAG,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IAC9G,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC;QAAE,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC;IACvG,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC;IACnF,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK;QAAE,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;IAChF,MAAM,SAAS,GAAG,uBAAuB,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3G,IAAI,CAAC,SAAS,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC;IACtC,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,GAAG,CAAC,EAAE,YAAY,EAAE,SAAS,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;AAC1F,CAAC"}
@@ -19,10 +19,10 @@ export function createDeclareScopes(deps) {
19
19
  return refuse('FLEET_UNAVAILABLE', `The fleet did not answer its namespaces: ${listed.error.message}`);
20
20
  }
21
21
  const held = listed.value.find((each) => each.namespace === PLUGIN_NAMESPACE);
22
- if (held?.declaredBy === crew.shipId) {
22
+ if (held?.declaredBy === crew.shipId && PLUGIN_SCOPES.every((scope) => held.scopes.some((existing) => existing.scope === scope.scope && existing.description === scope.description))) {
23
23
  return ok({ isDeclared: false });
24
24
  }
25
- if (held) {
25
+ if (held && held.declaredBy !== crew.shipId) {
26
26
  const told = await deps.door.tellArgo(crew.crewToken, {
27
27
  text: argoMessage({
28
28
  headline: `The trierarch plugin cannot declare its scopes: another ship holds ${PLUGIN_NAMESPACE}`,