From f60ccc2cfa40120e6380c8f6c9832872a9767eb4 Mon Sep 17 00:00:00 2001 From: jochen Date: Fri, 20 Nov 2026 02:32:16 +0100 Subject: [PATCH] sdk-seat-copies-h1: the copies of node-engine and operator-channel equal mesh-contracts' files at feat/47-H1-seats MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The copies of git, mesh-delivery and mesh-catalog follow with mesh-delivery's contracts commit. Builds: design 47 H §751, §764, §771, §772, H-A-42 --- go/seatlist/bootstrap/node-engine.json | 89 ++++++++++++++++++- go/seatlist/bootstrap/operator-channel.json | 45 +--------- .../seatlisttest/seats/node-engine.json | 89 ++++++++++++++++++- .../seatlisttest/seats/operator-channel.json | 45 +--------- go/testdata/beside/CAPTURED | 1 + .../seats/operator-channel/seat.json.captured | 45 +--------- .../seats/node-engine/seat.json.captured | 89 ++++++++++++++++++- 7 files changed, 271 insertions(+), 132 deletions(-) diff --git a/go/seatlist/bootstrap/node-engine.json b/go/seatlist/bootstrap/node-engine.json index 37bc9853..07521234 100644 --- a/go/seatlist/bootstrap/node-engine.json +++ b/go/seatlist/bootstrap/node-engine.json @@ -600,12 +600,16 @@ "input": { "properties": { "candidate": { - "description": "the key of the indexer's candidate, .", + "description": "the key of the candidate to compose: a check's candidate in the indexer, .; a branch pipeline's catalog graph revision, . (the node-engine reads its entries through mesh-catalog.revision); or a run on request's, run-; built and read by the seat's client (nodeengineclient)", "type": "string" }, "input": { "description": "also answer the composition input the candidate was composed from, for the sandbox path", "type": "boolean" + }, + "call": { + "description": "128 random bits the caller chooses: the subject token of the chunks and acknowledgements the composition input is sent in, whatever its size (design 47 G A-237b); an ask with input and no call is answered inline, as before the checker goes (G-6 section 321)", + "type": "string" } }, "required": [ @@ -658,7 +662,12 @@ }, "input": { "type": "object", - "description": "when asked: the composition input it composed from" + "description": "when asked without a call token: the composition input it composed from, inline, up to what one answer carries (the checker's form, kept until G removes the checker, G-6 section 321)" + }, + "chunks": { + "type": "integer", + "minimum": 0, + "description": "when asked with input and a call token: how many chunks of at most 512 KiB carry the composition input, sent on the chunk subject of the call, each acknowledged by the caller (design 47 G A-237b)" } }, "required": [ @@ -671,6 +680,7 @@ "took" ] }, + "chunks": true, "class": "read" }, { @@ -714,6 +724,67 @@ }, "class": "read" }, + { + "name": "apply-order", + "optional": true, + "description": "The order this machine's engine will apply its changed wants in, with why: one row per unapplied changed want, the bus module and the backup holder first, then each pipeline's wants by rank, then the rest by name, its own want last, a reverted module first (design 47 H 771, H-A-46). Read-only. Answered by this machine's engine alone.", + "input": { + "type": "object", + "properties": {} + }, + "answer": { + "type": "object", + "properties": { + "order": { + "type": "array", + "items": { + "type": "object", + "properties": { + "module": { + "type": "string", + "description": "the module whose want waits to be applied" + }, + "pipeline": { + "type": "string", + "description": "the want's pipeline (its key); absent for a want in none" + }, + "rank": { + "type": "integer", + "description": "the mover's tier in its pipeline; absent for a want in none" + }, + "position": { + "type": "integer", + "description": "its place in the order, the first applied being 1" + }, + "why": { + "type": "string", + "description": "why it stands there, in one sentence" + }, + "waits": { + "type": "array", + "items": { + "type": "string" + }, + "description": "the modules it waits on; empty when it waits for nothing" + } + }, + "required": [ + "module", + "position", + "why", + "waits" + ] + }, + "description": "one row per unapplied changed want, in the order it will be applied" + } + }, + "required": [ + "order" + ], + "description": "the order this machine's engine applies its changed wants in" + }, + "class": "read" + }, { "name": "seat-list", "description": "The seat list this engine holds and what it waits for (novox/hq ADR 0636 §7): each seat's source (trunk or bootstrap) and digest, the seats held from the bootstrap alone, the definitions refused, the last error and whether the seat mesh-catalog has answered. Read-only.", @@ -1300,6 +1371,13 @@ "refused": { "type": "string", "description": "why the module cannot be composed at this fingerprint" + }, + "templates": { + "type": "array", + "items": { + "type": "string" + }, + "description": "the digests, sorted, of the templates archives the composition was rendered from" } }, "required": [ @@ -1838,6 +1916,13 @@ ], "description": "the answer of an act the operator is asked" }, + "ManifestReadWord": { + "type": "string", + "enum": [ + "want:version" + ], + "description": "the word a node-engine states in manifest-reads when it reads a want by version and not by digests (design 47 H 772, H-A-45); the assigner holds a node whose engine does not state it. Other words in manifest-reads are free" + }, "ManifestReadsChanged": { "type": "object", "properties": { diff --git a/go/seatlist/bootstrap/operator-channel.json b/go/seatlist/bootstrap/operator-channel.json index 3c44a1b1..42c14829 100644 --- a/go/seatlist/bootstrap/operator-channel.json +++ b/go/seatlist/bootstrap/operator-channel.json @@ -130,7 +130,7 @@ }, "state": { "type": "string", - "description": "open (open, held and held-back), ended or all; none is open when no key or since is given, else all" + "description": "open (open and held), ended or all; none is open when no key or since is given, else all" }, "since": { "type": "string", @@ -158,11 +158,7 @@ }, "state": { "type": "string", - "description": "how the ask stands: open, held (no ready channel), held-back (kept open behind the asker's newer asks, ADR 0666 §12), or how it ended (answered, expired, cancelled)" - }, - "held-since": { - "type": "string", - "description": "when the ask was held back, RFC 3339; present while its state is held-back" + "description": "how the ask stands: open, held (no ready channel), or how it ended (answered, expired, cancelled)" } }, "required": [ @@ -184,37 +180,6 @@ "asks" ] } - }, - { - "name": "ask-again", - "description": "Offer a held-back ask now, on a channel that is ready: the asker's ask kept open behind its newer asks (design 47 G 83, 394).", - "class": "act", - "input": { - "type": "object", - "properties": { - "key": { - "type": "string", - "description": ". of the held-back ask" - } - }, - "required": [ - "key" - ], - "additionalProperties": false - }, - "answer": { - "type": "object", - "description": "where the ask stands after it was offered", - "properties": { - "state": { - "type": "string" - }, - "error": { - "type": "string", - "description": "why it was not offered; set alone" - } - } - } } ], "accepts": [ @@ -287,7 +252,7 @@ }, "state": { "type": "string", - "description": "how it stands: open, held-back (kept open behind the asker's newer asks, ADR 0666 §12), chosen, expired, cancelled, replaced or refused" + "description": "how it stands: open, chosen, expired, cancelled, replaced or refused" }, "opened": { "type": "string", @@ -308,10 +273,6 @@ "type": "boolean", "description": "its asker has been told how it ended" }, - "held-since": { - "type": "string", - "description": "when the ask was held back, RFC 3339; present while its state is held-back" - }, "warrant": { "$ref": "#/defs/Warrant" }, diff --git a/go/seatlist/seatlisttest/seats/node-engine.json b/go/seatlist/seatlisttest/seats/node-engine.json index 37bc9853..07521234 100644 --- a/go/seatlist/seatlisttest/seats/node-engine.json +++ b/go/seatlist/seatlisttest/seats/node-engine.json @@ -600,12 +600,16 @@ "input": { "properties": { "candidate": { - "description": "the key of the indexer's candidate, .", + "description": "the key of the candidate to compose: a check's candidate in the indexer, .; a branch pipeline's catalog graph revision, . (the node-engine reads its entries through mesh-catalog.revision); or a run on request's, run-; built and read by the seat's client (nodeengineclient)", "type": "string" }, "input": { "description": "also answer the composition input the candidate was composed from, for the sandbox path", "type": "boolean" + }, + "call": { + "description": "128 random bits the caller chooses: the subject token of the chunks and acknowledgements the composition input is sent in, whatever its size (design 47 G A-237b); an ask with input and no call is answered inline, as before the checker goes (G-6 section 321)", + "type": "string" } }, "required": [ @@ -658,7 +662,12 @@ }, "input": { "type": "object", - "description": "when asked: the composition input it composed from" + "description": "when asked without a call token: the composition input it composed from, inline, up to what one answer carries (the checker's form, kept until G removes the checker, G-6 section 321)" + }, + "chunks": { + "type": "integer", + "minimum": 0, + "description": "when asked with input and a call token: how many chunks of at most 512 KiB carry the composition input, sent on the chunk subject of the call, each acknowledged by the caller (design 47 G A-237b)" } }, "required": [ @@ -671,6 +680,7 @@ "took" ] }, + "chunks": true, "class": "read" }, { @@ -714,6 +724,67 @@ }, "class": "read" }, + { + "name": "apply-order", + "optional": true, + "description": "The order this machine's engine will apply its changed wants in, with why: one row per unapplied changed want, the bus module and the backup holder first, then each pipeline's wants by rank, then the rest by name, its own want last, a reverted module first (design 47 H 771, H-A-46). Read-only. Answered by this machine's engine alone.", + "input": { + "type": "object", + "properties": {} + }, + "answer": { + "type": "object", + "properties": { + "order": { + "type": "array", + "items": { + "type": "object", + "properties": { + "module": { + "type": "string", + "description": "the module whose want waits to be applied" + }, + "pipeline": { + "type": "string", + "description": "the want's pipeline (its key); absent for a want in none" + }, + "rank": { + "type": "integer", + "description": "the mover's tier in its pipeline; absent for a want in none" + }, + "position": { + "type": "integer", + "description": "its place in the order, the first applied being 1" + }, + "why": { + "type": "string", + "description": "why it stands there, in one sentence" + }, + "waits": { + "type": "array", + "items": { + "type": "string" + }, + "description": "the modules it waits on; empty when it waits for nothing" + } + }, + "required": [ + "module", + "position", + "why", + "waits" + ] + }, + "description": "one row per unapplied changed want, in the order it will be applied" + } + }, + "required": [ + "order" + ], + "description": "the order this machine's engine applies its changed wants in" + }, + "class": "read" + }, { "name": "seat-list", "description": "The seat list this engine holds and what it waits for (novox/hq ADR 0636 §7): each seat's source (trunk or bootstrap) and digest, the seats held from the bootstrap alone, the definitions refused, the last error and whether the seat mesh-catalog has answered. Read-only.", @@ -1300,6 +1371,13 @@ "refused": { "type": "string", "description": "why the module cannot be composed at this fingerprint" + }, + "templates": { + "type": "array", + "items": { + "type": "string" + }, + "description": "the digests, sorted, of the templates archives the composition was rendered from" } }, "required": [ @@ -1838,6 +1916,13 @@ ], "description": "the answer of an act the operator is asked" }, + "ManifestReadWord": { + "type": "string", + "enum": [ + "want:version" + ], + "description": "the word a node-engine states in manifest-reads when it reads a want by version and not by digests (design 47 H 772, H-A-45); the assigner holds a node whose engine does not state it. Other words in manifest-reads are free" + }, "ManifestReadsChanged": { "type": "object", "properties": { diff --git a/go/seatlist/seatlisttest/seats/operator-channel.json b/go/seatlist/seatlisttest/seats/operator-channel.json index 3c44a1b1..42c14829 100644 --- a/go/seatlist/seatlisttest/seats/operator-channel.json +++ b/go/seatlist/seatlisttest/seats/operator-channel.json @@ -130,7 +130,7 @@ }, "state": { "type": "string", - "description": "open (open, held and held-back), ended or all; none is open when no key or since is given, else all" + "description": "open (open and held), ended or all; none is open when no key or since is given, else all" }, "since": { "type": "string", @@ -158,11 +158,7 @@ }, "state": { "type": "string", - "description": "how the ask stands: open, held (no ready channel), held-back (kept open behind the asker's newer asks, ADR 0666 §12), or how it ended (answered, expired, cancelled)" - }, - "held-since": { - "type": "string", - "description": "when the ask was held back, RFC 3339; present while its state is held-back" + "description": "how the ask stands: open, held (no ready channel), or how it ended (answered, expired, cancelled)" } }, "required": [ @@ -184,37 +180,6 @@ "asks" ] } - }, - { - "name": "ask-again", - "description": "Offer a held-back ask now, on a channel that is ready: the asker's ask kept open behind its newer asks (design 47 G 83, 394).", - "class": "act", - "input": { - "type": "object", - "properties": { - "key": { - "type": "string", - "description": ". of the held-back ask" - } - }, - "required": [ - "key" - ], - "additionalProperties": false - }, - "answer": { - "type": "object", - "description": "where the ask stands after it was offered", - "properties": { - "state": { - "type": "string" - }, - "error": { - "type": "string", - "description": "why it was not offered; set alone" - } - } - } } ], "accepts": [ @@ -287,7 +252,7 @@ }, "state": { "type": "string", - "description": "how it stands: open, held-back (kept open behind the asker's newer asks, ADR 0666 §12), chosen, expired, cancelled, replaced or refused" + "description": "how it stands: open, chosen, expired, cancelled, replaced or refused" }, "opened": { "type": "string", @@ -308,10 +273,6 @@ "type": "boolean", "description": "its asker has been told how it ended" }, - "held-since": { - "type": "string", - "description": "when the ask was held back, RFC 3339; present while its state is held-back" - }, "warrant": { "$ref": "#/defs/Warrant" }, diff --git a/go/testdata/beside/CAPTURED b/go/testdata/beside/CAPTURED index 83864b59..d89b1d44 100644 --- a/go/testdata/beside/CAPTURED +++ b/go/testdata/beside/CAPTURED @@ -13,6 +13,7 @@ repositories; before that it was mesh-controller's copy, which still held two mo mesh-catalog b5dbfbb784507e211372a7c9640d91f7d6dadd84 modules/*/module.json, modules/*/files/**, modules/*/templates/**, predefined.json mesh-contracts cf5590c7599d3ee3b61c3aa66c88a939ecb41130 the seat files of the eight bootstrapped seats held there (seats/, health-and-repair/seats/, operator-and-conversation/seats/), as seat.json.captured (milestone 47/G) mesh-contracts bfc5073b824ef355270da4c44ccf8fa709f6a253 seats/mesh-broker/seat.json, taken again (milestone 47/G lead answer A-388) +mesh-contracts 1c910e9d10a04e6ecabd1760a0f1a943e24a70d8 seats/node-engine/seat.json and operator-and-conversation/seats/operator-channel/seat.json, taken again as seat.json.captured (milestone 47/H1, branch feat/47-H1-seats) mesh-delivery 5bf848144283055a1ef37441eeda0e439fb6ad7e contracts/seats/mesh-catalog and mesh-delivery-checker, as seat.json.captured (go/seatlist's bootstrap test; milestone 47/G) mesh-delivery 0259d77d115c95dde492ac2360e9a518d992adb0 modules/mesh-delivery-contracts/seats/mesh-catalog and git, taken again and added (milestone 47/G lead answer A-387) mesh-host cdcba9ca73755854d21e4e657d7e46c32b9b5265 internal/apply/placement_guard.go diff --git a/go/testdata/beside/mesh-contracts/operator-and-conversation/seats/operator-channel/seat.json.captured b/go/testdata/beside/mesh-contracts/operator-and-conversation/seats/operator-channel/seat.json.captured index 3c44a1b1..42c14829 100644 --- a/go/testdata/beside/mesh-contracts/operator-and-conversation/seats/operator-channel/seat.json.captured +++ b/go/testdata/beside/mesh-contracts/operator-and-conversation/seats/operator-channel/seat.json.captured @@ -130,7 +130,7 @@ }, "state": { "type": "string", - "description": "open (open, held and held-back), ended or all; none is open when no key or since is given, else all" + "description": "open (open and held), ended or all; none is open when no key or since is given, else all" }, "since": { "type": "string", @@ -158,11 +158,7 @@ }, "state": { "type": "string", - "description": "how the ask stands: open, held (no ready channel), held-back (kept open behind the asker's newer asks, ADR 0666 §12), or how it ended (answered, expired, cancelled)" - }, - "held-since": { - "type": "string", - "description": "when the ask was held back, RFC 3339; present while its state is held-back" + "description": "how the ask stands: open, held (no ready channel), or how it ended (answered, expired, cancelled)" } }, "required": [ @@ -184,37 +180,6 @@ "asks" ] } - }, - { - "name": "ask-again", - "description": "Offer a held-back ask now, on a channel that is ready: the asker's ask kept open behind its newer asks (design 47 G 83, 394).", - "class": "act", - "input": { - "type": "object", - "properties": { - "key": { - "type": "string", - "description": ". of the held-back ask" - } - }, - "required": [ - "key" - ], - "additionalProperties": false - }, - "answer": { - "type": "object", - "description": "where the ask stands after it was offered", - "properties": { - "state": { - "type": "string" - }, - "error": { - "type": "string", - "description": "why it was not offered; set alone" - } - } - } } ], "accepts": [ @@ -287,7 +252,7 @@ }, "state": { "type": "string", - "description": "how it stands: open, held-back (kept open behind the asker's newer asks, ADR 0666 §12), chosen, expired, cancelled, replaced or refused" + "description": "how it stands: open, chosen, expired, cancelled, replaced or refused" }, "opened": { "type": "string", @@ -308,10 +273,6 @@ "type": "boolean", "description": "its asker has been told how it ended" }, - "held-since": { - "type": "string", - "description": "when the ask was held back, RFC 3339; present while its state is held-back" - }, "warrant": { "$ref": "#/defs/Warrant" }, diff --git a/go/testdata/beside/mesh-contracts/seats/node-engine/seat.json.captured b/go/testdata/beside/mesh-contracts/seats/node-engine/seat.json.captured index 37bc9853..07521234 100644 --- a/go/testdata/beside/mesh-contracts/seats/node-engine/seat.json.captured +++ b/go/testdata/beside/mesh-contracts/seats/node-engine/seat.json.captured @@ -600,12 +600,16 @@ "input": { "properties": { "candidate": { - "description": "the key of the indexer's candidate, .", + "description": "the key of the candidate to compose: a check's candidate in the indexer, .; a branch pipeline's catalog graph revision, . (the node-engine reads its entries through mesh-catalog.revision); or a run on request's, run-; built and read by the seat's client (nodeengineclient)", "type": "string" }, "input": { "description": "also answer the composition input the candidate was composed from, for the sandbox path", "type": "boolean" + }, + "call": { + "description": "128 random bits the caller chooses: the subject token of the chunks and acknowledgements the composition input is sent in, whatever its size (design 47 G A-237b); an ask with input and no call is answered inline, as before the checker goes (G-6 section 321)", + "type": "string" } }, "required": [ @@ -658,7 +662,12 @@ }, "input": { "type": "object", - "description": "when asked: the composition input it composed from" + "description": "when asked without a call token: the composition input it composed from, inline, up to what one answer carries (the checker's form, kept until G removes the checker, G-6 section 321)" + }, + "chunks": { + "type": "integer", + "minimum": 0, + "description": "when asked with input and a call token: how many chunks of at most 512 KiB carry the composition input, sent on the chunk subject of the call, each acknowledged by the caller (design 47 G A-237b)" } }, "required": [ @@ -671,6 +680,7 @@ "took" ] }, + "chunks": true, "class": "read" }, { @@ -714,6 +724,67 @@ }, "class": "read" }, + { + "name": "apply-order", + "optional": true, + "description": "The order this machine's engine will apply its changed wants in, with why: one row per unapplied changed want, the bus module and the backup holder first, then each pipeline's wants by rank, then the rest by name, its own want last, a reverted module first (design 47 H 771, H-A-46). Read-only. Answered by this machine's engine alone.", + "input": { + "type": "object", + "properties": {} + }, + "answer": { + "type": "object", + "properties": { + "order": { + "type": "array", + "items": { + "type": "object", + "properties": { + "module": { + "type": "string", + "description": "the module whose want waits to be applied" + }, + "pipeline": { + "type": "string", + "description": "the want's pipeline (its key); absent for a want in none" + }, + "rank": { + "type": "integer", + "description": "the mover's tier in its pipeline; absent for a want in none" + }, + "position": { + "type": "integer", + "description": "its place in the order, the first applied being 1" + }, + "why": { + "type": "string", + "description": "why it stands there, in one sentence" + }, + "waits": { + "type": "array", + "items": { + "type": "string" + }, + "description": "the modules it waits on; empty when it waits for nothing" + } + }, + "required": [ + "module", + "position", + "why", + "waits" + ] + }, + "description": "one row per unapplied changed want, in the order it will be applied" + } + }, + "required": [ + "order" + ], + "description": "the order this machine's engine applies its changed wants in" + }, + "class": "read" + }, { "name": "seat-list", "description": "The seat list this engine holds and what it waits for (novox/hq ADR 0636 §7): each seat's source (trunk or bootstrap) and digest, the seats held from the bootstrap alone, the definitions refused, the last error and whether the seat mesh-catalog has answered. Read-only.", @@ -1300,6 +1371,13 @@ "refused": { "type": "string", "description": "why the module cannot be composed at this fingerprint" + }, + "templates": { + "type": "array", + "items": { + "type": "string" + }, + "description": "the digests, sorted, of the templates archives the composition was rendered from" } }, "required": [ @@ -1838,6 +1916,13 @@ ], "description": "the answer of an act the operator is asked" }, + "ManifestReadWord": { + "type": "string", + "enum": [ + "want:version" + ], + "description": "the word a node-engine states in manifest-reads when it reads a want by version and not by digests (design 47 H 772, H-A-45); the assigner holds a node whose engine does not state it. Other words in manifest-reads are free" + }, "ManifestReadsChanged": { "type": "object", "properties": {