@aeolus-fleet/common 0.21.0 → 0.22.0

package/dist/fleet/busy-wait.d.ts

@@ -0,0 +1,6 @@
+/**
+ * The wait before the next call while the fleet answers busy: drawn between
+ * half and all of `waitMs`, so callers the fleet refused together do not call
+ * again together. `random` draws in [0, 1], as Math.random does.
+ */
+export declare function busyWaitMs(waitMs: number, random: () => number): number;

package/dist/fleet/busy-wait.js

@@ -0,0 +1,10 @@
+/**
+ * The wait before the next call while the fleet answers busy: drawn between
+ * half and all of `waitMs`, so callers the fleet refused together do not call
+ * again together. `random` draws in [0, 1], as Math.random does.
+ */
+export function busyWaitMs(waitMs, random) {
+    const half = waitMs / 2;
+    return half + random() * half;
+}
+//# sourceMappingURL=busy-wait.js.map

package/dist/fleet/busy-wait.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"busy-wait.js","sourceRoot":"","sources":["../../src/fleet/busy-wait.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,MAAc,EAAE,MAAoB;IAC7D,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,CAAC;IACxB,OAAO,IAAI,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC;AAChC,CAAC"}

package/dist/fleet/index.d.ts

@@ -89,7 +89,7 @@ export declare const deliveryStateSchema: z.ZodEnum<{
 }>;
 export type DeliveryState = z.infer<typeof deliveryStateSchema>;
 /** The event types written so far. Each later slice adds the ones it writes. */
-export declare const EVENT_TYPES: readonly ["FleetInitialised", "ShipCommissioned", "ShipClaimed", "LeaseRevoked", "CredentialRevoked", "StartingPromptIssued", "OperatorPasswordReset", "MessageAccepted", "DeliveryClaimed", "DeliveryAcknowledged", "DeliveryUndeliverable", "DeliveryReturned", "ShipRetired", "DeliveryAbandoned", "DeliveryDismissed", "ShipRenamed", "ShipReported", "SignInTicketIssued", "FleetLimitsChanged", "ViewerSessionStarted", "CrewRequested", "CrewRequestRemoved", "CrewAssigned", "CrewStatusChanged", "CrewRequestExplained", "CrewRequestGivenBack", "LabelDefined", "LabelValuesChanged", "LabelRetired", "LabelAssigned", "LabelUnassigned", "LabelDeleted", "WorktreeClearRequested", "WorktreeCleared", "WorktreeClearRemoved", "NetworkRulesSet", "NetworkPluginRegistered", "NetworkPluginUnregistered"];
+export declare const EVENT_TYPES: readonly ["FleetInitialised", "ShipCommissioned", "ShipClaimed", "LeaseRevoked", "CredentialRevoked", "StartingPromptIssued", "OperatorPasswordReset", "MessageAccepted", "DeliveryClaimed", "DeliveryAcknowledged", "DeliveryUndeliverable", "DeliveryReturned", "ShipRetired", "DeliveryAbandoned", "DeliveryDismissed", "ShipRenamed", "ShipReported", "SignInTicketIssued", "FleetLimitsChanged", "ViewerSessionStarted", "CrewRequested", "CrewRequestRemoved", "CrewAssigned", "CrewStatusChanged", "CrewRequestExplained", "CrewRequestGivenBack", "LabelDefined", "LabelValuesChanged", "LabelRetired", "LabelAssigned", "LabelUnassigned", "LabelDeleted", "WorktreeClearRequested", "WorktreeCleared", "WorktreeClearRemoved", "NetworkRulesSet", "NetworkRulesDeclared", "NetworkPluginRegistered", "NetworkPluginUnregistered"];
 export declare const eventTypeSchema: z.ZodEnum<{
     FleetInitialised: "FleetInitialised";
     ShipCommissioned: "ShipCommissioned";
@@ -127,8 +127,17 @@ export declare const eventTypeSchema: z.ZodEnum<{
     WorktreeCleared: "WorktreeCleared";
     WorktreeClearRemoved: "WorktreeClearRemoved";
     NetworkRulesSet: "NetworkRulesSet";
+    NetworkRulesDeclared: "NetworkRulesDeclared";
     NetworkPluginRegistered: "NetworkPluginRegistered";
     NetworkPluginUnregistered: "NetworkPluginUnregistered";
 }>;
 export type EventType = z.infer<typeof eventTypeSchema>;
+export * from './busy-wait.js';
 export * from './mcp-url.js';
+export * from './no-terminal-questions.js';
+/**
+ * How long a caller waits before each next call while the fleet answers busy
+ * (`SERVICE_UNAVAILABLE`, nothing stored; docs/architecture.md): bounded and
+ * longer each time, then the refusal stands. Each is drawn by `busyWaitMs`.
+ */
+export declare const FLEET_BUSY_WAITS_MS: readonly [1000, 2000, 4000, 8000];

package/dist/fleet/index.js

@@ -78,9 +78,18 @@ export const EVENT_TYPES = [
     'WorktreeCleared',
     'WorktreeClearRemoved',
     'NetworkRulesSet',
+    'NetworkRulesDeclared',
     'NetworkPluginRegistered',
     'NetworkPluginUnregistered',
 ];
 export const eventTypeSchema = z.enum(EVENT_TYPES);
+export * from './busy-wait.js';
 export * from './mcp-url.js';
+export * from './no-terminal-questions.js';
+/**
+ * How long a caller waits before each next call while the fleet answers busy
+ * (`SERVICE_UNAVAILABLE`, nothing stored; docs/architecture.md): bounded and
+ * longer each time, then the refusal stands. Each is drawn by `busyWaitMs`.
+ */
+export const FLEET_BUSY_WAITS_MS = [1000, 2000, 4000, 8000];
 //# sourceMappingURL=index.js.map

package/dist/fleet/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/fleet/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;GAIG;AAEH,gGAAgG;AAChG,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,eAAe,EAAE,kBAAkB,EAAE,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,CAAU,CAAC;AACjL,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAG1C;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,CAAU,CAAC;AAClJ,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAGrD,4FAA4F;AAC5F,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAU,CAAC;AACnE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAGjD,kFAAkF;AAClF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,CAAU,CAAC;AAC9E,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;AAGzD;;;GAGG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,cAAc,EAAE,QAAQ,EAAE,SAAS,CAAU,CAAC;AAC5E,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AAGtD,2GAA2G;AAC3G,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,MAAM,CAAU,CAAC;AACxD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;AAGzD;;;;GAIG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,SAAS,EAAE,WAAW,EAAE,cAAc,EAAE,eAAe,EAAE,WAAW,EAAE,WAAW,CAAU,CAAC;AAC5H,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;AAG3D,gFAAgF;AAChF,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,kBAAkB;IAClB,kBAAkB;IAClB,aAAa;IACb,cAAc;IACd,mBAAmB;IACnB,sBAAsB;IACtB,uBAAuB;IACvB,iBAAiB;IACjB,iBAAiB;IACjB,sBAAsB;IACtB,uBAAuB;IACvB,kBAAkB;IAClB,aAAa;IACb,mBAAmB;IACnB,mBAAmB;IACnB,aAAa;IACb,cAAc;IACd,oBAAoB;IACpB,oBAAoB;IACpB,sBAAsB;IACtB,eAAe;IACf,oBAAoB;IACpB,cAAc;IACd,mBAAmB;IACnB,sBAAsB;IACtB,sBAAsB;IACtB,cAAc;IACd,oBAAoB;IACpB,cAAc;IACd,eAAe;IACf,iBAAiB;IACjB,cAAc;IACd,wBAAwB;IACxB,iBAAiB;IACjB,sBAAsB;IACtB,iBAAiB;IACjB,yBAAyB;IACzB,2BAA2B;CACnB,CAAC;AACX,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AAGnD,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/fleet/index.ts"],"names":[],"mappings":"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"}

package/dist/fleet/no-terminal-questions.d.ts

@@ -0,0 +1,7 @@
+/**
+ * The line every crewed session is told (#585): nobody watches its pane, so a
+ * question asked there waits for ever. The ship protocol states it, the
+ * trierarch adds it to its first and every wake prompt, and the aeolus
+ * plugin's crew skills say the same.
+ */
+export declare const NO_TERMINAL_QUESTIONS = "No human reads this terminal. Never ask here; ask over the fleet. A question only the operator can answer goes to argo.";

package/dist/fleet/no-terminal-questions.js

@@ -0,0 +1,8 @@
+/**
+ * The line every crewed session is told (#585): nobody watches its pane, so a
+ * question asked there waits for ever. The ship protocol states it, the
+ * trierarch adds it to its first and every wake prompt, and the aeolus
+ * plugin's crew skills say the same.
+ */
+export const NO_TERMINAL_QUESTIONS = 'No human reads this terminal. Never ask here; ask over the fleet. A question only the operator can answer goes to argo.';
+//# sourceMappingURL=no-terminal-questions.js.map

package/dist/fleet/no-terminal-questions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"no-terminal-questions.js","sourceRoot":"","sources":["../../src/fleet/no-terminal-questions.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,yHAAyH,CAAC"}

package/dist/schemas/fleet.d.ts

@@ -397,6 +397,7 @@ export declare const liveFleetEventSchema: z.ZodObject<{
         WorktreeCleared: "WorktreeCleared";
         WorktreeClearRemoved: "WorktreeClearRemoved";
         NetworkRulesSet: "NetworkRulesSet";
+        NetworkRulesDeclared: "NetworkRulesDeclared";
         NetworkPluginRegistered: "NetworkPluginRegistered";
         NetworkPluginUnregistered: "NetworkPluginUnregistered";
     }>;
@@ -453,6 +454,7 @@ export declare const fleetStreamItemSchema: z.ZodDiscriminatedUnion<[z.ZodObject
             WorktreeCleared: "WorktreeCleared";
             WorktreeClearRemoved: "WorktreeClearRemoved";
             NetworkRulesSet: "NetworkRulesSet";
+            NetworkRulesDeclared: "NetworkRulesDeclared";
             NetworkPluginRegistered: "NetworkPluginRegistered";
             NetworkPluginUnregistered: "NetworkPluginUnregistered";
         }>;

package/dist/schemas/follow.d.ts

@@ -58,6 +58,7 @@ export declare const followFleetOutputSchema: z.ZodObject<{
             WorktreeCleared: "WorktreeCleared";
             WorktreeClearRemoved: "WorktreeClearRemoved";
             NetworkRulesSet: "NetworkRulesSet";
+            NetworkRulesDeclared: "NetworkRulesDeclared";
             NetworkPluginRegistered: "NetworkPluginRegistered";
             NetworkPluginUnregistered: "NetworkPluginUnregistered";
         }>;

package/dist/schemas/history.d.ts

@@ -179,6 +179,7 @@ export declare const timelineEntrySchema: z.ZodObject<{
         WorktreeCleared: "WorktreeCleared";
         WorktreeClearRemoved: "WorktreeClearRemoved";
         NetworkRulesSet: "NetworkRulesSet";
+        NetworkRulesDeclared: "NetworkRulesDeclared";
         NetworkPluginRegistered: "NetworkPluginRegistered";
         NetworkPluginUnregistered: "NetworkPluginUnregistered";
     }>;
@@ -255,6 +256,7 @@ export declare const shipTimelineOutputSchema: z.ZodArray<z.ZodObject<{
         WorktreeCleared: "WorktreeCleared";
         WorktreeClearRemoved: "WorktreeClearRemoved";
         NetworkRulesSet: "NetworkRulesSet";
+        NetworkRulesDeclared: "NetworkRulesDeclared";
         NetworkPluginRegistered: "NetworkPluginRegistered";
         NetworkPluginUnregistered: "NetworkPluginUnregistered";
     }>;

package/dist/schemas/network.d.ts

@@ -2,33 +2,125 @@ import { z } from 'zod';
 /**
  * Network rules (decision 0034): which ships may send to which. A rule says
  * that the ships matching one label selector may send to the ships matching
- * another; a selector is a set of label value ids, matched as label selection
- * is (every one of them, an empty one every ship). Allow-only. The limits are
- * the decision's; the server checks them, so every refusal names it.
+ * another; a selector is a list of terms that must all hold (an empty one
+ * holds for every ship). Allow-only. The limits are the decision's; the server
+ * checks them, so every refusal names it.
  */
-/** The most rules one fleet may hold. */
+/** The most rules of argo's one fleet may hold, beside the rules its ships declared (decision 0037). */
 export declare const NETWORK_RULES_MAX = 200;
+/** The most rules one ship may declare (decision 0037). */
+export declare const DECLARED_NETWORK_RULES_MAX = 20;
 /** The most refusals one read of them answers: the latest. */
 export declare const REACH_REFUSALS_READ_MAX = 100;
-/** Ships carrying every one of these label values: exact matches, combined with AND. */
-export declare const labelSelectorSchema: z.ZodArray<z.ZodType<`lbv_${string}`, unknown, z.core.$ZodTypeInternals<`lbv_${string}`, unknown>>>;
+/** A term's value that is any value of its label: the ship carries the label. */
+export declare const ANY_LABEL_VALUE: "*";
+/** A term's value that is any value of its label the ship on the other side of the rule carries too. */
+export declare const SAME_LABEL_VALUE: "#";
+/**
+ * One term of a selector: an exact label value, written as its id, which
+ * names its label; or a label with any value (`*`) or with the same value as
+ * the other side's (`#`), which binds the same label there only.
+ */
+export declare const selectorTermSchema: z.ZodUnion<readonly [z.ZodType<`lbv_${string}`, unknown, z.core.$ZodTypeInternals<`lbv_${string}`, unknown>>, z.ZodObject<{
+    labelId: z.ZodType<`lbl_${string}`, unknown, z.core.$ZodTypeInternals<`lbl_${string}`, unknown>>;
+    value: z.ZodEnum<{
+        "*": "*";
+        "#": "#";
+    }>;
+}, z.core.$strip>]>;
+export type SelectorTerm = z.infer<typeof selectorTermSchema>;
+/** The ships for which every one of these terms holds, combined with AND. */
+export declare const labelSelectorSchema: z.ZodArray<z.ZodUnion<readonly [z.ZodType<`lbv_${string}`, unknown, z.core.$ZodTypeInternals<`lbv_${string}`, unknown>>, z.ZodObject<{
+    labelId: z.ZodType<`lbl_${string}`, unknown, z.core.$ZodTypeInternals<`lbl_${string}`, unknown>>;
+    value: z.ZodEnum<{
+        "*": "*";
+        "#": "#";
+    }>;
+}, z.core.$strip>]>>;
 /** One rule: the ships matching `from` may send to the ships matching `to`. */
 export declare const networkRuleSchema: z.ZodObject<{
-    from: z.ZodArray<z.ZodType<`lbv_${string}`, unknown, z.core.$ZodTypeInternals<`lbv_${string}`, unknown>>>;
-    to: z.ZodArray<z.ZodType<`lbv_${string}`, unknown, z.core.$ZodTypeInternals<`lbv_${string}`, unknown>>>;
+    from: z.ZodArray<z.ZodUnion<readonly [z.ZodType<`lbv_${string}`, unknown, z.core.$ZodTypeInternals<`lbv_${string}`, unknown>>, z.ZodObject<{
+        labelId: z.ZodType<`lbl_${string}`, unknown, z.core.$ZodTypeInternals<`lbl_${string}`, unknown>>;
+        value: z.ZodEnum<{
+            "*": "*";
+            "#": "#";
+        }>;
+    }, z.core.$strip>]>>;
+    to: z.ZodArray<z.ZodUnion<readonly [z.ZodType<`lbv_${string}`, unknown, z.core.$ZodTypeInternals<`lbv_${string}`, unknown>>, z.ZodObject<{
+        labelId: z.ZodType<`lbl_${string}`, unknown, z.core.$ZodTypeInternals<`lbl_${string}`, unknown>>;
+        value: z.ZodEnum<{
+            "*": "*";
+            "#": "#";
+        }>;
+    }, z.core.$strip>]>>;
 }, z.core.$strip>;
 export type NetworkRule = z.infer<typeof networkRuleSchema>;
 /** Input of `fleet.setNetworkRules` (fleet:network): every rule the fleet holds from now on, or none for all-to-all. */
 export declare const setNetworkRulesInputSchema: z.ZodObject<{
     rules: z.ZodNullable<z.ZodArray<z.ZodObject<{
-        from: z.ZodArray<z.ZodType<`lbv_${string}`, unknown, z.core.$ZodTypeInternals<`lbv_${string}`, unknown>>>;
-        to: z.ZodArray<z.ZodType<`lbv_${string}`, unknown, z.core.$ZodTypeInternals<`lbv_${string}`, unknown>>>;
+        from: z.ZodArray<z.ZodUnion<readonly [z.ZodType<`lbv_${string}`, unknown, z.core.$ZodTypeInternals<`lbv_${string}`, unknown>>, z.ZodObject<{
+            labelId: z.ZodType<`lbl_${string}`, unknown, z.core.$ZodTypeInternals<`lbl_${string}`, unknown>>;
+            value: z.ZodEnum<{
+                "*": "*";
+                "#": "#";
+            }>;
+        }, z.core.$strip>]>>;
+        to: z.ZodArray<z.ZodUnion<readonly [z.ZodType<`lbv_${string}`, unknown, z.core.$ZodTypeInternals<`lbv_${string}`, unknown>>, z.ZodObject<{
+            labelId: z.ZodType<`lbl_${string}`, unknown, z.core.$ZodTypeInternals<`lbl_${string}`, unknown>>;
+            value: z.ZodEnum<{
+                "*": "*";
+                "#": "#";
+            }>;
+        }, z.core.$strip>]>>;
     }, z.core.$strip>>>;
 }, z.core.$strip>;
 /** Output of `fleet.setNetworkRules`: the version the fleet's network settings have now. */
 export declare const setNetworkRulesOutputSchema: z.ZodObject<{
     version: z.ZodInt;
 }, z.core.$strip>;
+/** Input of `fleet.declareNetworkRules` (labels:define): every rule the ship declares from now on, on labels it owns; an empty list withdraws them (decision 0037). */
+export declare const declareNetworkRulesInputSchema: z.ZodObject<{
+    rules: z.ZodArray<z.ZodObject<{
+        from: z.ZodArray<z.ZodUnion<readonly [z.ZodType<`lbv_${string}`, unknown, z.core.$ZodTypeInternals<`lbv_${string}`, unknown>>, z.ZodObject<{
+            labelId: z.ZodType<`lbl_${string}`, unknown, z.core.$ZodTypeInternals<`lbl_${string}`, unknown>>;
+            value: z.ZodEnum<{
+                "*": "*";
+                "#": "#";
+            }>;
+        }, z.core.$strip>]>>;
+        to: z.ZodArray<z.ZodUnion<readonly [z.ZodType<`lbv_${string}`, unknown, z.core.$ZodTypeInternals<`lbv_${string}`, unknown>>, z.ZodObject<{
+            labelId: z.ZodType<`lbl_${string}`, unknown, z.core.$ZodTypeInternals<`lbl_${string}`, unknown>>;
+            value: z.ZodEnum<{
+                "*": "*";
+                "#": "#";
+            }>;
+        }, z.core.$strip>]>>;
+    }, z.core.$strip>>;
+}, z.core.$strip>;
+/** Output of `fleet.declareNetworkRules`: how many rules the ship declares now. */
+export declare const declareNetworkRulesOutputSchema: z.ZodObject<{
+    rules: z.ZodInt;
+}, z.core.$strip>;
+/** Output of `fleet.declaredNetworkRules` (fleet:network): each ship that declared rules, with its whole list. */
+export declare const declaredNetworkRulesOutputSchema: z.ZodArray<z.ZodObject<{
+    shipId: z.ZodType<`shp_${string}`, unknown, z.core.$ZodTypeInternals<`shp_${string}`, unknown>>;
+    rules: z.ZodArray<z.ZodObject<{
+        from: z.ZodArray<z.ZodUnion<readonly [z.ZodType<`lbv_${string}`, unknown, z.core.$ZodTypeInternals<`lbv_${string}`, unknown>>, z.ZodObject<{
+            labelId: z.ZodType<`lbl_${string}`, unknown, z.core.$ZodTypeInternals<`lbl_${string}`, unknown>>;
+            value: z.ZodEnum<{
+                "*": "*";
+                "#": "#";
+            }>;
+        }, z.core.$strip>]>>;
+        to: z.ZodArray<z.ZodUnion<readonly [z.ZodType<`lbv_${string}`, unknown, z.core.$ZodTypeInternals<`lbv_${string}`, unknown>>, z.ZodObject<{
+            labelId: z.ZodType<`lbl_${string}`, unknown, z.core.$ZodTypeInternals<`lbl_${string}`, unknown>>;
+            value: z.ZodEnum<{
+                "*": "*";
+                "#": "#";
+            }>;
+        }, z.core.$strip>]>>;
+    }, z.core.$strip>>;
+}, z.core.$strip>>;
 /**
  * What happens to sends while a fleet's networking plugin is unavailable
  * (decision 0035): every send refused but the fixed exceptions, every send

package/dist/schemas/network.js

@@ -4,22 +4,40 @@ import { carriedLabelSchema } from './label.js';
 /**
  * Network rules (decision 0034): which ships may send to which. A rule says
  * that the ships matching one label selector may send to the ships matching
- * another; a selector is a set of label value ids, matched as label selection
- * is (every one of them, an empty one every ship). Allow-only. The limits are
- * the decision's; the server checks them, so every refusal names it.
+ * another; a selector is a list of terms that must all hold (an empty one
+ * holds for every ship). Allow-only. The limits are the decision's; the server
+ * checks them, so every refusal names it.
  */
-/** The most rules one fleet may hold. */
+/** The most rules of argo's one fleet may hold, beside the rules its ships declared (decision 0037). */
 export const NETWORK_RULES_MAX = 200;
+/** The most rules one ship may declare (decision 0037). */
+export const DECLARED_NETWORK_RULES_MAX = 20;
 /** The most refusals one read of them answers: the latest. */
 export const REACH_REFUSALS_READ_MAX = 100;
-/** Ships carrying every one of these label values: exact matches, combined with AND. */
-export const labelSelectorSchema = z.array(idSchema('labelValue'));
+/** A term's value that is any value of its label: the ship carries the label. */
+export const ANY_LABEL_VALUE = '*';
+/** A term's value that is any value of its label the ship on the other side of the rule carries too. */
+export const SAME_LABEL_VALUE = '#';
+/**
+ * One term of a selector: an exact label value, written as its id, which
+ * names its label; or a label with any value (`*`) or with the same value as
+ * the other side's (`#`), which binds the same label there only.
+ */
+export const selectorTermSchema = z.union([idSchema('labelValue'), z.object({ labelId: idSchema('label'), value: z.enum([ANY_LABEL_VALUE, SAME_LABEL_VALUE]) })]);
+/** The ships for which every one of these terms holds, combined with AND. */
+export const labelSelectorSchema = z.array(selectorTermSchema);
 /** One rule: the ships matching `from` may send to the ships matching `to`. */
 export const networkRuleSchema = z.object({ from: labelSelectorSchema, to: labelSelectorSchema });
 /** Input of `fleet.setNetworkRules` (fleet:network): every rule the fleet holds from now on, or none for all-to-all. */
 export const setNetworkRulesInputSchema = z.object({ rules: z.array(networkRuleSchema).nullable() });
 /** Output of `fleet.setNetworkRules`: the version the fleet's network settings have now. */
 export const setNetworkRulesOutputSchema = z.object({ version: z.int().min(1) });
+/** Input of `fleet.declareNetworkRules` (labels:define): every rule the ship declares from now on, on labels it owns; an empty list withdraws them (decision 0037). */
+export const declareNetworkRulesInputSchema = z.object({ rules: z.array(networkRuleSchema) });
+/** Output of `fleet.declareNetworkRules`: how many rules the ship declares now. */
+export const declareNetworkRulesOutputSchema = z.object({ rules: z.int().min(0) });
+/** Output of `fleet.declaredNetworkRules` (fleet:network): each ship that declared rules, with its whole list. */
+export const declaredNetworkRulesOutputSchema = z.array(z.object({ shipId: idSchema('ship'), rules: z.array(networkRuleSchema) }));
 /**
  * What happens to sends while a fleet's networking plugin is unavailable
  * (decision 0035): every send refused but the fixed exceptions, every send

package/dist/schemas/network.js.map

@@ -1 +1 @@
-{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/schemas/network.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/schemas/network.ts"],"names":[],"mappings":"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"}

package/dist/schemas/system.d.ts

@@ -5,3 +5,10 @@ export declare const pingOutputSchema: z.ZodObject<{
     fleetCount: z.ZodInt;
 }, z.core.$strip>;
 export type PingOutput = z.infer<typeof pingOutputSchema>;
+/** Output of `system.version`: the versions the server process runs and the latest migration applied to its database (null before the first). */
+export declare const systemVersionOutputSchema: z.ZodObject<{
+    server: z.ZodString;
+    common: z.ZodString;
+    migration: z.ZodNullable<z.ZodString>;
+}, z.core.$strip>;
+export type SystemVersionOutput = z.infer<typeof systemVersionOutputSchema>;

package/dist/schemas/system.js

@@ -5,4 +5,10 @@ export const pingOutputSchema = z.object({
     serverTime: z.iso.datetime(),
     fleetCount: z.int().nonnegative(),
 });
+/** Output of `system.version`: the versions the server process runs and the latest migration applied to its database (null before the first). */
+export const systemVersionOutputSchema = z.object({
+    server: z.string(),
+    common: z.string(),
+    migration: z.string().nullable(),
+});
 //# sourceMappingURL=system.js.map

package/dist/schemas/system.js.map

@@ -1 +1 @@
-{"version":3,"file":"system.js","sourceRoot":"","sources":["../../src/schemas/system.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,0FAA0F;AAC1F,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,uBAAuB;IACvB,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE;IAC5B,UAAU,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE;CAClC,CAAC,CAAC"}
+{"version":3,"file":"system.js","sourceRoot":"","sources":["../../src/schemas/system.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,0FAA0F;AAC1F,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,uBAAuB;IACvB,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE;IAC5B,UAAU,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE;CAClC,CAAC,CAAC;AAIH,iJAAiJ;AACjJ,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC,MAAM,CAAC;IAChD,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeolus-fleet/common",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "Aeolus shared schemas, prefixed ids and types.",
   "license": "Apache-2.0",
   "type": "module",