@aeolus-fleet/common 0.32.4 → 0.34.0

package/dist/schemas/sealing.js.map

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

package/dist/schemas/ship.d.ts

@@ -28,12 +28,12 @@ export declare const locationSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
 }, z.core.$strict>], "kind">;
 export type LocationInput = z.infer<typeof locationSchema>;
 /** The harnesses the console names; any other is free text. */
-export declare const KNOWN_HARNESSES: readonly ["claude-code", "claude-chat", "codex"];
+export declare const KNOWN_HARNESSES: readonly ["claude-code", "claude-chat", "codex", "copilot"];
 /** The longest harness a session may state. */
 export declare const HARNESS_MAX_LENGTH = 50;
 /**
  * The harness a session runs in (docs/blueprint.md, "Harness"), such as
- * claude-code, claude-chat or codex: free text, trimmed and in lower case.
+ * claude-code, claude-chat, codex or copilot: free text, trimmed and in lower case.
  * Stated once when the session crews the ship, read together with its
  * location; never interpreted.
  */

package/dist/schemas/ship.js

@@ -29,12 +29,12 @@ export const locationSchema = z.discriminatedUnion('kind', [
     }),
 ]);
 /** The harnesses the console names; any other is free text. */
-export const KNOWN_HARNESSES = ['claude-code', 'claude-chat', 'codex'];
+export const KNOWN_HARNESSES = ['claude-code', 'claude-chat', 'codex', 'copilot'];
 /** The longest harness a session may state. */
 export const HARNESS_MAX_LENGTH = 50;
 /**
  * The harness a session runs in (docs/blueprint.md, "Harness"), such as
- * claude-code, claude-chat or codex: free text, trimmed and in lower case.
+ * claude-code, claude-chat, codex or copilot: free text, trimmed and in lower case.
  * Stated once when the session crews the ship, read together with its
  * location; never interpreted.
  */

package/dist/schemas/ship.js.map

@@ -1 +1 @@
-{"version":3,"file":"ship.js","sourceRoot":"","sources":["../../src/schemas/ship.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C;;;;GAIG;AAEH,4FAA4F;AAC5F,MAAM,CAAC,MAAM,+BAA+B,GAAG,GAAG,CAAC;AAEnD;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,CAAC;AAE1C;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;IACzD,CAAC,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC;IAC/D,CAAC,CAAC,YAAY,CAAC;QACb,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;QACxB,WAAW,EAAE,CAAC;aACX,MAAM,EAAE;aACR,IAAI,EAAE;aACN,GAAG,CAAC,CAAC,EAAE,uCAAuC,CAAC;aAC/C,GAAG,CAAC,+BAA+B,EAAE,4BAA4B,+BAA+B,aAAa,CAAC;KAClH,CAAC;CACH,CAAC,CAAC;AAIH,+DAA+D;AAC/D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,aAAa,EAAE,aAAa,EAAE,OAAO,CAAU,CAAC;AAEhF,+CAA+C;AAC/C,MAAM,CAAC,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAErC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC;KAC3B,MAAM,EAAE;KACR,IAAI,EAAE;KACN,WAAW,EAAE;KACb,GAAG,CAAC,CAAC,EAAE,qDAAqD,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;KACzF,GAAG,CAAC,kBAAkB,EAAE,wBAAwB,MAAM,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;AAE5F,8HAA8H;AAC9H,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1C,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC;IACxB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,sBAAsB,CAAC;IACrD,QAAQ,EAAE,cAAc;IACxB,OAAO,EAAE,aAAa;CACvB,CAAC,CAAC;AAIH;;;GAGG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAIxE,kDAAkD;AAClD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC;IACxB,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC;IAC1B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB;;;;OAIG;IACH,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;IACxC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAIH,kEAAkE;AAClE,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC"}
+{"version":3,"file":"ship.js","sourceRoot":"","sources":["../../src/schemas/ship.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C;;;;GAIG;AAEH,4FAA4F;AAC5F,MAAM,CAAC,MAAM,+BAA+B,GAAG,GAAG,CAAC;AAEnD;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,CAAC;AAE1C;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;IACzD,CAAC,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC;IAC/D,CAAC,CAAC,YAAY,CAAC;QACb,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;QACxB,WAAW,EAAE,CAAC;aACX,MAAM,EAAE;aACR,IAAI,EAAE;aACN,GAAG,CAAC,CAAC,EAAE,uCAAuC,CAAC;aAC/C,GAAG,CAAC,+BAA+B,EAAE,4BAA4B,+BAA+B,aAAa,CAAC;KAClH,CAAC;CACH,CAAC,CAAC;AAIH,+DAA+D;AAC/D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,aAAa,EAAE,aAAa,EAAE,OAAO,EAAE,SAAS,CAAU,CAAC;AAE3F,+CAA+C;AAC/C,MAAM,CAAC,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAErC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC;KAC3B,MAAM,EAAE;KACR,IAAI,EAAE;KACN,WAAW,EAAE;KACb,GAAG,CAAC,CAAC,EAAE,qDAAqD,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;KACzF,GAAG,CAAC,kBAAkB,EAAE,wBAAwB,MAAM,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC;AAE5F,8HAA8H;AAC9H,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1C,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC;IACxB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,sBAAsB,CAAC;IACrD,QAAQ,EAAE,cAAc;IACxB,OAAO,EAAE,aAAa;CACvB,CAAC,CAAC;AAIH;;;GAGG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAIxE,kDAAkD;AAClD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC;IACxB,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC;IAC1B,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB;;;;OAIG;IACH,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;IACxC,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CACjC,CAAC,CAAC;AAIH,kEAAkE;AAClE,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC"}

package/dist/trierarch/index.d.ts

@@ -2,3 +2,4 @@ export * from './configuration.js';
 export * from './crew-settings.js';
 export * from './names.js';
 export * from './report-details.js';
+export * from './usage-message.js';

package/dist/trierarch/index.js

@@ -2,4 +2,5 @@ export * from './configuration.js';
 export * from './crew-settings.js';
 export * from './names.js';
 export * from './report-details.js';
+export * from './usage-message.js';
 //# sourceMappingURL=index.js.map

package/dist/trierarch/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/trierarch/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/trierarch/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC"}

package/dist/trierarch/report-details.d.ts

@@ -5,6 +5,35 @@ export declare const MACHINE_OS: readonly ["macos", "linux", "windows"];
 export declare const MACHINE_ARCH: readonly ["arm64", "amd64"];
 /** Where a trierarch runs its sessions: on the host or each in a container of its own (decision 0039). */
 export declare const SESSION_RUNTIMES: readonly ["host", "container"];
+/** How much of one harness's subscription is used, per window, as the trierarch read it. */
+export declare const subscriptionReadingSchema: z.ZodObject<{
+    harness: z.ZodString;
+    readAt: z.ZodISODateTime;
+    windows: z.ZodArray<z.ZodObject<{
+        windowMinutes: z.ZodInt;
+        usedPercent: z.ZodNumber;
+        resetsAt: z.ZodISODateTime;
+    }, z.core.$strict>>;
+}, z.core.$strict>;
+/** The logins a session runs on (aeolus-fleet-trierarch's api keys design, K5): its harness's subscription, or an API key kept on the computer. */
+export declare const SESSION_LOGINS: readonly ["subscription", "apiKey"];
+/** Where a harness's API key stands (K8): none on the computer, ready, refused by its vendor, or out of credit. */
+export declare const KEY_STATES: readonly ["none", "ready", "refused", "outOfCredit"];
+/** The tokens of one model, with their cost estimated from the trierarch's price table (null for a model it does not price). */
+export declare const modelUsageSchema: z.ZodObject<{
+    model: z.ZodString;
+    login: z.ZodOptional<z.ZodEnum<{
+        subscription: "subscription";
+        apiKey: "apiKey";
+    }>>;
+    tokens: z.ZodObject<{
+        input: z.ZodInt;
+        output: z.ZodInt;
+        cacheRead: z.ZodInt;
+        cacheWrite: z.ZodInt;
+    }, z.core.$strict>;
+    estimatedCostUsd: z.ZodNullable<z.ZodNumber>;
+}, z.core.$strict>;
 /** The longest reason a harness is not offered: one line for the console. */
 export declare const NOT_OFFERED_REASON_MAX_LENGTH = 280;
 export declare const trierarchReportDetailsSchema: z.ZodObject<{
@@ -15,6 +44,19 @@ export declare const trierarchReportDetailsSchema: z.ZodObject<{
         riskyFlags: z.ZodOptional<z.ZodArray<z.ZodString>>;
         version: z.ZodOptional<z.ZodString>;
         modelsConfirmedAt: z.ZodOptional<z.ZodNullable<z.ZodISODateTime>>;
+        login: z.ZodOptional<z.ZodObject<{
+            default: z.ZodEnum<{
+                subscription: "subscription";
+                apiKey: "apiKey";
+            }>;
+            key: z.ZodEnum<{
+                none: "none";
+                refused: "refused";
+                ready: "ready";
+                outOfCredit: "outOfCredit";
+            }>;
+            keyStateAt: z.ZodOptional<z.ZodISODateTime>;
+        }, z.core.$strict>>;
     }, z.core.$strict>>;
     workspaces: z.ZodObject<{
         repositories: z.ZodArray<z.ZodString>;
@@ -51,6 +93,17 @@ export declare const trierarchReportDetailsSchema: z.ZodObject<{
         harness: z.ZodString;
         reason: z.ZodString;
     }, z.core.$strict>>>;
+    logins: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        shipId: z.ZodType<`shp_${string}`, unknown, z.core.$ZodTypeInternals<`shp_${string}`, unknown>>;
+        login: z.ZodEnum<{
+            subscription: "subscription";
+            apiKey: "apiKey";
+        }>;
+        next: z.ZodOptional<z.ZodEnum<{
+            subscription: "subscription";
+            apiKey: "apiKey";
+        }>>;
+    }, z.core.$strict>>>;
     load: z.ZodOptional<z.ZodObject<{
         memory: z.ZodObject<{
             totalBytes: z.ZodInt;
@@ -83,6 +136,10 @@ export declare const trierarchReportDetailsSchema: z.ZodObject<{
             shipId: z.ZodType<`shp_${string}`, unknown, z.core.$ZodTypeInternals<`shp_${string}`, unknown>>;
             models: z.ZodArray<z.ZodObject<{
                 model: z.ZodString;
+                login: z.ZodOptional<z.ZodEnum<{
+                    subscription: "subscription";
+                    apiKey: "apiKey";
+                }>>;
                 tokens: z.ZodObject<{
                     input: z.ZodInt;
                     output: z.ZodInt;

package/dist/trierarch/report-details.js

@@ -38,6 +38,26 @@ const machineLoadSchema = z.strictObject({
     /** The filesystem the trierarch's worktree root is on. */
     disk: z.strictObject({ totalBytes: byteCountSchema, freeBytes: byteCountSchema }),
 });
+/** How much of one harness's subscription is used, per window, as the trierarch read it. */
+export const subscriptionReadingSchema = z.strictObject({
+    harness: harnessSchema,
+    /** When the trierarch read it (ISO 8601 in UTC). */
+    readAt: z.iso.datetime(),
+    windows: z.array(z.strictObject({ windowMinutes: z.int().positive(), usedPercent: percentSchema, resetsAt: z.iso.datetime() })),
+});
+/** The logins a session runs on (aeolus-fleet-trierarch's api keys design, K5): its harness's subscription, or an API key kept on the computer. */
+export const SESSION_LOGINS = ['subscription', 'apiKey'];
+const sessionLoginSchema = z.enum(SESSION_LOGINS);
+/** Where a harness's API key stands (K8): none on the computer, ready, refused by its vendor, or out of credit. */
+export const KEY_STATES = ['none', 'ready', 'refused', 'outOfCredit'];
+/** The tokens of one model, with their cost estimated from the trierarch's price table (null for a model it does not price). */
+export const modelUsageSchema = z.strictObject({
+    model: z.string().min(1),
+    /** The login of the sessions that used them (K8), so a ship's cost on the key is the sum of its apiKey entries. None from a trierarch before 0.34.0. */
+    login: sessionLoginSchema.optional(),
+    tokens: z.strictObject({ input: tokenCountSchema, output: tokenCountSchema, cacheRead: tokenCountSchema, cacheWrite: tokenCountSchema }),
+    estimatedCostUsd: z.number().nonnegative().nullable(),
+});
 /**
  * What the trierarch reads of its harnesses' usage (#353): how much of each
  * harness's subscription is used, per window, and the tokens each ship it
@@ -45,20 +65,8 @@ const machineLoadSchema = z.strictObject({
  * for a model the table does not price).
  */
 const harnessUsageSchema = z.strictObject({
-    subscriptions: z.array(z.strictObject({
-        harness: harnessSchema,
-        /** When the trierarch read it (ISO 8601 in UTC). */
-        readAt: z.iso.datetime(),
-        windows: z.array(z.strictObject({ windowMinutes: z.int().positive(), usedPercent: percentSchema, resetsAt: z.iso.datetime() })),
-    })),
-    ships: z.array(z.strictObject({
-        shipId: idSchema('ship'),
-        models: z.array(z.strictObject({
-            model: z.string().min(1),
-            tokens: z.strictObject({ input: tokenCountSchema, output: tokenCountSchema, cacheRead: tokenCountSchema, cacheWrite: tokenCountSchema }),
-            estimatedCostUsd: z.number().nonnegative().nullable(),
-        })),
-    })),
+    subscriptions: z.array(subscriptionReadingSchema),
+    ships: z.array(z.strictObject({ shipId: idSchema('ship'), models: z.array(modelUsageSchema) })),
 });
 /** The longest reason a harness is not offered: one line for the console. */
 export const NOT_OFFERED_REASON_MAX_LENGTH = 280;
@@ -79,6 +87,12 @@ export const trierarchReportDetailsSchema = z.strictObject({
         version: z.string().min(1).optional(),
         /** When the trierarch last confirmed this harness's models (ISO 8601 in UTC); null while none is. None with no version. */
         modelsConfirmedAt: z.iso.datetime().nullable().optional(),
+        /**
+         * The login the harness's sessions run on by default, and its API key's
+         * state, never the key (K7, K8), with since when (ISO 8601 in UTC) where
+         * the trierarch knows it. None from a trierarch before 0.34.0.
+         */
+        login: z.strictObject({ default: sessionLoginSchema, key: z.enum(KEY_STATES), keyStateAt: z.iso.datetime().optional() }).optional(),
     })),
     workspaces: z.strictObject({ repositories: z.array(trierarchNameSchema), folders: z.array(trierarchNameSchema) }),
     /** How many ships the machine crews at most, and how many sessions run at once. */
@@ -106,6 +120,12 @@ export const trierarchReportDetailsSchema = z.strictObject({
      * before 0.31.0, or with every harness offered.
      */
     notOffered: z.array(z.strictObject({ harness: harnessSchema, reason: z.string().min(1).max(NOT_OFFERED_REASON_MAX_LENGTH) })).optional(),
+    /**
+     * The login of each ship it crews (K8): its running or last session's, and
+     * `next` when its next start would use the other one (K3). None from a
+     * trierarch before 0.34.0.
+     */
+    logins: z.array(z.strictObject({ shipId: idSchema('ship'), login: sessionLoginSchema, next: sessionLoginSchema.optional() })).optional(),
     /** None from a trierarch before 0.31.0. */
     load: machineLoadSchema.optional(),
     /** None from a trierarch before 0.31.0. */

package/dist/trierarch/report-details.js.map

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

package/dist/trierarch/usage-message.d.ts

@@ -0,0 +1,47 @@
+import { z } from 'zod';
+/** The content type of a trierarch's usage message to the trierarch plugin's ship. */
+export declare const TRIERARCH_USAGE_CONTENT_TYPE = "application/vnd.aeolus.trierarch.usage+json";
+/**
+ * The usage a trierarch sends its trierarch plugin's ship (aeolus-fleet's
+ * docs/design/usage/usage.md, "What the trierarch sends, and when"): the hours
+ * that changed since its last send that returned OK, each whole, and the
+ * subscription readings since then. An hour's tokens are its total so far, set,
+ * never added. Every object refuses unknown fields.
+ */
+export declare const trierarchUsageMessageSchema: z.ZodObject<{
+    hours: z.ZodArray<z.ZodObject<{
+        hour: z.ZodISODateTime;
+        ships: z.ZodArray<z.ZodObject<{
+            shipId: z.ZodType<`shp_${string}`, unknown, z.core.$ZodTypeInternals<`shp_${string}`, unknown>>;
+            harness: z.ZodString;
+            folderMadeAt: z.ZodISODateTime;
+            login: z.ZodNullable<z.ZodString>;
+            models: z.ZodArray<z.ZodObject<{
+                model: z.ZodString;
+                tokens: z.ZodObject<{
+                    input: z.ZodInt;
+                    output: z.ZodInt;
+                    cacheRead: z.ZodInt;
+                    cacheWrite: z.ZodInt;
+                }, z.core.$strict>;
+                estimatedCostUsd: z.ZodNullable<z.ZodObject<{
+                    input: z.ZodNumber;
+                    output: z.ZodNumber;
+                    cacheRead: z.ZodNumber;
+                    cacheWrite: z.ZodNumber;
+                }, z.core.$strict>>;
+            }, z.core.$strict>>;
+        }, z.core.$strict>>;
+    }, z.core.$strict>>;
+    subscriptions: z.ZodArray<z.ZodObject<{
+        harness: z.ZodString;
+        readAt: z.ZodISODateTime;
+        windows: z.ZodArray<z.ZodObject<{
+            windowMinutes: z.ZodInt;
+            usedPercent: z.ZodNumber;
+            resetsAt: z.ZodISODateTime;
+        }, z.core.$strict>>;
+    }, z.core.$strict>>;
+    readAt: z.ZodISODateTime;
+}, z.core.$strict>;
+export type TrierarchUsageMessage = z.infer<typeof trierarchUsageMessageSchema>;

package/dist/trierarch/usage-message.js

@@ -0,0 +1,51 @@
+import { z } from 'zod';
+import { idSchema } from '../ids/index.js';
+import { harnessSchema } from '../schemas/ship.js';
+import { subscriptionReadingSchema } from './report-details.js';
+/** The content type of a trierarch's usage message to the trierarch plugin's ship. */
+export const TRIERARCH_USAGE_CONTENT_TYPE = 'application/vnd.aeolus.trierarch.usage+json';
+/**
+ * A timestamp at the start of a UTC hour (ISO 8601 in UTC): a ship's tokens
+ * count in the UTC hour each transcript entry happened.
+ */
+const utcHourSchema = z.iso.datetime().refine((value) => {
+    const at = new Date(value);
+    return at.getUTCMinutes() === 0 && at.getUTCSeconds() === 0 && at.getUTCMilliseconds() === 0;
+}, 'An hour starts a UTC hour');
+const tokenCountSchema = z.int().nonnegative();
+const costSchema = z.number().nonnegative();
+/**
+ * The tokens of one model in one hour, each kind with its cost estimated from
+ * the trierarch's price table, so the Usage page splits cost by token kind;
+ * null for a model the table does not price.
+ */
+const modelHourUsageSchema = z.strictObject({
+    model: z.string().min(1),
+    tokens: z.strictObject({ input: tokenCountSchema, output: tokenCountSchema, cacheRead: tokenCountSchema, cacheWrite: tokenCountSchema }),
+    estimatedCostUsd: z.strictObject({ input: costSchema, output: costSchema, cacheRead: costSchema, cacheWrite: costSchema }).nullable(),
+});
+/**
+ * The usage a trierarch sends its trierarch plugin's ship (aeolus-fleet's
+ * docs/design/usage/usage.md, "What the trierarch sends, and when"): the hours
+ * that changed since its last send that returned OK, each whole, and the
+ * subscription readings since then. An hour's tokens are its total so far, set,
+ * never added. Every object refuses unknown fields.
+ */
+export const trierarchUsageMessageSchema = z.strictObject({
+    hours: z.array(z.strictObject({
+        hour: utcHourSchema,
+        ships: z.array(z.strictObject({
+            shipId: idSchema('ship'),
+            harness: harnessSchema,
+            /** When the ship's folder was made on the machine: tells two folders of one ship apart. */
+            folderMadeAt: z.iso.datetime(),
+            /** The subscription or API key the ship ran on; null while the trierarch names none. */
+            login: z.string().min(1).nullable(),
+            models: z.array(modelHourUsageSchema),
+        })),
+    })),
+    subscriptions: z.array(subscriptionReadingSchema),
+    /** When the trierarch read it (ISO 8601 in UTC). */
+    readAt: z.iso.datetime(),
+});
+//# sourceMappingURL=usage-message.js.map

package/dist/trierarch/usage-message.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"usage-message.js","sourceRoot":"","sources":["../../src/trierarch/usage-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAEhE,sFAAsF;AACtF,MAAM,CAAC,MAAM,4BAA4B,GAAG,6CAA6C,CAAC;AAE1F;;;GAGG;AACH,MAAM,aAAa,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;IACtD,MAAM,EAAE,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3B,OAAO,EAAE,CAAC,aAAa,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,aAAa,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;AAC/F,CAAC,EAAE,2BAA2B,CAAC,CAAC;AAEhC,MAAM,gBAAgB,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC;AAC/C,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,CAAC;AAE5C;;;;GAIG;AACH,MAAM,oBAAoB,GAAG,CAAC,CAAC,YAAY,CAAC;IAC1C,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,MAAM,EAAE,CAAC,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC;IACxI,gBAAgB,EAAE,CAAC,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC,QAAQ,EAAE;CACtI,CAAC,CAAC;AAEH;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,YAAY,CAAC;IACxD,KAAK,EAAE,CAAC,CAAC,KAAK,CACZ,CAAC,CAAC,YAAY,CAAC;QACb,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,CAAC,CAAC,KAAK,CACZ,CAAC,CAAC,YAAY,CAAC;YACb,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC;YACxB,OAAO,EAAE,aAAa;YACtB,2FAA2F;YAC3F,YAAY,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC9B,wFAAwF;YACxF,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;YACnC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC;SACtC,CAAC,CACH;KACF,CAAC,CACH;IACD,aAAa,EAAE,CAAC,CAAC,KAAK,CAAC,yBAAyB,CAAC;IACjD,oDAAoD;IACpD,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE;CACzB,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeolus-fleet/common",
-  "version": "0.32.4",
+  "version": "0.34.0",
   "description": "Shared schemas and ids for Aeolus packages, and the header every Aeolus web app shows.",
   "keywords": [
     "aeolus"