@astrosheep/keiyaku 4.5.29 → 4.6.2

package/build/src/identity/normalize.js

@@ -15,19 +15,29 @@ export function validateAkumaName(value) {
     }
     return value;
 }
+// A pending separator run is a dot only while every grapheme in it is one;
+// any other separator grapheme demotes the whole run to a dash.
+function extendSeparatorRun(run, segment) {
+    if (segment !== ".")
+        return "dash";
+    return run === "none" ? "dot" : run;
+}
 export function normalizeIdentityStem(input) {
     const source = input.source.normalize("NFKC").toLowerCase().normalize("NFKC");
     let result = "";
-    let separator = false;
+    let separator = "none";
     for (const segment of graphemes(source)) {
         if (!WORD_GRAPHEME.test(segment) && !EMOJI_GRAPHEME.test(segment)) {
-            separator ||= result.length > 0;
+            if (result.length > 0)
+                separator = extendSeparatorRun(separator, segment);
             continue;
         }
-        if (separator)
+        if (separator === "dot")
+            result += ".";
+        else if (separator === "dash")
             result += "-";
         result += segment;
-        separator = false;
+        separator = "none";
     }
     return result;
 }
@@ -36,7 +46,9 @@ export function fitIdentityStemWords(input) {
         throw new Error("identity stem code point budget must be a positive safe integer");
     }
     const words = input.stem.split("-");
-    let fitted = truncateGraphemes(words[0], input.maxCodePoints);
+    // Strip before counting: a truncated head must not glue its dangling dot to
+    // the next word's dash.
+    let fitted = truncateGraphemes(words[0], input.maxCodePoints).replace(/[-.]+$/u, "");
     let count = [...fitted].length;
     for (const word of words.slice(1)) {
         const candidate = count + 1 + [...word].length;
@@ -45,6 +57,7 @@ export function fitIdentityStemWords(input) {
         fitted += `-${word}`;
         count = candidate;
     }
+    fitted = fitted.replace(/[-.]+$/u, "");
     if (fitted.length === 0)
         throw new Error("identity stem is empty after fitting");
     return fitted;
@@ -78,7 +91,7 @@ export function fitIdentityStem(input) {
             break;
         stem += segment;
     }
-    stem = stem.replace(/-+$/u, "");
+    stem = stem.replace(/[-.]+$/u, "");
     if (stem.length === 0)
         throw new Error("identity stem is empty after fitting");
     return stem + suffix;

package/build/src/index.d.ts

@@ -1,10 +1,81 @@
-export * from "./library/keiyaku.js";
-export * from "./library/akumas.js";
-export { Akuma, Schema, ALLOWED_ACTIONS, AkumaBusyError, AkumaDecodeError, AkumaNotBornError, AkumaProviderError, } from "./akuma/index.js";
-export type { AkumaBirthInput, AkumaHistoryOptions, AkumaIdleOptions, AkumaIdleResult, AkumaSignalOptions, AkumaTellOptions, InterruptReceipt, KillEvidence, JsonSchema, JsonSchemaDocument, StandardSchemaV1, SchemaLike, AkuId, AkumaStatus, ActivityHistory, ActivityRow, AllowedAction, AllowedActions, } from "./akuma/index.js";
-export { settings } from "./settings.js";
+/**
+ * The package root: the curated Contract, Akuma, Akumas, Task, Kanshi, World,
+ * Settings, and Plugin surfaces. Internal composition, execution, and
+ * configuration helpers stay off this entry; only CLI and Body import them.
+ */
+/**
+ * The package root: the curated Contract, Akuma, Akumas, Task, Kanshi, World,
+ * Settings, and Plugin surfaces. Internal composition, execution, and
+ * configuration helpers stay off this entry; only CLI and Body import them.
+ */
+export { AuthorityCorruptionError } from "./core/facts/errors.js";
+/**
+ * The package root: the curated Contract, Akuma, Akumas, Task, Kanshi, World,
+ * Settings, and Plugin surfaces. Internal composition, execution, and
+ * configuration helpers stay off this entry; only CLI and Body import them.
+ */
+export { Delivery } from "./library/delivery.js";
+/**
+ * The package root: the curated Contract, Akuma, Akumas, Task, Kanshi, World,
+ * Settings, and Plugin surfaces. Internal composition, execution, and
+ * configuration helpers stay off this entry; only CLI and Body import them.
+ */
+export { Keiyaku } from "./library/keiyaku.js";
+/**
+ * The package root: the curated Contract, Akuma, Akumas, Task, Kanshi, World,
+ * Settings, and Plugin surfaces. Internal composition, execution, and
+ * configuration helpers stay off this entry; only CLI and Body import them.
+ */
+export { KeiyakuError } from "./library/outcome.js";
+/**
+ * The package root: the curated Contract, Akuma, Akumas, Task, Kanshi, World,
+ * Settings, and Plugin surfaces. Internal composition, execution, and
+ * configuration helpers stay off this entry; only CLI and Body import them.
+ */
+export { NoGitWorldError, Repo } from "./library/repo.js";
+/**
+ * The package root: the curated Contract, Akuma, Akumas, Task, Kanshi, World,
+ * Settings, and Plugin surfaces. Internal composition, execution, and
+ * configuration helpers stay off this entry; only CLI and Body import them.
+ */
+export { actorId } from "./core/facts/types.js";
+/**
+ * The package root: the curated Contract, Akuma, Akumas, Task, Kanshi, World,
+ * Settings, and Plugin surfaces. Internal composition, execution, and
+ * configuration helpers stay off this entry; only CLI and Body import them.
+ */
 export { z } from "zod";
+export { ALLOWED_ACTIONS, Akuma, AkumaBusyError, AkumaDecodeError, AkumaNotBornError, AkumaProviderError, Schema, } from "./akuma/index.js";
+export type { ActivityHistory, ActivityRow, AkuId, AkumaAskObservation, AkumaAskOptions, AkumaAskResult, AkumaBirthInput, AkumaHistoryOptions, AkumaIdleOptions, AkumaIdleResult, AkumaSignalOptions, AkumaStatus, AkumaTellOptions, AkumaTellResult, AllowedAction, AllowedActions, InterruptReceipt, JsonSchema, JsonSchemaDocument, KillEvidence, SchemaLike, StandardSchemaV1, } from "./akuma/index.js";
+export type { ActorId, ChangeId, ContractHead, ContractId, ContractState, JournalEntry as Fact, FactKind, SnapshotId, } from "./core/facts/types.js";
+export { kanshi, observeKanshi, selectKanshi, selectRegion } from "./kanshi/index.js";
+export type { AkumaKanshiRow, AkumaKanshiWorld, ContractEndpointObservation, ContractHolderObservation, ContractKanshiBoard, ContractKanshiRow, KanshiInput, KanshiRegionSelection, KanshiReport, KanshiSelection, RegionDeclaration, RegionRead, Section, TaskKanshiRow, TaskKanshiWorld, } from "./kanshi/index.js";
+export { AkumaAddressError, AkumaWorldScopeError, Akumas } from "./library/akumas.js";
+export type { AkumaAddressInput, AkumaAskInput, AkumaHistoryInput, AkumaHistoryResult, AkumaKillInput, AkumaKillResult, AkumaList, AkumaListInput, AkumaObservation, AkumaObservationStage, AkumaTellInput, AkumaWaitInput, AkumaWaitResult, AkumaWorldScopeRefusal, CallInput, CallResult, CallWaitHead, CreatedTaskObservation, DispatchAssociation, DispatchStage, ForkInput, ForkResult, TellResult, TellWake, WaitObservedAkuma, WaitObserver, WaitSelectedAkuma, } from "./library/akumas.js";
+export type { ContinuationReport } from "./library/continuation.js";
+export type { KeiyakuLibrary, ReconcileInput } from "./library/contract-composition.js";
+export type { AbandonOutcome, AmendOutcome, ArcOutcome, AuditOutcome, BindOutcome, BindResult, DeliverOutcome, ReviewOutcome, } from "./library/contract-outcomes.js";
+export type { AbandonInput, AmendInput, ArcInput, BindInput, ContractHistory, ContractHistoryEvent, ContractList, ContractListInput, ContractObservationInput, DeliverInput, KeiyakuSelectInput, LocalContractComposition, ReviewInput, } from "./library/contract-types.js";
+export { nukeKeiyaku as nuke } from "./library/nuke.js";
+export type { NukeInput, NukeResult } from "./library/nuke.js";
+export type { InvocationEffect, KeiyakuErrorCategory, PartialOutcomeEnvelope, PendingSurface, ReconciliationLag, Review, } from "./library/outcome.js";
+export type { ReconcileCompletion, RepoContractReconcileReport, RepoReconcileReport } from "./library/reconcile.js";
+export type { KeiyakuRefusal, KeiyakuRetryReason, NukeConfirmationRefusal, NukeConfirmationRequiredRefusal, OperationRetries, } from "./library/refusal.js";
+export type { RegionOverlap } from "./library/region.js";
+export type { RepoAtInput } from "./library/repo.js";
+export type { KeiyakuPlugin, PluginBodyEnd, PluginContext, PluginHooks, PluginInstance, PluginManifest, PluginOutcome, PluginSignal, PluginSignalMap, } from "./plugin/public.js";
+export type { AuditReport } from "./protocol/audit.js";
+export type { IntegrationConflictMaterialized, VerificationReuse } from "./protocol/deliver.js";
+export type { ExecutionObservation, ExecutionObserver } from "./protocol/execution-observation.js";
+export type { PlacementStop, VerificationStop } from "./protocol/operations.js";
+export type { ExecutionCleanup, ExecutionStop } from "./protocol/progress.js";
+export type { ContractAfterEdge, ContractBoard, ContractCatalogue, ContractDependent, ContractDisposition, ContractGateCurrent, ContractGateReport, ContractObservation, ContractPhase, ContractRow, ContractWorkspaceObservation, } from "./protocol/read/status.js";
+export { SettingsError, settings } from "./settings.js";
+export type { Gate } from "./library/contract-types.js";
+export type { Settings, SettingsEntry, SettingsInput, SettingsNamespaceFailure, SettingsNamespaceView, SettingsScope, SettingsScopeState, } from "./settings.js";
+export type { SettlementAction, SettlementLag, SettlementReport } from "./settlement/settle.js";
+export type * from "./task/index.js";
+export { TASK_RELATION_PREDICATE_FIELDS, TaskAuthorityCorruptionError, Tasks } from "./task/index.js";
 export { World, WorldError } from "./world.js";
 export type { WorldResolution, WorldResolutionInput, WorldRoot } from "./world.js";
-export type { KeiyakuPlugin, PluginContext, PluginHooks, PluginInstance, PluginManifest, PluginBodyEnd, PluginOutcome, PluginSignal, PluginSignalMap, } from "./plugin/public.js";
-export type { Settings, SettingsEntry, SettingsInput, SettingsNamespaceFailure, SettingsNamespaceView, SettingsScope, SettingsScopeState, } from "./settings.js";
+export type { ReconcileReport, TopologyEffect } from "./library/reconcile.js";

package/build/src/index.js

@@ -1,6 +1,54 @@
-export * from "./library/keiyaku.js";
-export * from "./library/akumas.js";
-export { Akuma, Schema, ALLOWED_ACTIONS, AkumaBusyError, AkumaDecodeError, AkumaNotBornError, AkumaProviderError, } from "./akuma/index.js";
-export { settings } from "./settings.js";
+/**
+ * The package root: the curated Contract, Akuma, Akumas, Task, Kanshi, World,
+ * Settings, and Plugin surfaces. Internal composition, execution, and
+ * configuration helpers stay off this entry; only CLI and Body import them.
+ */
+/**
+ * The package root: the curated Contract, Akuma, Akumas, Task, Kanshi, World,
+ * Settings, and Plugin surfaces. Internal composition, execution, and
+ * configuration helpers stay off this entry; only CLI and Body import them.
+ */
+export { AuthorityCorruptionError } from "./core/facts/errors.js";
+/**
+ * The package root: the curated Contract, Akuma, Akumas, Task, Kanshi, World,
+ * Settings, and Plugin surfaces. Internal composition, execution, and
+ * configuration helpers stay off this entry; only CLI and Body import them.
+ */
+export { Delivery } from "./library/delivery.js";
+/**
+ * The package root: the curated Contract, Akuma, Akumas, Task, Kanshi, World,
+ * Settings, and Plugin surfaces. Internal composition, execution, and
+ * configuration helpers stay off this entry; only CLI and Body import them.
+ */
+export { Keiyaku } from "./library/keiyaku.js";
+/**
+ * The package root: the curated Contract, Akuma, Akumas, Task, Kanshi, World,
+ * Settings, and Plugin surfaces. Internal composition, execution, and
+ * configuration helpers stay off this entry; only CLI and Body import them.
+ */
+export { KeiyakuError } from "./library/outcome.js";
+/**
+ * The package root: the curated Contract, Akuma, Akumas, Task, Kanshi, World,
+ * Settings, and Plugin surfaces. Internal composition, execution, and
+ * configuration helpers stay off this entry; only CLI and Body import them.
+ */
+export { NoGitWorldError, Repo } from "./library/repo.js";
+/**
+ * The package root: the curated Contract, Akuma, Akumas, Task, Kanshi, World,
+ * Settings, and Plugin surfaces. Internal composition, execution, and
+ * configuration helpers stay off this entry; only CLI and Body import them.
+ */
+export { actorId } from "./core/facts/types.js";
+/**
+ * The package root: the curated Contract, Akuma, Akumas, Task, Kanshi, World,
+ * Settings, and Plugin surfaces. Internal composition, execution, and
+ * configuration helpers stay off this entry; only CLI and Body import them.
+ */
 export { z } from "zod";
+export { ALLOWED_ACTIONS, Akuma, AkumaBusyError, AkumaDecodeError, AkumaNotBornError, AkumaProviderError, Schema, } from "./akuma/index.js";
+export { kanshi, observeKanshi, selectKanshi, selectRegion } from "./kanshi/index.js";
+export { AkumaAddressError, AkumaWorldScopeError, Akumas } from "./library/akumas.js";
+export { nukeKeiyaku as nuke } from "./library/nuke.js";
+export { SettingsError, settings } from "./settings.js";
+export { TASK_RELATION_PREDICATE_FIELDS, TaskAuthorityCorruptionError, Tasks } from "./task/index.js";
 export { World, WorldError } from "./world.js";

package/build/src/kanshi/read.d.ts

@@ -1,8 +1,8 @@
-import { Repo } from "../library/repo.js";
-import type { ContractBoard } from "../library/contract.js";
 import { type AliasBinding } from "../alias/index.js";
-import type { KanshiReport, Section, KanshiRegionSelection } from "./report.js";
+import { Repo } from "../library/repo.js";
+import type { ContractBoard } from "../protocol/read/status.js";
 import type { WorldRoot } from "../world.js";
+import type { KanshiRegionSelection, KanshiReport, Section } from "./report.js";
 export type KanshiInput = Readonly<{
     world: WorldRoot | null;
     repo?: Repo;

package/build/src/kanshi/read.js

@@ -1,21 +1,21 @@
-import { Repo } from "../library/repo.js";
-import { scopeForRepo } from "../library/repo.js";
-import { observeTaskBoard } from "../task/operations.js";
-import { contractNamespace } from "../task/identity.js";
-import { readAkumaCatalog, readAkumaTimeline, withoutReportedChanges } from "../akuma/akuma.js";
+import { withoutReportedChanges } from "../akuma/projection.js";
+import { readAkumaRoster, readAkumaTimeline } from "../akuma/akuma.js";
 import { readAliases } from "../alias/index.js";
-import { readDispatchesAt } from "../dispatch/index.js";
-import { readTaskHolderProjectionAt } from "../settlement/holder.js";
-import { observeCurrentPhysicalIssue } from "../protocol/read/observation.js";
-import { readContractBoard, readContractCatalogue, readContractPhase } from "../protocol/read/status.js";
-import { withGitDecodeChannel, withGitReadObservation } from "../git/read-observation.js";
 import { decodeContractDocument } from "../body/decode.js";
 import { assertRegionPattern } from "../body/region.js";
-import { readDocuments } from "../protocol/read/documents.js";
 import { contractId } from "../core/facts/types.js";
-import { selectKanshi, selectRegion } from "./select.js";
-import { FLEET_SNAPSHOT_ROWS, FLEET_VISIBLE_ROWS } from "./fleet.js";
+import { readDispatchesAt } from "../dispatch/index.js";
+import { withGitDecodeChannel, withGitReadObservation } from "../git/read-observation.js";
+import { Repo, scopeForRepo } from "../library/repo.js";
+import { readDocuments } from "../protocol/read/documents.js";
+import { observeCurrentPhysicalIssue } from "../protocol/read/observation.js";
+import { readContractBoard, readContractCatalogue, readContractPhase } from "../protocol/read/status.js";
+import { readTaskHolderProjectionAt } from "../settlement/holder.js";
+import { contractNamespace } from "../task/identity.js";
 import { observeRecentTaskStatus, TaskAuthorityCorruptionError } from "../task/index.js";
+import { observeTaskBoard } from "../task/operations.js";
+import { ROSTER_SNAPSHOT_ROWS, ROSTER_VISIBLE_ROWS } from "./roster.js";
+import { selectKanshi, selectRegion } from "./select.js";
 function diagnostic(error) {
     let source;
     if (error instanceof Error)
@@ -149,7 +149,7 @@ async function readHolders(observation) {
         return { kind: "failed", failure: { message: diagnostic(error) } };
     }
 }
-function attachFleet(contracts, akuma) {
+function attachRoster(contracts, akuma) {
     if (contracts.kind !== "present")
         return contracts;
     const attachments = new Map();
@@ -166,7 +166,7 @@ function attachFleet(contracts, akuma) {
         kind: "present",
         value: {
             ...contracts.value,
-            rows: contracts.value.rows.map((row) => ({ ...row, fleet: attachments.get(row.id) ?? [] })),
+            rows: contracts.value.rows.map((row) => ({ ...row, roster: attachments.get(row.id) ?? [] })),
         },
     };
 }
@@ -183,14 +183,14 @@ function decorateContracts(contracts, holders, namespaceTasks) {
                     return {
                         ...row,
                         holder: { kind: "unavailable" },
-                        fleet: [],
+                        roster: [],
                         ...(selected === undefined ? {} : { namespaceTasks: selected }),
                     };
                 }
                 const holder = holders.kind === "present" ? holders.value.get(row.id) : undefined;
                 return {
                     ...row,
-                    fleet: [],
+                    roster: [],
                     ...(selected === undefined ? {} : { namespaceTasks: selected }),
                     holder: holder?.disposition === "held"
                         ? { kind: "held", taskId: holder.taskId }
@@ -263,7 +263,7 @@ async function readTasks(path, holders, observeContract) {
     }), (error) => ({ kind: "failed", failure: taskFailure(error) }));
 }
 /**
- * Placement discharge for the observed fleet snapshots: an associated Contract
+ * Placement discharge for the observed roster snapshots: an associated Contract
  * whose own observation proves it claimed has placed the candidate those
  * reported changes describe, so the composite report no longer presents them
  * as pending. An unproven or failed Contract read keeps the changes.
@@ -286,7 +286,7 @@ async function joinAkuma(path, observeContract, isContractClaimed, dispatches, a
     if (aliases.kind !== "present")
         return aliases;
     try {
-        const source = await readAkumaCatalog(path, { limit: FLEET_VISIBLE_ROWS });
+        const source = await readAkumaRoster(path, { limit: ROSTER_VISIBLE_ROWS });
         const aliasById = new Map();
         for (const binding of aliases.value)
             aliasById.set(binding.akuId, [...(aliasById.get(binding.akuId) ?? []), binding]);
@@ -306,7 +306,7 @@ async function joinAkuma(path, observeContract, isContractClaimed, dispatches, a
                     }),
             };
         });
-        const snapshotRows = rows.slice(0, FLEET_SNAPSHOT_ROWS);
+        const snapshotRows = rows.slice(0, ROSTER_SNAPSHOT_ROWS);
         const snapshots = new Map(await Promise.all(snapshotRows.map(async (row) => {
             try {
                 return [row.id, await readAkumaTimeline(path, row.id)];
@@ -399,7 +399,7 @@ async function observeRepo(input) {
                 root: world,
                 observedAt,
                 branch,
-                contracts: attachFleet(contracts, akuma),
+                contracts: attachRoster(contracts, akuma),
                 tasks,
                 akuma,
                 ...(regionSection === undefined ? {} : { region: regionSection }),

package/build/src/kanshi/report.d.ts

@@ -1,12 +1,13 @@
-import type { ContractBoard, ContractDisposition, ContractPhase } from "../library/contract.js";
-import type { TaskId, TaskRef, TaskRow } from "../task/index.js";
-import type { AkumaList, AkumaListRow, UnbornAkumaListRow, ActivitySnapshot } from "../akuma/akuma.js";
+import type { AkumaList, AkumaListRow, UnbornAkumaListRow } from "../akuma/akuma.js";
+import type { ActivitySnapshot } from "../akuma/projection.js";
+import type { BoundedList } from "../bounded-list.js";
 import type { AkumaAlias } from "../identity/selector.js";
-import type { WorldRoot } from "../world.js";
-import type { ContractId } from "../library/contract.js";
+import type { ContractId } from "../index.js";
 import type { RegionOverlap } from "../library/region.js";
 import type { CurrentPhysicalIssue } from "../protocol/read/observation.js";
-import type { BoundedList } from "../bounded-list.js";
+import type { ContractBoard, ContractDisposition, ContractPhase } from "../protocol/read/status.js";
+import type { TaskId, TaskRef, TaskRow } from "../task/index.js";
+import type { WorldRoot } from "../world.js";
 export type { RegionOverlap };
 export type Section<Value> = Readonly<{
     kind: "present";
@@ -29,14 +30,14 @@ export type ContractHolderObservation = Readonly<{
 }> | Readonly<{
     kind: "unavailable";
 }>;
-export type ContractFleetAttachment = Readonly<{
+export type ContractRosterAttachment = Readonly<{
     id: string;
     aliases: readonly AkumaAlias[];
 }>;
 export type ContractKanshiRow = ContractBoard["rows"][number] & Readonly<{
     phase: ContractPhase;
     holder: ContractHolderObservation;
-    fleet: readonly ContractFleetAttachment[];
+    roster: readonly ContractRosterAttachment[];
     namespaceTasks?: Section<readonly TaskRow[]>;
     issue?: CurrentPhysicalIssue;
 }>;

package/build/src/kanshi/roster.d.ts

@@ -0,0 +1,2 @@
+export declare const ROSTER_VISIBLE_ROWS = 10;
+export declare const ROSTER_SNAPSHOT_ROWS = 3;

package/build/src/kanshi/roster.js

@@ -0,0 +1,2 @@
+export const ROSTER_VISIBLE_ROWS = 10;
+export const ROSTER_SNAPSHOT_ROWS = 3;

package/build/src/kanshi/select.js

@@ -1,13 +1,17 @@
-import { regionsOverlap } from "../body/region.js";
+import { regionsOverlapWithRelation } from "../body/region.js";
 function regionOverlaps(mine, declarations) {
     const overlaps = [];
     for (const declaration of declarations) {
-        const pairs = regionsOverlap(mine, declaration.patterns);
+        const pairs = regionsOverlapWithRelation(mine, declaration.patterns);
         if (pairs.length === 0)
             continue;
         overlaps.push({
             contract: declaration.contract,
-            patterns: pairs.map(([minePattern, theirsPattern]) => ({ mine: minePattern, theirs: theirsPattern })),
+            patterns: pairs.map(([minePattern, theirsPattern, relation]) => ({
+                mine: minePattern,
+                theirs: theirsPattern,
+                relation,
+            })),
         });
     }
     return overlaps;

package/build/src/library/address.d.ts

@@ -2,19 +2,15 @@
 import { type AliasBinding } from "../alias/index.js";
 import { type AkuId } from "../akuma/identity.js";
 import { contractId } from "../core/facts/types.js";
-import { type AkumaAlias, type AkumaGlob } from "../identity/selector.js";
+import { type AkumaAlias } from "../identity/selector.js";
 import { type WorldRoot } from "../world.js";
 import type { KanshiReport, Section } from "../kanshi/index.js";
 import { type Repo } from "./repo.js";
-export type DirectAkumaSelector = AkuId | AkumaAlias;
-export type SetAkumaSelector = DirectAkumaSelector | AkumaGlob | `kei/${string}`;
 export type AkumaAddressInput = Readonly<{
-    path: WorldRoot;
     akuma: string;
     repo?: Repo;
 }>;
 export type AkumaSetAddressInput = Readonly<{
-    path: WorldRoot;
     akuma: readonly string[];
     repo?: Repo;
 }>;
@@ -62,7 +58,7 @@ type AddressedAkuma = Readonly<{
 }>;
 /**
  * Resolves one selector to a complete identity without proving it born. The
- * caller is a forwarding boundary: the parent Fleet answers for the target, so
+ * caller is a forwarding boundary: the parent Selection answers for the target, so
  * this process must not read its own Heart files to decide.
  */
 export declare function resolveAkuma(input: UncheckedAkumaAddressInput): Promise<AddressedAkuma>;
@@ -73,7 +69,7 @@ export declare function resolveAkuma(input: UncheckedAkumaAddressInput): Promise
 export declare function addressAkuma(input: UncheckedAkumaAddressInput): Promise<AddressedAkuma>;
 /**
  * Resolves a selector set to complete identities without proving any born. The
- * caller is a forwarding boundary, the parent Fleet owns the answer, and no
+ * caller is a forwarding boundary, the parent Selection owns the answer, and no
  * member's Heart is read here.
  */
 export declare function resolveAkumaSet(input: UncheckedAkumaAddressInput): Promise<Readonly<{

package/build/src/library/address.js

@@ -1,6 +1,6 @@
 /** @architectureCompositionRoot */
 import { readAliases } from "../alias/index.js";
-import { createAkumaProduct } from "../akuma/akuma-product.js";
+import { readAkumaCompleteRoster } from "../akuma/akuma.js";
 import { akumaAddressability, requireBornAkuma } from "../akuma/akuma-probe.js";
 import { parseAkuId } from "../akuma/identity.js";
 import { contractId } from "../core/facts/types.js";
@@ -96,7 +96,7 @@ export function resolveNamedAddress(input) {
 }
 /**
  * Resolves one selector to a complete identity without proving it born. The
- * caller is a forwarding boundary: the parent Fleet answers for the target, so
+ * caller is a forwarding boundary: the parent Selection answers for the target, so
  * this process must not read its own Heart files to decide.
  */
 export async function resolveAkuma(input) {
@@ -145,7 +145,7 @@ function addSelectorIds(selector, sources, selected, contractMembers, explicit)
         return;
     }
     if (selector.kind === "glob") {
-        for (const id of sources.fleetIds)
+        for (const id of sources.rosterIds)
             if (matchesAkumaGlob(selector.value, id))
                 selected.add(id);
         return;
@@ -195,8 +195,8 @@ async function readAkumaSet(input) {
     if (hasSelectorKind(selectors, "contract") && values.repo === undefined) {
         throw new TypeError("Contract Akuma selector requires repo");
     }
-    const fleetIds = hasSelectorKind(selectors, "glob")
-        ? (await createAkumaProduct(path).listComplete()).rows.map((row) => row.id)
+    const rosterIds = hasSelectorKind(selectors, "glob")
+        ? (await readAkumaCompleteRoster(path)).rows.map((row) => row.id)
         : [];
     const aliases = hasSelectorKind(selectors, "alias")
         ? new Map((await readAliases(path)).map((binding) => [binding.alias, binding.akuId]))
@@ -207,14 +207,14 @@ async function readAkumaSet(input) {
     const selected = new Set();
     const contractMembers = new Set();
     const explicit = new Set();
-    const sources = { fleetIds, aliases, dispatches };
+    const sources = { rosterIds, aliases, dispatches };
     for (const selector of selectors)
         addSelectorIds(selector, sources, selected, contractMembers, explicit);
     return { path, orderedIds: [...selected], ids: canonicalAkumaOrder(selected), contractMembers, explicit };
 }
 /**
  * Resolves a selector set to complete identities without proving any born. The
- * caller is a forwarding boundary, the parent Fleet owns the answer, and no
+ * caller is a forwarding boundary, the parent Selection owns the answer, and no
  * member's Heart is read here.
  */
 export async function resolveAkumaSet(input) {

package/build/src/library/akuma-creation.d.ts

@@ -1,19 +1,19 @@
-import { type AliasBinding } from "../alias/index.js";
-import { type AkumaStatus, type ForkReceipt } from "../akuma/akuma.js";
-import { type AkumaBornCall, type InitialCallTell } from "../akuma/akuma-product.js";
+import { type ForkReceipt } from "../akuma/akuma-owner.js";
+import { type AskObserver } from "../akuma/akuma-selection-execution.js";
+import type { AkumaStatus } from "../akuma/akuma.js";
+import type { AllowedAction } from "../akuma/allowed.js";
+import type { TellResult } from "../akuma/body.js";
 import { type AkuId } from "../akuma/identity.js";
+import { type ExecutionContext } from "../akuma/requests.js";
+import { type Schema } from "../akuma/schema.js";
+import type { AkumaAskResult } from "../akuma/selection-observation.js";
+import { type AliasBinding } from "../alias/index.js";
 import { type Dispatch, type DispatchFailure } from "../dispatch/index.js";
 import type { PrivateStateSeatCloseLag } from "../git/private-state-seat.js";
 import { type AkumaAlias } from "../identity/selector.js";
 import type { Settings } from "../settings.js";
 import { type WorldRoot } from "../world.js";
-import type { AllowedAction } from "../akuma/allowed.js";
-import { type Schema } from "../akuma/schema.js";
-import { type TellWaitObserver } from "../akuma/fleet-execution.js";
-import type { AkumaTellWaitResult } from "../akuma/fleet-observation.js";
-import type { TellResult } from "../akuma/body.js";
-import { type ExecutionContext } from "../akuma/requests.js";
-import type { Keiyaku } from "./contract-handle.js";
+import type { Keiyaku } from "./keiyaku.js";
 import { type Repo } from "./repo.js";
 export type { AkumaStatus } from "../akuma/akuma.js";
 export type IntegrationFailure = Readonly<{
@@ -49,12 +49,11 @@ export type CallWaitHead = Readonly<{
 }>;
 export type CallWaitObserver = Readonly<{
     admitted?: (tell: TellResult, id: AkumaStatus["id"], head: CallWaitHead) => void | Promise<void>;
-    observe?: TellWaitObserver["observe"];
+    observe?: AskObserver["observe"];
 }>;
 export type CallInput = Readonly<{
-    path: WorldRoot;
     archetype: string;
-    body: string;
+    body?: string;
     cwd?: string;
     mode?: "wait" | "detach";
     timeoutMs?: number;
@@ -69,12 +68,14 @@ export type CallInput = Readonly<{
     observe?: CallWaitObserver;
 }>;
 export type CallObservation = Readonly<{
+    kind: "born";
+}> | Readonly<{
     kind: "detached";
     tell: TellResult;
 }> | Readonly<{
     kind: "observed";
     tell: TellResult;
-    observation: AkumaTellWaitResult["observation"];
+    observation: AkumaAskResult["observation"];
     completedAt?: string | null;
 }> | Readonly<{
     kind: "failed";
@@ -94,23 +95,7 @@ export type CallResult = Readonly<{
     structured?: true;
     observation: CallObservation;
 }>;
-type CallExecution = CallResult["execution"];
-export type BornCall = Readonly<{
-    path: WorldRoot;
-    born: AkumaBornCall;
-    execution: CallExecution;
-    mode: "wait" | "detach";
-    timeoutMs: number;
-    signal?: AbortSignal;
-    dispatch: DispatchStage;
-    alias: AliasStage;
-    initialTell: InitialCallTell & Readonly<{
-        schema?: Schema<unknown>;
-    }>;
-    observe?: CallWaitObserver;
-}>;
 export type ForkInput = Readonly<{
-    path: WorldRoot;
     akuma: string;
     at: string;
     repo?: Repo;
@@ -126,5 +111,9 @@ export type ForkResult = Readonly<{
 }>> & Readonly<{
     parent: AkuId;
 }>);
-export declare function callAkumas(input: CallInput, execution?: ExecutionContext): Promise<CallResult>;
-export declare function forkAkumas(input: ForkInput): Promise<ForkResult>;
+export declare function callAkumas(input: CallInput & Readonly<{
+    path: WorldRoot;
+}>, execution?: ExecutionContext): Promise<CallResult>;
+export declare function forkAkumas(input: ForkInput & Readonly<{
+    path: WorldRoot;
+}>): Promise<ForkResult>;