@aeolus-fleet/trierarch 0.17.3 → 0.19.0

package/dist/core/entry.d.ts

@@ -1,32 +1,36 @@
-import type { ShipId, TrierarchEntryState, TrierarchWorkspace } from '@aeolus-fleet/common';
+import type { ShipId, TrierarchWorkspace } from '@aeolus-fleet/common';
 /**
- * The trierarch's saved state (docs/trierarch.md): the wanted list by ship id,
- * the messages it applied with the answers it sent for them, the worktrees it
- * kept, and the orphans it found. Plain data, saved whole as JSON, never a
- * secret: a session's crew token lives only in its folder's identity file.
+ * The trierarch's saved state (docs/trierarch.md): an entry per ship it
+ * crews, by ship id, the worktrees it kept, the orphans it found, and the
+ * settings versions it told argo it cannot crew. Plain data, saved whole as
+ * JSON, never a secret: a session's crew token lives only in its folder's
+ * identity file. The crew requests themselves live in the fleet.
  */
 export interface TrierarchState {
     readonly entries: Readonly<Record<string, Entry>>;
-    /** Each applied message's answers, by message id, so a message applied before changes nothing. */
-    readonly applied: Readonly<Record<string, readonly Outgoing[]>>;
     readonly kept: readonly KeptWorktree[];
     readonly orphans: readonly string[];
+    /** By ship id: the settings version argo was told this trierarch cannot crew, so it is told once. */
+    readonly refused: Readonly<Record<string, number>>;
 }
-/** One ship the trierarch keeps crewed, with the settings its want gave. */
+/** Where an entry stands: the crew statuses the trierarch writes, and releasing while it ends. */
+export declare const ENTRY_STATES: readonly ["crewing", "running", "restarting", "crashed", "releasing"];
+export type EntryState = (typeof ENTRY_STATES)[number];
+/** One ship the trierarch crews, from the crew request assigned to it, with the settings of the version it crewed. */
 export interface Entry {
     readonly shipId: ShipId;
     /** The ship's name, from the fleet when it is crewed: its session is named after it. */
     readonly shipName?: string;
+    /** The settings version this entry crews with: a new one crews the ship again. */
+    readonly settingsVersion: number;
     readonly harness: string;
     readonly workspace: TrierarchWorkspace;
     readonly squadron?: string;
     /** Given on the first start only. */
     readonly firstPrompt?: string;
-    /** Option name to value name, as the want picked them. */
+    /** Option name to value name, as the settings picked them. */
     readonly options: Readonly<Record<string, string>>;
-    /** The ship that sent the want: notices go to it. */
-    readonly requester: ShipId;
-    readonly state: TrierarchEntryState;
+    readonly state: EntryState;
     /** When the entry took its state, ISO 8601. */
     readonly since: string;
     /** When its session exited within the restart window, oldest first, ISO 8601. */
@@ -36,37 +40,21 @@ export interface Entry {
     /** Where its workspace is, once made. */
     readonly folder?: string;
     readonly hasStarted: boolean;
-    /** The release a message asked for, answered once the ship is released. */
-    readonly release?: {
-        readonly messageId: string;
-        readonly sender: ShipId;
-        readonly isForced: boolean;
-    };
     /** The inbox count last seen, and whether a wake waits for the session to turn idle. */
     readonly wake: {
         readonly waiting: number;
         readonly isPending: boolean;
     };
 }
-/** A worktree kept because it had changes, until a human or a release with force clears it. */
+/** A worktree kept because it had changes, until a human clears it. */
 export interface KeptWorktree {
     readonly shipId: ShipId;
     readonly path: string;
 }
-/** A message the trierarch sends: an answer in reply to a command, or a notice. */
-export interface Outgoing {
-    readonly to: ShipId;
-    readonly inReplyTo?: string;
-    /** The protocol name, such as `wanted`: its content type is `trierarchContentType(name)`. */
-    readonly name: string;
-    readonly payload: Readonly<Record<string, unknown>>;
-    /** The same each time this message is sent again, so the fleet stores it once. */
-    readonly idempotencyKey: string;
-}
 export declare const EMPTY_STATE: TrierarchState;
 /** The entry in a new state since now. */
 export declare function withState(entry: Entry, change: {
-    state: TrierarchEntryState;
+    state: EntryState;
     now: Date;
 }): Entry;
 /** The state with one entry put in, or replaced. */

package/dist/core/entry.js

@@ -1,4 +1,6 @@
-export const EMPTY_STATE = { entries: {}, applied: {}, kept: [], orphans: [] };
+/** Where an entry stands: the crew statuses the trierarch writes, and releasing while it ends. */
+export const ENTRY_STATES = ['crewing', 'running', 'restarting', 'crashed', 'releasing'];
+export const EMPTY_STATE = { entries: {}, kept: [], orphans: [], refused: {} };
 /** The entry in a new state since now. */
 export function withState(entry, change) {
     return { ...entry, state: change.state, since: change.now.toISOString() };

package/dist/core/entry.js.map

@@ -1 +1 @@
-{"version":3,"file":"entry.js","sourceRoot":"","sources":["../../src/core/entry.ts"],"names":[],"mappings":"AA+DA,MAAM,CAAC,MAAM,WAAW,GAAmB,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;AAE/F,0CAA0C;AAC1C,MAAM,UAAU,SAAS,CAAC,KAAY,EAAE,MAAiD;IACvF,OAAO,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC;AAC5E,CAAC;AAED,oDAAoD;AACpD,MAAM,UAAU,QAAQ,CAAC,KAAqB,EAAE,KAAY;IAC1D,OAAO,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;AAC5E,CAAC;AAED,0CAA0C;AAC1C,MAAM,UAAU,WAAW,CAAC,KAAqB,EAAE,MAAc;IAC/D,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC;IAClG,OAAO,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,CAAC;AAC/B,CAAC"}
+{"version":3,"file":"entry.js","sourceRoot":"","sources":["../../src/core/entry.ts"],"names":[],"mappings":"AAiBA,kGAAkG;AAClG,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,CAAU,CAAC;AAsClG,MAAM,CAAC,MAAM,WAAW,GAAmB,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;AAE/F,0CAA0C;AAC1C,MAAM,UAAU,SAAS,CAAC,KAAY,EAAE,MAAwC;IAC9E,OAAO,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC;AAC5E,CAAC;AAED,oDAAoD;AACpD,MAAM,UAAU,QAAQ,CAAC,KAAqB,EAAE,KAAY;IAC1D,OAAO,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;AAC5E,CAAC;AAED,0CAA0C;AAC1C,MAAM,UAAU,WAAW,CAAC,KAAqB,EAAE,MAAc;IAC/D,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC;IAClG,OAAO,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,CAAC;AAC/B,CAAC"}

package/dist/core/handle-delivery.d.ts

@@ -1,19 +1,14 @@
-import type { Delivery, FleetPort, Logger, StatePort, TrierarchSetup, WorkspacePort } from './ports.js';
-import type { Clock } from './shared/clock.js';
+import type { Delivery, FleetPort, Logger } from './ports.js';
 /**
- * Use case: a command arrives at the trierarch's ship (docs/trierarch.md).
- * Messages only edit the wanted list; the loop does the rest. The edit and
- * the answers are saved before the ack, so a stop between them loses
- * nothing, and a message applied before changes nothing: its answers are sent
- * again, under the same idempotency keys.
+ * Use case: a message arrives at the trierarch's own ship. Its ship stays a
+ * normal ship (docs/trierarch.md): a ping gets pong. A trierarch takes work
+ * only through the crew requests assigned to it, never from a message, so
+ * any other delivery is acknowledged, logged as not handled, and acted on
+ * never: no ship can start or stop a session on the machine by messaging it
+ * (#301).
  */
 export type HandleDelivery = (delivery: Delivery) => Promise<void>;
-export interface HandleDeliveryDeps {
+export declare function createHandleDelivery(deps: {
     fleet: FleetPort;
-    workspace: WorkspacePort;
-    state: StatePort;
-    setup: TrierarchSetup;
-    clock: Clock;
     logger: Logger;
-}
-export declare function createHandleDelivery(deps: HandleDeliveryDeps): HandleDelivery;
+}): HandleDelivery;

package/dist/core/handle-delivery.js

@@ -1,141 +1,12 @@
-import { idSchema, releaseCommandSchema } from '@aeolus-fleet/common';
-import { z } from 'zod';
-import { describedOf, listedOf } from './answers.js';
-import { checkWant, fieldOf, newEntry } from './check-want.js';
-import { putEntry, removeEntry, withState } from './entry.js';
-const CONTENT_TYPE = /^application\/vnd\.aeolus\.trierarch\.(\w+)\+json$/;
-const shipIdOnly = z.looseObject({ shipId: idSchema('ship') });
+import { isPingContentType } from '@aeolus-fleet/common';
 export function createHandleDelivery(deps) {
     return async (delivery) => {
-        const state = await deps.state.load();
-        const before = state.applied[delivery.messageId];
-        if (before !== undefined) {
-            await deps.fleet.ack(delivery.deliveryId);
-            await Promise.all(before.map((answer) => deps.fleet.send(answer)));
+        if (isPingContentType(delivery.contentType)) {
+            await deps.fleet.pong(delivery.deliveryId);
             return;
         }
-        const { state: next, answers } = await apply(state, { delivery, deps });
-        await deps.state.save({ ...next, applied: { ...next.applied, [delivery.messageId]: answers } });
         await deps.fleet.ack(delivery.deliveryId);
-        for (const answer of answers) {
-            await deps.fleet.send(answer);
-        }
+        deps.logger.warn(`Not handled: ${delivery.contentType} from ${delivery.senderShipId}. A trierarch takes work only through the crew requests assigned to it.`);
     };
 }
-async function apply(state, context) {
-    const { delivery, deps } = context;
-    const name = CONTENT_TYPE.exec(delivery.contentType)?.[1] ?? '';
-    const payload = parsedJson(delivery.payload);
-    const answer = answerTo(delivery);
-    switch (name) {
-        case 'describe':
-            return { state, answers: [answer('described', describedOf(deps.setup, state))] };
-        case 'list':
-            return { state, answers: [answer('listed', listedOf(state))] };
-        case 'want':
-            return want(state, { payload, context });
-        case 'release':
-            return release(state, { payload, context });
-        default:
-            deps.logger.warn(`A message the trierarch does not read: ${delivery.contentType}, from ${delivery.senderShipId}`);
-            return { state, answers: [] };
-    }
-}
-/** The payload as JSON, or undefined when it is none: the schemas then refuse it. */
-function parsedJson(payload) {
-    try {
-        const parsed = JSON.parse(payload);
-        return parsed;
-    }
-    catch {
-        return undefined;
-    }
-}
-function answerTo(delivery) {
-    return (name, payload) => ({
-        to: delivery.senderShipId,
-        inReplyTo: delivery.messageId,
-        name,
-        payload,
-        idempotencyKey: `trierarch:${delivery.messageId}:${name}`,
-    });
-}
-function refused(context, refusal) {
-    return answerTo(context.delivery)('refused', {
-        shipId: refusal.shipId,
-        ...(refusal.field !== undefined && { field: refusal.field }),
-        reason: refusal.reason,
-    });
-}
-/** A command whose ship id does not parse cannot be answered: refused names a ship. */
-function unanswerable(state, context) {
-    context.deps.logger.warn(`A command with no ship id the trierarch can answer, from ${context.delivery.senderShipId}`);
-    return { state, answers: [] };
-}
-async function want(state, at) {
-    const { payload, context } = at;
-    const { deps, delivery } = context;
-    const target = shipIdOnly.safeParse(payload);
-    if (!target.success) {
-        return unanswerable(state, context);
-    }
-    const { shipId } = target.data;
-    const existing = state.entries[shipId];
-    if (existing !== undefined && existing.state !== 'crashed') {
-        return { state, answers: [refused(context, { shipId, field: 'shipId', reason: `${shipId} is on the wanted list already` })] };
-    }
-    const checked = checkWant(payload, { configuration: deps.setup.configuration, state: removeEntry(state, shipId) });
-    if (!checked.isOk) {
-        return { state, answers: [refused(context, { shipId, ...checked.error })] };
-    }
-    const now = deps.clock.now();
-    const entry = newEntry(checked.value, { requester: delivery.senderShipId, now });
-    const wanted = answerTo(delivery)('wanted', { shipId });
-    if (existing !== undefined) {
-        // Wanted again after it crashed: its session starts again in its folder, with its lease still held.
-        const again = { ...entry, state: 'running', hasStarted: existing.hasStarted, ...(existing.folder !== undefined && { folder: existing.folder }) };
-        return { state: putEntry(state, again), answers: [wanted] };
-    }
-    const ship = await deps.fleet.ship(shipId);
-    switch (ship.kind) {
-        case 'notFound':
-            return { state, answers: [refused(context, { shipId, field: 'shipId', reason: `The fleet has no ship ${shipId}` })] };
-        case 'retired':
-            return { state, answers: [refused(context, { shipId, field: 'shipId', reason: `${shipId} is retired` })] };
-        case 'crewed':
-            return { state, answers: [refused(context, { shipId, field: 'shipId', reason: `${ship.name} is crewed by another session` })] };
-        case 'awaitingCrew':
-            return { state: putEntry(state, entry), answers: [wanted] };
-    }
-}
-async function release(state, at) {
-    const { payload, context } = at;
-    const { deps, delivery } = context;
-    const parsed = releaseCommandSchema.safeParse(payload);
-    if (!parsed.success) {
-        const target = shipIdOnly.safeParse(payload);
-        if (!target.success) {
-            return unanswerable(state, context);
-        }
-        const [issue] = parsed.error.issues;
-        return { state, answers: [refused(context, { shipId: target.data.shipId, ...fieldOf(issue?.path), reason: issue?.message ?? 'The release does not parse' })] };
-    }
-    const { shipId, force = false } = parsed.data;
-    const entry = state.entries[shipId];
-    if (entry !== undefined) {
-        const releasing = { ...withState(entry, { state: 'releasing', now: deps.clock.now() }), release: { messageId: delivery.messageId, sender: delivery.senderShipId, isForced: force } };
-        return { state: putEntry(state, releasing), answers: [] };
-    }
-    const kept = state.kept.find((each) => each.shipId === shipId);
-    if (kept === undefined) {
-        return { state, answers: [refused(context, { shipId, field: 'shipId', reason: `${shipId} is not on the wanted list` })] };
-    }
-    const answer = answerTo(delivery);
-    if (!force) {
-        return { state, answers: [answer('released', { shipId, workspace: 'kept', path: kept.path })] };
-    }
-    // A release with force clears a kept worktree.
-    await deps.workspace.remove(kept.path);
-    return { state: { ...state, kept: state.kept.filter((each) => each !== kept) }, answers: [answer('released', { shipId, workspace: 'removed' })] };
-}
 //# sourceMappingURL=handle-delivery.js.map

package/dist/core/handle-delivery.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-delivery.js","sourceRoot":"","sources":["../../src/core/handle-delivery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handle-delivery.js","sourceRoot":"","sources":["../../src/core/handle-delivery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAczD,MAAM,UAAU,oBAAoB,CAAC,IAA0C;IAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,EAAE;QACxB,IAAI,iBAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YAC5C,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAC3C,OAAO;QACT,CAAC;QACD,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,QAAQ,CAAC,WAAW,SAAS,QAAQ,CAAC,YAAY,yEAAyE,CAAC,CAAC;IAChK,CAAC,CAAC;AACJ,CAAC"}

package/dist/core/options-schema.d.ts

@@ -0,0 +1,7 @@
+import type { TrierarchConfiguration, TrierarchReportDetails } from '@aeolus-fleet/common';
+/**
+ * A harness's options as a JSON Schema, as the trierarch's report details
+ * give it (docs/trierarch.md, "What a trierarch reports"): each option one of
+ * its value names, with its default when it has one.
+ */
+export declare function optionsSchemaOf(harness: TrierarchConfiguration['harnesses'][string]): TrierarchReportDetails['harnesses'][number]['options'];

package/dist/core/options-schema.js

@@ -0,0 +1,10 @@
+/**
+ * A harness's options as a JSON Schema, as the trierarch's report details
+ * give it (docs/trierarch.md, "What a trierarch reports"): each option one of
+ * its value names, with its default when it has one.
+ */
+export function optionsSchemaOf(harness) {
+    const properties = Object.fromEntries(Object.entries(harness.options).map(([name, option]) => [name, { enum: Object.keys(option.values), ...(option.default !== undefined && { default: option.default }) }]));
+    return { type: 'object', properties, additionalProperties: false };
+}
+//# sourceMappingURL=options-schema.js.map

package/dist/core/options-schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"options-schema.js","sourceRoot":"","sources":["../../src/core/options-schema.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,OAAoD;IAClF,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CACnC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CACxK,CAAC;IACF,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC;AACrE,CAAC"}

package/dist/core/ports.d.ts

@@ -1,12 +1,13 @@
-import type { ShipId, TrierarchConfiguration, TrierarchWorkspace } from '@aeolus-fleet/common';
-import type { Outgoing, TrierarchState } from './entry.js';
+import type { CrewStatus, ShipId, TrierarchConfiguration, TrierarchReportDetails, TrierarchWorkspace } from '@aeolus-fleet/common';
+import type { TrierarchState } from './entry.js';
+import type { Action } from './reconciler.js';
 /**
  * The trierarch's ports (docs/architecture.md, "The trierarch"). Adapters
  * implement them in D2b: REST for the fleet, tmux for processes, git worktree
  * and folders for workspaces, Claude Code for the harness, a JSON file for
  * state. Each throws only for a system failure.
  */
-/** Where a ship stands in the fleet, as `fleet.ship` answers the trierarch (fleet:crew). */
+/** Where a ship stands in the fleet, as `fleet.ship` answers the trierarch (crew:run, for a ship assigned to it). */
 export type FleetShipStatus = {
     readonly kind: 'awaitingCrew';
     readonly name: string;
@@ -33,9 +34,32 @@ export type InboxAnswer = {
 } | {
     readonly kind: 'leaseEnded';
 };
+/** A crew request assigned to the trierarch's ship, as `fleet.assignedCrewRequests` answers: its settings unread. */
+export interface AssignedRequest {
+    readonly shipId: ShipId;
+    readonly settings: unknown;
+    readonly settingsVersion: number;
+    /** How the trierarch last said the crew stands; releasing once the requester removed it; null until any. */
+    readonly status: CrewStatus | null;
+}
+/** A plain-text report to argo, the operator, stored once under its idempotency key. */
+export interface ArgoReport {
+    readonly text: string;
+    readonly idempotencyKey: string;
+}
+/**
+ * The fleet as the trierarch's own ship calls it, with `crew:run`: it reaches
+ * only the ships whose crew requests are assigned to it (decision 0029).
+ */
 export interface FleetPort {
     /** The fleet's URL, written into each session's identity. */
     readonly url: string;
+    /** The crew requests assigned to the trierarch's ship, oldest ship first. */
+    assignedRequests(): Promise<readonly AssignedRequest[]>;
+    /** Says how its crew of an assigned ship stands. */
+    writeStatus(shipId: ShipId, status: CrewStatus): Promise<void>;
+    /** Confirms it released the ship of a releasing request, which then goes. */
+    confirmRelease(shipId: ShipId): Promise<void>;
     ship(shipId: ShipId): Promise<FleetShipStatus>;
     /** A new starting prompt's secret; the trierarch keeps it only until it registers. */
     getStartingPrompt(shipId: ShipId): Promise<{
@@ -51,7 +75,10 @@ export interface FleetPort {
     release(shipId: ShipId): Promise<void>;
     /** Acknowledges a delivery to the trierarch's own ship. */
     ack(deliveryId: string): Promise<void>;
-    send(message: Outgoing): Promise<void>;
+    /** Answers a ping to the trierarch's own ship. */
+    pong(deliveryId: string): Promise<void>;
+    /** Sends argo a report, as the trierarch's own ship. */
+    reportToArgo(report: ArgoReport): Promise<void>;
     /** A session's inbox, asked with its crew token. */
     inbox(crewToken: string): Promise<InboxAnswer>;
     /** Reports on a ship's behalf, with its session's crew token. */
@@ -60,6 +87,14 @@ export interface FleetPort {
         state: 'blocked' | 'working';
         note: string;
     }): Promise<void>;
+    /** Reports as the trierarch's own ship: what it does, and its details. */
+    reportSelf(report: SelfReport): Promise<void>;
+}
+/** The trierarch's own report: idle or working, how many sessions run, and its details (docs/trierarch.md). */
+export interface SelfReport {
+    readonly state: 'idle' | 'working';
+    readonly note: string;
+    readonly details: TrierarchReportDetails;
 }
 /** What a session's folder identity holds for the trierarch: written through the aeolus plugin, never a copy of it. */
 export interface Identity {
@@ -80,7 +115,7 @@ export interface HarnessPort {
     /** The crew token of the folder's identity, when there is one. */
     crewTokenOf(folder: string): Promise<string | undefined>;
     removeIdentity(folder: string): Promise<void>;
-    /** Starts the harness in the folder: the first start with the want's first prompt, later ones continuing. */
+    /** Starts the harness in the folder: the first start with the settings' first prompt, later ones continuing. */
     launch(session: {
         shipId: ShipId;
         /** With the workspace, what the session is named after where the harness names one. */
@@ -130,11 +165,30 @@ export interface StatePort {
     load(): Promise<TrierarchState>;
     save(state: TrierarchState): Promise<void>;
 }
+/** What the loop did for a ship, and how it came out: one line of the trierarch's log (aeolus-trierarch logs). */
+export interface LoggedAction {
+    readonly time: Date;
+    readonly shipId: ShipId;
+    /** Known once the ship was first crewed. */
+    readonly shipName?: string;
+    /** What the loop did for the ship: an action it carried out, or leave when another session crews the ship. */
+    readonly action: Exclude<Action['kind'], 'argo' | 'status' | 'refuse'> | 'leave';
+    readonly outcome: string;
+    /** For a failure: what happens next, and where to look. */
+    readonly next?: string;
+}
 export interface Logger {
     warn(message: string): void;
+    action(logged: LoggedAction): void;
+}
+/** A flag a harness adapter adds itself, as mechanism, never the operator's: on every launch or on a restart only. */
+export interface AdapterFlag {
+    readonly flag: string;
+    readonly when: 'always' | 'restart';
 }
-/** What describe answers beside the configuration: the trierarch's version. */
+/** The trierarch's configuration, its version, and the flags each harness's adapter adds itself. */
 export interface TrierarchSetup {
     readonly configuration: TrierarchConfiguration;
     readonly version: string;
+    readonly adapterFlags: Readonly<Record<string, readonly AdapterFlag[]>>;
 }

package/dist/core/reconciler.d.ts

@@ -1,11 +1,13 @@
-import type { ShipId, TrierarchConfiguration } from '@aeolus-fleet/common';
-import { type Outgoing, type TrierarchState } from './entry.js';
-import type { InboxAnswer, ObservedSession, ObservedWorktree, Turn } from './ports.js';
+import type { CrewStatus, ShipId, TrierarchConfiguration } from '@aeolus-fleet/common';
+import { type Refusal } from './check-settings.js';
+import { type Entry, type TrierarchState } from './entry.js';
+import type { ArgoReport, AssignedRequest, InboxAnswer, ObservedSession, ObservedWorktree, Turn } from './ports.js';
 /**
  * The Reconciler (docs/architecture.md, "The trierarch"): a pure function
- * from the wanted list, what runs and the time to the actions that make them
- * match, and the state those actions start from. It is the only place that
- * decides; the run pass only carries the actions out.
+ * from the crew requests assigned to the trierarch, its saved state, what
+ * runs and the time to the actions that make them match, and the state those
+ * actions start from. It is the only place that decides; the run pass only
+ * carries the actions out.
  */
 /** What the trierarch saw this pass. */
 export interface Observed {
@@ -18,7 +20,7 @@ export interface Observed {
     }>>;
 }
 export type Action = 
-/** Crew the ship: starting prompt, register, workspace, identity, launch. Resumed when a stop mid-crew left it crewing. */
+/** Crew the ship: starting prompt, register, workspace, identity, launch. Resumed while its own lease may still hold the ship. */
 {
     readonly kind: 'crew';
     readonly shipId: ShipId;
@@ -35,24 +37,41 @@ export type Action =
     readonly kind: 'wake';
     readonly shipId: ShipId;
 }
-/** Release asked by a message: stop, end the lease, the workspace, answer released. */
+/** Its request was removed: stop, end the lease, the workspace, then confirm. */
  | {
     readonly kind: 'release';
     readonly shipId: ShipId;
 }
-/** The lease ended elsewhere (released, re-crewed or retired): stop, the workspace, notify leaseEnded. */
+/** A removed request it does not crew: confirm alone. */
  | {
-    readonly kind: 'drop';
+    readonly kind: 'confirm';
     readonly shipId: ShipId;
+}
+/** Its request is no longer assigned here: stop, remove the identity of the entry it was; the worktree stays as an orphan. */
+ | {
+    readonly kind: 'forget';
+    readonly shipId: ShipId;
+    readonly entry: Entry;
 } | {
-    readonly kind: 'notify';
-    readonly message: Outgoing;
+    readonly kind: 'status';
+    readonly shipId: ShipId;
+    readonly status: CrewStatus;
 }
 /** Report on the ship's behalf, with its session's crew token. */
  | {
     readonly kind: 'report';
     readonly shipId: ShipId;
     readonly note: string;
+}
+/** Tell argo it cannot crew this settings version. */
+ | {
+    readonly kind: 'refuse';
+    readonly shipId: ShipId;
+    readonly settingsVersion: number;
+    readonly refusal: Refusal;
+} | {
+    readonly kind: 'argo';
+    readonly report: ArgoReport;
 };
 export interface Reconciled {
     readonly state: TrierarchState;
@@ -60,6 +79,7 @@ export interface Reconciled {
 }
 /** What reconciling needs beside the state and what was seen. */
 export interface ReconcileContext {
+    readonly requests: readonly AssignedRequest[];
     readonly observed: Observed;
     readonly now: Date;
     readonly configuration: TrierarchConfiguration;