diff --git a/modules/mesh-delivery-contracts/go/seats/containerimageregistry/contract.go b/modules/mesh-delivery-contracts/go/seats/containerimageregistry/contract.go index bad679dd6..26ea4d9ac 100644 --- a/modules/mesh-delivery-contracts/go/seats/containerimageregistry/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/containerimageregistry/contract.go @@ -22,7 +22,7 @@ const FormRegistry = 1 // whose fields changed while its forms did not (design 47 H2 §780). const ( generatedForms = "1 registry:1" - generatedFieldsDigest = "63651a5f06aa41743b7c77ff25bed94a2b3ad6bcc39ac9f15ffcd51ff55a3c9d" + generatedFieldsDigest = "Artifact=79361e4ab1cd HeldEvent=b6d4c12500df Hold=c5a97a2f2d5a HoldAnswer=7d536ccb729f HoldsBySeatNameDigestValue=db093998a869 KeptEvent=ec3ef89ef8a7 ListAnswer=ca49dd7f20ee Listed=b9f1d1232e64 MirrorAnswer=0d59df97b53b Outcome=1e66f7bf6725 PublishAnswer=a0df0b922e1e PublishPartAnswer=aebe3c6c89e9 PublishedEvent=ec3ef89ef8a7 RefusedEvent=ec3ef89ef8a7 ReleaseAnswer=d30bd6000a16 ReleasedEvent=b6d4c12500df RemoveAnswer=bccb5a322d69 RemovedEvent=ec3ef89ef8a7 Repository=740e54e0b3b0 TagsAnswer=fe178191458a TagsAnswerTagsItem=eee02e024d64 VersionsAnswer=47e11ca2aea9 WindowsByCallerValue=23d9294dde92 WindowsByCallerValueDroppedItem=d748f0e58825" ) const ( diff --git a/modules/mesh-delivery-contracts/go/seats/git/contract.go b/modules/mesh-delivery-contracts/go/seats/git/contract.go index 60fe8348a..8a0104cd5 100644 --- a/modules/mesh-delivery-contracts/go/seats/git/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/git/contract.go @@ -20,7 +20,7 @@ const Form = 1 // whose fields changed while its forms did not (design 47 H2 §780). const ( generatedForms = "1" - generatedFieldsDigest = "76d91e80e3c40c239af4ab4ea133e72f3757b17fbbf98452cb53cbe15f343a57" + generatedFieldsDigest = "BranchAnswer=3195d124d743 BranchMovedEvent=baaa6fdf37f2 Call=ebef3639e061 CallMember=8d7bf9b9c258 CallsByCallCallValue=05142ac90d52 Change=5a13d1572e59 CommentAnswer=a784c00b0525 ContainsAnswer=0e9dfceb8abc ErrorKind=dd980ce32cee FailedStep=d68341819717 FailedStepsByModuleFingerprintStepValue=0fce6f5d3273 FileAnswer=79d19a058afd ForgeDeleteEvent=35a0828a1238 ForgePullEvent=303345c390d7 ForgeStatusEvent=689488c43094 MemberOutcome=c35056683738 MergeCalled=cb5a36d22c92 MergeCalledEvent=8597a63a790c MergeCalledMembersItem=211bdc9bab48 MergeCalledRefusedItem=bbf9ce4382c8 MergePullAnswer=fb8ef9812f3b Merging=482fbecedd58 NoteAnswer=a784c00b0525 OpenPull=56217c4c348a OpenPullsAnswer=d019b5d2ba56 Pull=6e3fdd146b1c PullAnswer=4c45f0fc3597 PullClosedEvent=c2b7ac1de473 PullMergedEvent=619d9c863307 PullUpdatedEvent=f86ee614998e RepoWritableEvent=1a8c6e6344ba Status=b2980533a044 StatusAnswer=a784c00b0525 StatusesAnswer=591f82f64fec TagAnswer=56641525b79b TagsAnswer=4f579a2d69f2 TreesAnswer=32583cb10fab ViewAnswer=a784c00b0525" ) const ( diff --git a/modules/mesh-delivery-contracts/go/seats/gopackageregistry/contract.go b/modules/mesh-delivery-contracts/go/seats/gopackageregistry/contract.go index 9329709ff..851052cfa 100644 --- a/modules/mesh-delivery-contracts/go/seats/gopackageregistry/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/gopackageregistry/contract.go @@ -21,7 +21,7 @@ const FormRegistry = 1 // whose fields changed while its forms did not (design 47 H2 §780). const ( generatedForms = "1 registry:1" - generatedFieldsDigest = "b80afb127966ec05c9c822eab0ab43488e6ee0a9d0f43cb1334e4fa32f07bb35" + generatedFieldsDigest = "Artifact=79361e4ab1cd KeptEvent=ec3ef89ef8a7 Outcome=1e66f7bf6725 PublishAnswer=a0df0b922e1e PublishPartAnswer=aebe3c6c89e9 PublishedEvent=ec3ef89ef8a7 RefusedEvent=ec3ef89ef8a7 RemoveAnswer=bccb5a322d69 RemovedEvent=ec3ef89ef8a7 VersionsAnswer=47e11ca2aea9" ) const ( diff --git a/modules/mesh-delivery-contracts/go/seats/meshartifactsweep/contract.go b/modules/mesh-delivery-contracts/go/seats/meshartifactsweep/contract.go index 928422ba8..3d143027f 100644 --- a/modules/mesh-delivery-contracts/go/seats/meshartifactsweep/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/meshartifactsweep/contract.go @@ -19,7 +19,7 @@ const Form = 1 // whose fields changed while its forms did not (design 47 H2 §780). const ( generatedForms = "1" - generatedFieldsDigest = "15ff15679b43316c05f50583f7ed5e367eac2ba26003374b05a94f5107857a92" + generatedFieldsDigest = "ArtifactsAnswer=7538f2f5e68e ArtifactsGone=191972da3c7b ArtifactsGoneEvent=28bdc3f8c44d CollectAnswer=7538f2f5e68e HeldAnswer=a5c68f6effa8 ImagesAnswer=7538f2f5e68e MirrorsAnswer=7538f2f5e68e" ) const ( diff --git a/modules/mesh-delivery-contracts/go/seats/meshbuilds/contract.go b/modules/mesh-delivery-contracts/go/seats/meshbuilds/contract.go index 009dd68f4..b6392f0f8 100644 --- a/modules/mesh-delivery-contracts/go/seats/meshbuilds/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/meshbuilds/contract.go @@ -19,12 +19,13 @@ const Form = 1 // whose fields changed while its forms did not (design 47 H2 §780). const ( generatedForms = "1" - generatedFieldsDigest = "4001613559208a0a99ed933d22eefad947365f8bcd6ba091dc4edb5e869d4798" + generatedFieldsDigest = "AskTakenEvent=6d5d3da7ac39 BuildEntry=3c829a0a3d58 Dependency=90a32b07c563 DropAnswer=7538f2f5e68e PackagePublished=34dd069a6aab PackagePublishedEvent=8e12888c1559 PublishedAnswer=69a801982819 ReservedAnswer=2272a4d6f0f4 ReservedAnswerArtifactsItem=d74eb6e00abb StepAccept=18efeefb6c34 StepEnded=09a07bfbcb15 StepEndedEvent=207787118dac StepRun=dc5893aef7e5 ToolchainAgreed=f3d9ce993734 ToolchainAgreedDigestsItem=1d42893a96b9 ToolchainAgreedEvent=e3502d6f194d VersionReservedEvent=984547d6ad07" ) const ( VerbReserved = "reserved" VerbPublished = "published" + VerbDrop = "drop" ) const ( @@ -35,16 +36,18 @@ const ( EventPackagePublished = "package-published" EventToolchainAgreed = "toolchain-agreed" EventStepEnded = "step-ended" + EventAskTaken = "ask-taken" + EventVersionReserved = "version-reserved" ) // Verbs is every verb the seat serves, in its definition's order: a new copy each call. func Verbs() []string { - return []string{VerbReserved, VerbPublished} + return []string{VerbReserved, VerbPublished, VerbDrop} } // Events is every event published on the seat's subject: a new copy each call. func Events() []string { - return []string{EventPackagePublished, EventToolchainAgreed, EventStepEnded} + return []string{EventPackagePublished, EventToolchainAgreed, EventStepEnded, EventAskTaken, EventVersionReserved} } // Family is where the seat's events are kept: the shared events stream, filtered to the seat's subjects. @@ -74,6 +77,15 @@ func SubjectStepEnded(node string) string { return "mesh.seat.mesh-builds.event. // SubjectStepEndedAll hears every step-ended. const SubjectStepEndedAll = "mesh.seat.mesh-builds.event.step-ended.*" +// SubjectAskTaken is where ask-taken is published, on mesh.seat.mesh-builds.event.ask-taken.. +func SubjectAskTaken(ask string) string { return "mesh.seat.mesh-builds.event.ask-taken." + ask } + +// SubjectAskTakenAll hears every ask-taken. +const SubjectAskTakenAll = "mesh.seat.mesh-builds.event.ask-taken.*" + +// SubjectVersionReserved is where version-reserved is published. +const SubjectVersionReserved = "mesh.seat.mesh-builds.event.version-reserved" + // AcceptSubjectStep is where step is sent. const AcceptSubjectStep = "mesh.seat.mesh-builds.accept.step" @@ -264,6 +276,19 @@ type PublishedAnswer struct { Version string `json:"version,omitempty"` } +// DropInput is what drop takes. +type DropInput struct { + // who drops it + By string `json:"by,omitempty"` + // the ask's id + ID string `json:"id"` + // why the caller no longer waits + Why string `json:"why"` +} + +// DropAnswer is what drop answers. +type DropAnswer = map[string]any + // StepAccept is the body of step. type StepAccept = StepRun @@ -276,6 +301,32 @@ type ToolchainAgreedEvent = ToolchainAgreed // StepEndedEvent is the body of the event step-ended. type StepEndedEvent = StepEnded +// AskTakenEvent is the body of the event ask-taken. +type AskTakenEvent struct { + // the ask's id + Ask string `json:"ask"` + // when it was taken + At time.Time `json:"at"` + // is the form of what this value carries, left out while it is 1 (design 47 H2 §780). + Form int64 `json:"form,omitempty"` + // the node whose holder took it + Node string `json:"node"` +} + +// VersionReservedEvent is the body of the event version-reserved. +type VersionReservedEvent struct { + Artifact string `json:"artifact"` + Fingerprint string `json:"fingerprint"` + // is the form of what this value carries, left out while it is 1 (design 47 H2 §780). + Form int64 `json:"form,omitempty"` + Module string `json:"module"` + // the package's path + Path string `json:"path"` + // the catalog revision the reservation was made at + Revision string `json:"revision"` + Version string `json:"version"` +} + // DecodeReservedAnswer reads a ReservedAnswer as another part wrote it: a field this reader does not know is left unread, never refused; the form read is answered, 1 when absent (design 47 H2 §780). func DecodeReservedAnswer(raw []byte) (ReservedAnswer, int, error) { var v ReservedAnswer @@ -294,6 +345,15 @@ func DecodePublishedAnswer(raw []byte) (PublishedAnswer, int, error) { return v, formRead(raw), nil } +// DecodeDropAnswer reads a DropAnswer as another part wrote it: a field this reader does not know is left unread, never refused; the form read is answered, 1 when absent (design 47 H2 §780). +func DecodeDropAnswer(raw []byte) (DropAnswer, int, error) { + var v DropAnswer + if err := json.Unmarshal(raw, &v); err != nil { + return v, 0, err + } + return v, formRead(raw), nil +} + // DecodePackagePublishedEvent reads a PackagePublishedEvent as another part wrote it: a field this reader does not know is left unread, never refused; the form read is answered, 1 when absent (design 47 H2 §780). func DecodePackagePublishedEvent(raw []byte) (PackagePublishedEvent, int, error) { var v PackagePublishedEvent @@ -321,6 +381,24 @@ func DecodeStepEndedEvent(raw []byte) (StepEndedEvent, int, error) { return v, formRead(raw), nil } +// DecodeAskTakenEvent reads a AskTakenEvent as another part wrote it: a field this reader does not know is left unread, never refused; the form read is answered, 1 when absent (design 47 H2 §780). +func DecodeAskTakenEvent(raw []byte) (AskTakenEvent, int, error) { + var v AskTakenEvent + if err := json.Unmarshal(raw, &v); err != nil { + return v, 0, err + } + return v, formRead(raw), nil +} + +// DecodeVersionReservedEvent reads a VersionReservedEvent as another part wrote it: a field this reader does not know is left unread, never refused; the form read is answered, 1 when absent (design 47 H2 §780). +func DecodeVersionReservedEvent(raw []byte) (VersionReservedEvent, int, error) { + var v VersionReservedEvent + if err := json.Unmarshal(raw, &v); err != nil { + return v, 0, err + } + return v, formRead(raw), nil +} + // formRead is the form a value says on the wire: 1 when it says none, or is no object. func formRead(raw []byte) int { var f struct { diff --git a/modules/mesh-delivery-contracts/go/seats/meshbuilds/contract_test.go b/modules/mesh-delivery-contracts/go/seats/meshbuilds/contract_test.go index 47673e2f8..8f92cb7f8 100644 --- a/modules/mesh-delivery-contracts/go/seats/meshbuilds/contract_test.go +++ b/modules/mesh-delivery-contracts/go/seats/meshbuilds/contract_test.go @@ -25,6 +25,10 @@ func TestFixtures(t *testing.T) { decode: func(b []byte) (any, error) { var v StepEndedEvent; err := json.Unmarshal(b, &v); return v, err }, subjectIs: regexp.MustCompile("^mesh\\.seat\\.mesh-builds\\.event\\.step-ended\\.[^.*> ]+$")}, {name: "the build step failed on its entry", subject: "mesh.seat.mesh-builds.event.step-ended.laptop", given: "{\"entries\":[{\"fingerprint\":\"fp-0123\",\"module\":\"nats\"}],\"id\":\"m2kx9a1b3c4d6b\",\"node\":\"laptop\",\"outcome\":\"failed\",\"pipeline\":\"main.12.nats\",\"said\":\"nats:program did not build\",\"step\":\"build\",\"v\":1}", wire: "{\"entries\":[{\"fingerprint\":\"fp-0123\",\"module\":\"nats\"}],\"id\":\"m2kx9a1b3c4d6b\",\"node\":\"laptop\",\"outcome\":\"failed\",\"pipeline\":\"main.12.nats\",\"said\":\"nats:program did not build\",\"step\":\"build\",\"v\":1}", decode: func(b []byte) (any, error) { var v StepEndedEvent; err := json.Unmarshal(b, &v); return v, err }, subjectIs: regexp.MustCompile("^mesh\\.seat\\.mesh-builds\\.event\\.step-ended\\.[^.*> ]+$")}, + {name: "an ask taken at the pull", subject: "mesh.seat.mesh-builds.event.ask-taken.main-3589-mesh-sdk-unit", given: "{\"ask\":\"main-3589-mesh-sdk-unit\",\"at\":\"2026-11-21T22:00:00Z\",\"node\":\"anchor\"}", wire: "{\"ask\":\"main-3589-mesh-sdk-unit\",\"at\":\"2026-11-21T22:00:00Z\",\"node\":\"anchor\"}", + decode: func(b []byte) (any, error) { var v AskTakenEvent; err := json.Unmarshal(b, &v); return v, err }, subjectIs: regexp.MustCompile("^mesh\\.seat\\.mesh-builds\\.event\\.ask-taken\\.[^.*> ]+$")}, + {name: "a version reserved at a fingerprint", subject: "mesh.seat.mesh-builds.event.version-reserved", given: "{\"artifact\":\"mesh-sdk:go\",\"fingerprint\":\"sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef\",\"form\":1,\"module\":\"mesh-sdk\",\"path\":\"git.novox.be/novox/mesh-sdk/go\",\"revision\":\"412\",\"version\":\"0.1.21\"}", wire: "{\"artifact\":\"mesh-sdk:go\",\"fingerprint\":\"sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef\",\"form\":1,\"module\":\"mesh-sdk\",\"path\":\"git.novox.be/novox/mesh-sdk/go\",\"revision\":\"412\",\"version\":\"0.1.21\"}", + decode: func(b []byte) (any, error) { var v VersionReservedEvent; err := json.Unmarshal(b, &v); return v, err }, subjectIs: regexp.MustCompile("^mesh\\.seat\\.mesh-builds\\.event\\.version-reserved$")}, {name: "reserved asks a module", subject: "", given: "{\"module\":\"mesh-sdk\"}", wire: "{\"module\":\"mesh-sdk\"}", decode: func(b []byte) (any, error) { var v ReservedInput; err := json.Unmarshal(b, &v); return v, err }, subjectIs: nil}, {name: "reserved asks a package by its name", subject: "", given: "{\"name\":\"git.novox.be/novox/mesh-sdk/go\",\"version\":\"0.1.15\"}", wire: "{\"name\":\"git.novox.be/novox/mesh-sdk/go\",\"version\":\"0.1.15\"}", diff --git a/modules/mesh-delivery-contracts/go/seats/meshcatalog/contract.go b/modules/mesh-delivery-contracts/go/seats/meshcatalog/contract.go index 1c98e0ade..be09443c8 100644 --- a/modules/mesh-delivery-contracts/go/seats/meshcatalog/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/meshcatalog/contract.go @@ -20,7 +20,7 @@ const Form = 1 // whose fields changed while its forms did not (design 47 H2 §780). const ( generatedForms = "1" - generatedFieldsDigest = "5a5f6106fe9ee419cc10e40c34f4e901b9ee9215033079381243d04d898e5c7c" + generatedFieldsDigest = "ActingRule=8a83ce7e0457 Artifact=78b05c1a9ec3 ArtifactPackage=2a3a660a934d ArtifactRef=a2f06147f4b6 BuildEdge=76f0684e254a BuildEdges=d2b95000259e BuildEdgesByModuleBranchValue=4fdf7cc1e723 CandidatesByGroupValue=9ea8c6c580d2 CandidatesByGroupValuePullsItem=90fb03643258 CandidatesByGroupValuePullsItemFpsValue=4c6783201aa3 CatalogEntry=d154f232237b CatalogRevision=d1ecaaa484af CatalogRevisionDefinitionsItem=77fcff620d48 CatalogRevisionEvent=710cbc5bfff1 CatalogRevisionsByBranchRevisionValue=17e54f635d35 CatalogRevisionsByCandidateGroupHeadsValue=17e54f635d35 CatalogRevisionsByEntryDigestValue=8755036a3051 DependentsAnswer=7538f2f5e68e Edge=7242732afaef EntryAnswer=805c2ff28e1c EntryInputs=76a7f8690dd2 EntryRef=ff109e5089e1 Fill=80f442916429 FillingEvent=5bd4df78ed84 FingerprintInputs=99a6df7f991f FullEvent=5bd4df78ed84 Head=774b4bf88ba4 InputAnswer=cd41ee65565d InputsByTimeDigestValue=a2f06147f4b6 ManifestsByDigestValue=51b3822b29c6 ModuleAnswer=499a03ce9b27 ModuleAnswerModule=c0f679e09f08 ModulesAnswer=6d119571c69e ModulesAnswerModulesItem=a70f39c60b67 ModulesByModuleValue=fc7530ba893a ModulesByModuleValueInputs2=99a6df7f991f Outdated=e820214f66bc OutdatedAnswer=275fb25266b9 OutdatedDependency=dc35dca1b683 PackagesByModuleValue=2b62574b709f PackagesByModuleValuePackagesItem=a7d30558470d PackagesByPackageSeriesValue=07421d8d3411 PackagesByPackageSeriesValueNewest=aba144994370 PackagesByPackageSeriesValueNewestContents=eca2ccf56913 PackagesByPackageSeriesValueNewestContentsPackagesItem=a7d30558470d PackagesByPackageSeriesValueNumbered=c8ffc628599c PackagesByPackageSeriesValueNumberedContents=0def6c0794ee PackagesByPackageSeriesValueNumberedContentsPackagesItem=a7d30558470d Policy=719e2f460c6f PolicyAnswer=46cdf8430557 PredefinedByListValue=ec8e3febe8ac ProvidesAnswer=7538f2f5e68e RegisterAnswer=46cdf8430557 Registration=2de67522639b RegistrationAsked=55adba349c24 RegistrationChangedEvent=99a3268edf41 RegistrationHistoryByModuleVersionValue=0999b5bb7dc7 RegistrationsAnswer=90757c7185f6 RegistrationsByModuleValue=0999b5bb7dc7 RevisionAnswer=258ea5124931 RoomEvent=5bd4df78ed84 SeatDefinitionChangedEvent=e271d24d58f7 SeatDefinitionRemovedEvent=f7d6171111e6 SeatDefinitionsAnswer=0fd6a59fec59 SeatDefinitionsAnswerEntry=d006f68d2be5 SeatDefinitionsAnswerSeatsItem=e271d24d58f7 StepStatuses=4f50aa633e61 TakeInEntry=545ec1528499 ToolchainUsed=43b6d42376fb UnwatchAnswer=46cdf8430557 VersionArtifact=438c49a392b0 VersionEdge=b0f80e83f4dc VersionEntry=33f5b00dbda9 VersionReleasedEvent=4ccf1ea90e7f VersionsAnswer=b59e6e057e7b VersionsByModuleVersionValue=e546dfadb913 VersionsFilledEvent=4cc437912dc3 WatchAnswer=46cdf8430557" ) const ( diff --git a/modules/mesh-delivery-contracts/go/seats/meshdelivery/contract.go b/modules/mesh-delivery-contracts/go/seats/meshdelivery/contract.go index 9e291141a..ddfaac45a 100644 --- a/modules/mesh-delivery-contracts/go/seats/meshdelivery/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/meshdelivery/contract.go @@ -20,7 +20,7 @@ const Form = 1 // whose fields changed while its forms did not (design 47 H2 §780). const ( generatedForms = "1" - generatedFieldsDigest = "5b82311f8d11e063f4390ced15268added07104679f488516bd8cb30b14d22d6" + generatedFieldsDigest = "DeliveriesAnswer=7538f2f5e68e Fill=80f442916429 FillingEvent=5bd4df78ed84 FullEvent=5bd4df78ed84 HeadsByRepositoryBranchValue=b32fd594ee25 Owed=005330be954f OwedByRepositoryNumberHeadActValue=f16ff5733d62 OwedEvent=86af3b56de28 RecordEndedEvent=566edb8684e5 RecordEndedEventAwayItem=44ad7d26bd16 RecordOpenedEvent=9cf9afaa25b4 RecoveryAnswer=8c705e17cdf8 RecoveryMergedEvent=014d4d00d2e5 RoomEvent=5bd4df78ed84 ShowAnswer=7538f2f5e68e SourceAnswer=6ae84f05f10d SourceByBranchValue=31aa822718c0 SourceHead=e722e2d9492f SourceMovedEvent=5231909928e9 SourceMovedEventHeadsItem=774b4bf88ba4 StalledAnswer=7538f2f5e68e" ) const ( diff --git a/modules/mesh-delivery-contracts/go/seats/meshdeliveryview/contract.go b/modules/mesh-delivery-contracts/go/seats/meshdeliveryview/contract.go index df9dc6a33..a9898354c 100644 --- a/modules/mesh-delivery-contracts/go/seats/meshdeliveryview/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/meshdeliveryview/contract.go @@ -19,7 +19,7 @@ const Form = 1 // whose fields changed while its forms did not (design 47 H2 §780). const ( generatedForms = "1" - generatedFieldsDigest = "ac6cec2da8dbfcbc3c88f4e1b3d519539c433bfb755c89a2670c99ec96ac9472" + generatedFieldsDigest = "Answer=17f8d8ed9368 AnswersByAssignmentsProposalViewValue=d392d3cbae6a AnswersByBackupNodeModuleFingerprintViewValue=d392d3cbae6a AnswersByHoldModuleFingerprintViewValue=d392d3cbae6a AnswersByOutsideNodeModuleFingerprintViewValue=d392d3cbae6a AnswersByRecordNodeModuleDigestViewValue=d392d3cbae6a AnswersByRestoreNodeModuleFingerprintViewValue=d392d3cbae6a AnswersByRevertNodeModuleFingerprintViewValue=d392d3cbae6a" ) const ( diff --git a/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner/contract.go b/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner/contract.go index 009bdd941..08bb86a4e 100644 --- a/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/meshpipelinerunner/contract.go @@ -20,7 +20,7 @@ const Form = 1 // whose fields changed while its forms did not (design 47 H2 §780). const ( generatedForms = "1" - generatedFieldsDigest = "2d4126b89f49cd84c62136ef5010ef34c41f541169e64ed2a4c7558100cc5416" + generatedFieldsDigest = "AcceptAnswer=224df0394653 Accepted=d2b011e5090f AskAgainAnswer=224df0394653 CancelAnswer=a0dcc32b3f57 EndAgainAnswer=a0dcc32b3f57 Fill=7a76c9ceb157 FillingEvent=5bd4df78ed84 FullEvent=5bd4df78ed84 KeptAnswer=dfe0d48bc169 KeptByLevelDigestValue=f06c90f7da7f KeptResult=af5f81f189b7 ListAnswer=75717fd670a7 LogEntry=b5c78894cc5b Member=8a103baec01f Mover=5659e54b6dd0 MoverEnded=4b35095f6829 Pipeline=2663792125bf PipelineEnded=7affe524ce3c PipelineEndedEvent=cb44007f7173 PipelineStarted=a3d000f095db PipelineStartedEvent=eaa401af4117 PipelinesByBranchRevisionValue=693580eed498 PipelinesByBranchRunRunValue=693580eed498 PipelinesByBranchSourcePublishedPackageVersionValue=693580eed498 PipelinesByStepsPipelineMoverValue=94de99db7816 PlaceAnswer=a0dcc32b3f57 Published=d9af3024dacc QueueByQueueNextValue=765a2918a728 QueueByRunningPipelineValue=ed94ced4513a QueueByWaitingSequenceValue=99605298ae13 RerunAnswer=9b7efd0df344 ReviewAnswer=f397b8965179 RoomEvent=5bd4df78ed84 RunAnswer=96bd45aa2e62 RunStarted=b280617410c3 RunStartedEvent=0767a9358fa3 Shared=c981cf6aa860 SharedAskedBy=c9b30cc4d0d0 ShowAnswer=2d61e1983cf4 StandsAnswer=0afa3693bf3b StartAnswer=ed94ced4513a StepEndedEvent=799020642c19 StepEvent=64f18c40ed5d StepLogByPipelineValue=ffdde090a101 StepOutputsByPipelineStepArtifactValue=a2f06147f4b6 StepResult=efc001a9bd75 StepStartedEvent=799020642c19 TestCounts=9c1332427159 TestRun=ca5a87f3b6b8 TestRunPackage=a7d30558470d TestRunReader=c9b30cc4d0d0 TestRunsAnswer=7ab81a45ca33 TestRunsDropAnswer=8ee70b35469d ToolchainUsed=43b6d42376fb Wait=21e4ee7a3ef1 WaitEndedEvent=2bf6d38041c0 WaitHeldEvent=2bf6d38041c0 Waiting=ed94ced4513a WhyCarriedAnswer=8e2fcea6479f Widening=e2790a307466" ) const ( diff --git a/modules/mesh-delivery-contracts/go/seats/meshwants/contract.go b/modules/mesh-delivery-contracts/go/seats/meshwants/contract.go index 42628f314..e83bbf8e2 100644 --- a/modules/mesh-delivery-contracts/go/seats/meshwants/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/meshwants/contract.go @@ -14,13 +14,13 @@ const Seat = "mesh-wants" // Form is the form of the seat's values, events and answers this contract was generated at (design 47 H2 §780): // a reader of a value of another form says "form N, this reader knows M". -const Form = 1 +const Form = 2 // The forms and the digest of the fields this contract was generated from: the generator's compare fails a definition // whose fields changed while its forms did not (design 47 H2 §780). const ( - generatedForms = "1" - generatedFieldsDigest = "280599cf6fa081300f8fc5d858a3798579b46dc38604d0087f33fb3f00945b4d" + generatedForms = "2" + generatedFieldsDigest = "Ask=6cb8b82e2fbe AskTakenEvent=6d5d3da7ac39 AsksByAssignmentsProposalValue=0bb5682c7b3b AsksByBackupNodeModuleFingerprintValue=0bb5682c7b3b AsksByHoldModuleFingerprintValue=0bb5682c7b3b AsksByOutsideNodeModuleFingerprintValue=0bb5682c7b3b AsksByRecordNodeModuleDigestValue=0bb5682c7b3b AsksByRestoreNodeModuleFingerprintValue=0bb5682c7b3b AsksByRevertNodeModuleFingerprintValue=0bb5682c7b3b AssignmentEntry=7d2549782eb2 AssignmentRevision=72c8701f7314 AssignmentRevisionCapabilitiesItem=0c89b0717762 AssignmentRevisionEvent=7faff968ce44 AssignmentRevisionsByCandidateGroupHeadsValue=8553b390118d AssignmentRevisionsByEntryDigestValue=4e5ee7a23e5b AssignmentRevisionsByTrunkRevisionValue=8553b390118d BusAnswer=7538f2f5e68e CatalogOf=7a4646fdbea7 Change=28d1f3c5cd32 ChangeAfterItem=30d718c21581 CompositionReader=5a943c1f8ef1 CompositionRun=a64bc503c99a CompositionRunProgram=5a1202df3497 CompositionsAnswer=f8bca93c7f9c CompositionsByGroupHeadsValue=9428965fab8f CompositionsDropAnswer=52803700282a Difference=4011cff516b1 DifferenceAnswer=629237aa39f0 DifferenceEvent=49066d0dff6d DifferenceRefusedItem=0e9caa83ace7 DifferencesByNodeModuleValue=a22487ffadfd DropAnswer=7538f2f5e68e Edge=a71709025a08 EntryAnswer=05adebad70d6 Fill=80f442916429 FillingEvent=5bd4df78ed84 FullEvent=5bd4df78ed84 Held=15abbd6a1a33 HeldCandidate=04872f6afbfa InputAnswer=cd41ee65565d NodeEntryRef=3888ae847653 NotRunning=279b628db0ec PipelineWanted=e1e379c21e59 PipelineWantedEvent=59946b31ab7d PolicyChangedEvent=7538f2f5e68e RevisionAnswer=39002c770cbd RoomEvent=5bd4df78ed84 Shared=c981cf6aa860 SharedAskedBy=c9b30cc4d0d0 StepAccept=18efeefb6c34 StepEnded=edd08ab1a18b StepEndedEvent=207787118dac StepProgressEvent=8215e490ea8d StepRun=b975f402601a UpgradeAnswer=7538f2f5e68e Wait=951500be820c WaitEndedEvent=2bf6d38041c0 WaitHeldEvent=2bf6d38041c0 WantedEvent=58cf7a9f646b WantsByHeldModuleFingerprintValue=ff14aa998a5d WantsByWantNodeModuleValue=ab7c6799fd5d WantsByWantNodeNodeValue=a737a2108d53" ) const ( @@ -32,6 +32,7 @@ const ( VerbInput = "input" VerbCompositions = "compositions" VerbCompositionsDrop = "compositions-drop" + VerbDrop = "drop" ) const ( @@ -51,16 +52,17 @@ const ( EventRoom = "room" EventStepEnded = "step-ended" EventStepProgress = "step-progress" + EventAskTaken = "ask-taken" ) // Verbs is every verb the seat serves, in its definition's order: a new copy each call. func Verbs() []string { - return []string{VerbUpgrade, VerbBus, VerbRevision, VerbEntry, VerbDifference, VerbInput, VerbCompositions, VerbCompositionsDrop} + return []string{VerbUpgrade, VerbBus, VerbRevision, VerbEntry, VerbDifference, VerbInput, VerbCompositions, VerbCompositionsDrop, VerbDrop} } // Events is every event published on the seat's subject: a new copy each call. func Events() []string { - return []string{EventPolicyChanged, EventAssignmentRevision, EventDifference, EventWanted, EventPipelineWanted, EventWaitHeld, EventWaitEnded, EventFilling, EventFull, EventRoom, EventStepEnded, EventStepProgress} + return []string{EventPolicyChanged, EventAssignmentRevision, EventDifference, EventWanted, EventPipelineWanted, EventWaitHeld, EventWaitEnded, EventFilling, EventFull, EventRoom, EventStepEnded, EventStepProgress, EventAskTaken} } // Family is where the seat's events are kept: the shared events stream, filtered to the seat's subjects. @@ -132,6 +134,12 @@ func SubjectStepProgress(node string) string { // SubjectStepProgressAll hears every step-progress. const SubjectStepProgressAll = "mesh.seat.mesh-wants.event.step-progress.*" +// SubjectAskTaken is where ask-taken is published, on mesh.seat.mesh-wants.event.ask-taken.. +func SubjectAskTaken(ask string) string { return "mesh.seat.mesh-wants.event.ask-taken." + ask } + +// SubjectAskTakenAll hears every ask-taken. +const SubjectAskTakenAll = "mesh.seat.mesh-wants.event.ask-taken.*" + // AcceptSubjectStep is where step is sent. const AcceptSubjectStep = "mesh.seat.mesh-wants.accept.step" @@ -1238,6 +1246,19 @@ type CompositionsDropAnswer struct { Run CompositionRun `json:"run"` } +// DropInput is what drop takes. +type DropInput struct { + // who drops it + By string `json:"by,omitempty"` + // the ask's id + ID string `json:"id"` + // why the caller no longer waits + Why string `json:"why"` +} + +// DropAnswer is what drop answers. +type DropAnswer = map[string]any + // StepAccept is the body of step. type StepAccept = StepRun @@ -1332,6 +1353,18 @@ const ( StepProgressEventPhaseReport = "report" ) +// AskTakenEvent is the body of the event ask-taken. +type AskTakenEvent struct { + // the ask's id + Ask string `json:"ask"` + // when it was taken + At time.Time `json:"at"` + // is the form of what this value carries, left out while it is 1 (design 47 H2 §780). + Form int64 `json:"form,omitempty"` + // the node whose holder took it + Node string `json:"node"` +} + // WantsByWantNodeModuleValue is one value of the state wants under the key want... type WantsByWantNodeModuleValue struct { // again or skip @@ -1349,8 +1382,10 @@ type WantsByWantNodeModuleValue struct { Removed bool `json:"removed,omitempty"` // live: the operator's answer to a held revert, to start the reverted build on the live data as it is, with nothing restored (design 47 G section 710) Revert string `json:"revert,omitempty"` - Self bool `json:"self,omitempty"` - V int64 `json:"v,omitempty"` + // the pipeline sequence of the composition run that wrote this want, in decimal: the holder writes by compare-and-set refusing a lower run, and the node-engine applies a want again only when its run is newer than the one it applied (design 47 H2 §813 (1); H-A-355 (1)) + Run string `json:"run,omitempty"` + Self bool `json:"self,omitempty"` + V int64 `json:"v,omitempty"` // the version released at the build the want names: the newest released on the placement's branch whose pipeline passed, or the placement's build's (design 47 H §750) Version string `json:"version,omitempty"` Words string `json:"words,omitempty"` @@ -1522,6 +1557,15 @@ func DecodeCompositionsDropAnswer(raw []byte) (CompositionsDropAnswer, int, erro return v, formRead(raw), nil } +// DecodeDropAnswer reads a DropAnswer as another part wrote it: a field this reader does not know is left unread, never refused; the form read is answered, 1 when absent (design 47 H2 §780). +func DecodeDropAnswer(raw []byte) (DropAnswer, int, error) { + var v DropAnswer + if err := json.Unmarshal(raw, &v); err != nil { + return v, 0, err + } + return v, formRead(raw), nil +} + // DecodePolicyChangedEvent reads a PolicyChangedEvent as another part wrote it: a field this reader does not know is left unread, never refused; the form read is answered, 1 when absent (design 47 H2 §780). func DecodePolicyChangedEvent(raw []byte) (PolicyChangedEvent, int, error) { var v PolicyChangedEvent @@ -1630,6 +1674,15 @@ func DecodeStepProgressEvent(raw []byte) (StepProgressEvent, int, error) { return v, formRead(raw), nil } +// DecodeAskTakenEvent reads a AskTakenEvent as another part wrote it: a field this reader does not know is left unread, never refused; the form read is answered, 1 when absent (design 47 H2 §780). +func DecodeAskTakenEvent(raw []byte) (AskTakenEvent, int, error) { + var v AskTakenEvent + if err := json.Unmarshal(raw, &v); err != nil { + return v, 0, err + } + return v, formRead(raw), nil +} + // formRead is the form a value says on the wire: 1 when it says none, or is no object. func formRead(raw []byte) int { var f struct { diff --git a/modules/mesh-delivery-contracts/go/seats/meshwants/contract_test.go b/modules/mesh-delivery-contracts/go/seats/meshwants/contract_test.go index d623d162e..0dd21ea75 100644 --- a/modules/mesh-delivery-contracts/go/seats/meshwants/contract_test.go +++ b/modules/mesh-delivery-contracts/go/seats/meshwants/contract_test.go @@ -65,6 +65,8 @@ func TestFixtures(t *testing.T) { decode: func(b []byte) (any, error) { var v StepEndedEvent; err := json.Unmarshal(b, &v); return v, err }, subjectIs: regexp.MustCompile("^mesh\\.seat\\.mesh-wants\\.event\\.step-ended\\.[^.*> ]+$")}, {name: "C1/AC1 a composition step's progress, naming the runs it waits on", subject: "mesh.seat.mesh-wants.event.step-progress.anchor", given: "{\"ask\":\"a1b2\",\"asker\":\"assigner\",\"at\":\"2026-11-17T10:01:00Z\",\"phase\":\"run\",\"shared\":[{\"ask\":\"r1a2b3\",\"machine\":\"anchor\",\"run\":\"main.12.anchor\"}]}", wire: "{\"ask\":\"a1b2\",\"asker\":\"assigner\",\"at\":\"2026-11-17T10:01:00Z\",\"phase\":\"run\",\"shared\":[{\"ask\":\"r1a2b3\",\"machine\":\"anchor\",\"run\":\"main.12.anchor\"}]}", decode: func(b []byte) (any, error) { var v StepProgressEvent; err := json.Unmarshal(b, &v); return v, err }, subjectIs: regexp.MustCompile("^mesh\\.seat\\.mesh-wants\\.event\\.step-progress\\.[^.*> ]+$")}, + {name: "an ask taken at the pull", subject: "mesh.seat.mesh-wants.event.ask-taken.main-3589-mesh-sdk-unit", given: "{\"ask\":\"main-3589-mesh-sdk-unit\",\"at\":\"2026-11-21T22:00:00Z\",\"node\":\"anchor\"}", wire: "{\"ask\":\"main-3589-mesh-sdk-unit\",\"at\":\"2026-11-21T22:00:00Z\",\"node\":\"anchor\"}", + decode: func(b []byte) (any, error) { var v AskTakenEvent; err := json.Unmarshal(b, &v); return v, err }, subjectIs: regexp.MustCompile("^mesh\\.seat\\.mesh-wants\\.event\\.ask-taken\\.[^.*> ]+$")}, {name: "a want written from a passed pipeline, its version and rank", subject: "", given: "{\"fp\":\"src2:b427bdde1f100e2f52490cfa9df0c5112dd3700226b4892349f0c14a15a4af56\",\"pipeline\":\"main.3589\",\"rank\":2,\"v\":1,\"version\":\"0.1.15\"}", wire: "{\"fp\":\"src2:b427bdde1f100e2f52490cfa9df0c5112dd3700226b4892349f0c14a15a4af56\",\"pipeline\":\"main.3589\",\"rank\":2,\"v\":1,\"version\":\"0.1.15\"}", decode: func(b []byte) (any, error) { var v WantsByWantNodeModuleValue @@ -77,6 +79,12 @@ func TestFixtures(t *testing.T) { err := json.Unmarshal(b, &v) return v, err }, subjectIs: nil}, + {name: "a want written by a composition run, at form 2", subject: "", given: "{\"form\":2,\"fp\":\"src2:b427bdde1f100e2f52490cfa9df0c5112dd3700226b4892349f0c14a15a4af56\",\"pipeline\":\"main.3589\",\"rank\":2,\"run\":\"3589\",\"v\":1,\"version\":\"0.1.15\"}", wire: "{\"form\":2,\"fp\":\"src2:b427bdde1f100e2f52490cfa9df0c5112dd3700226b4892349f0c14a15a4af56\",\"pipeline\":\"main.3589\",\"rank\":2,\"run\":\"3589\",\"v\":1,\"version\":\"0.1.15\"}", + decode: func(b []byte) (any, error) { + var v WantsByWantNodeModuleValue + err := json.Unmarshal(b, &v) + return v, err + }, subjectIs: nil}, {name: "a node's own want", subject: "", given: "{\"composed\":\"sha256:aa\",\"self\":true,\"v\":1}", wire: "{\"composed\":\"sha256:aa\",\"self\":true,\"v\":1}", decode: func(b []byte) (any, error) { var v WantsByWantNodeNodeValue diff --git a/modules/mesh-delivery-contracts/go/seats/nodebuildgo/contract.go b/modules/mesh-delivery-contracts/go/seats/nodebuildgo/contract.go index 929db10c6..697453b45 100644 --- a/modules/mesh-delivery-contracts/go/seats/nodebuildgo/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/nodebuildgo/contract.go @@ -23,7 +23,7 @@ const FormBuildStep = 1 // whose fields changed while its forms did not (design 47 H2 §780). const ( generatedForms = "1 build-step:1" - generatedFieldsDigest = "218f11fe3450203f7becf249c56ea56aaf441c3d4c8ad46570c29f700d175377" + generatedFieldsDigest = "AskArtifact=35eb85c27e97 AskTaken=8c917075eed4 AskTakenEvent=e4fc9b81e066 BuiltArtifact=b5fcef7a8b58 BuiltArtifactResolvedItem=3bcbbcfd1a1f Capacity=b40cca7ccdfa CheckAccept=ef89c6962ae4 CheckRunAccept=ef89c6962ae4 CheckStepAccept=ef89c6962ae4 CurrentAnswer=7538f2f5e68e DeliveryAccept=ef89c6962ae4 DeliveryStepAccept=ef89c6962ae4 DetectedStep=a6fcd7d0eca4 DetectedSteps=05198185c776 DetectedStepsByModuleArtifactValue=cb35b5775cc6 Drop=fb4637978e86 DropAnswer=7538f2f5e68e Fetch=6e12677bbc2c FetchAnswer=46fc3d5bd7ee FetchBesideItem=774b4bf88ba4 FetchBuildsItem=aee5adc97246 FetchPackage=20d1668a0eee FetchRefusal=de1518848b4c KeptArtifactAnswer=706729f8ccb9 KeptResult=8657683cdcd7 LevelAnswer=143c69c28a6a LevelAnswerDigest=d54b7fd7b1da LevelAnswerDigestNeedsItem=946b37d1d4a1 LevelAnswerDigestPackagesItem=a7d30558470d LevelAnswerKeptItem=85d3c2f78632 LevelAnswerUnmetItem=946b37d1d4a1 ModuleTree=00bb59e9f262 OutputAnswer=a3b42bd5e791 Pause=d6521e0cdd1e PauseAnswer=7538f2f5e68e PausesByCapacityNodeValue=5392cf505c80 PausesByDroppedIDValue=0e15ac9cacbd PausesByPausedNodeValue=d111aad0f0cf PlacedBeside=53479337ff18 Program=b48ae74f34e0 RecheckAccept=ef89c6962ae4 ResumeAnswer=7538f2f5e68e RunHead=774b4bf88ba4 RunInput=3dc41505a4b7 RunJob=88af2a7f432b RunProgram=6fd636999d54 Step=607e5f1a91cc StepAsk=9a8c9c8918b1 StepAskBuild=de784b6c05da StepAskCheck=b77941df6dea StepAskCompose=4c6a08e10231 StepEnded=45ff4650b620 StepEndedEvent=207787118dac StepProgress=d25781cc895a StepProgressEvent=179344ce0ca2 StepResult=67f88be36d0e StepRun=6d551ed0ed46 StepsAnswer=2c02cac2df23 StepsByAskerNodeIDValue=50ccfd4cebd8 StepsByNodeIDValue=50ccfd4cebd8 TakenVersion=1b8d0547f61e TestCounts=9c1332427159 Toolchain=8ecb7debf9ad ToolchainReported=d26392767c50 ToolchainReportedEvent=fa0a431c9c7b ToolchainUsed=6cc7ccabc9f8 ToolchainsByNodeLanguageValue=f97d1dd27613" ) const ( diff --git a/modules/mesh-delivery-contracts/go/seats/nodebuildimage/contract.go b/modules/mesh-delivery-contracts/go/seats/nodebuildimage/contract.go index 2797a86a0..73c3ba14f 100644 --- a/modules/mesh-delivery-contracts/go/seats/nodebuildimage/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/nodebuildimage/contract.go @@ -23,7 +23,7 @@ const FormBuildStep = 1 // whose fields changed while its forms did not (design 47 H2 §780). const ( generatedForms = "1 build-step:1" - generatedFieldsDigest = "3c8081a3209e1638ad3cd1a0a3abe1ae979347bb22e7f0c35a2cc132df7e21b4" + generatedFieldsDigest = "AskArtifact=35eb85c27e97 AskTaken=8c917075eed4 AskTakenEvent=e4fc9b81e066 BuiltArtifact=b5fcef7a8b58 BuiltArtifactResolvedItem=3bcbbcfd1a1f Capacity=b40cca7ccdfa CheckAccept=ef89c6962ae4 CheckStepAccept=ef89c6962ae4 CurrentAnswer=7538f2f5e68e DeliveryAccept=ef89c6962ae4 DeliveryStepAccept=ef89c6962ae4 DetectedStep=a6fcd7d0eca4 DetectedSteps=05198185c776 DetectedStepsByModuleArtifactValue=cb35b5775cc6 Drop=fb4637978e86 DropAnswer=7538f2f5e68e Fetch=6e12677bbc2c FetchAnswer=46fc3d5bd7ee FetchBesideItem=774b4bf88ba4 FetchBuildsItem=aee5adc97246 FetchPackage=20d1668a0eee FetchRefusal=de1518848b4c KeptArtifactAnswer=706729f8ccb9 KeptResult=8657683cdcd7 LevelAnswer=143c69c28a6a LevelAnswerDigest=d54b7fd7b1da LevelAnswerDigestNeedsItem=946b37d1d4a1 LevelAnswerDigestPackagesItem=a7d30558470d LevelAnswerKeptItem=85d3c2f78632 LevelAnswerUnmetItem=946b37d1d4a1 ModuleTree=00bb59e9f262 OutputAnswer=a3b42bd5e791 Pause=d6521e0cdd1e PauseAnswer=7538f2f5e68e PausesByCapacityNodeValue=5392cf505c80 PausesByDroppedIDValue=0e15ac9cacbd PausesByPausedNodeValue=d111aad0f0cf PlacedBeside=53479337ff18 Program=b48ae74f34e0 RecheckAccept=ef89c6962ae4 ResumeAnswer=7538f2f5e68e RunHead=774b4bf88ba4 RunInput=3dc41505a4b7 RunJob=88af2a7f432b RunProgram=6fd636999d54 Step=607e5f1a91cc StepAsk=9a8c9c8918b1 StepAskBuild=de784b6c05da StepAskCheck=b77941df6dea StepAskCompose=4c6a08e10231 StepEnded=45ff4650b620 StepEndedEvent=207787118dac StepProgress=d25781cc895a StepProgressEvent=179344ce0ca2 StepResult=67f88be36d0e StepRun=6d551ed0ed46 StepsAnswer=2c02cac2df23 StepsByAskerNodeIDValue=50ccfd4cebd8 StepsByNodeIDValue=50ccfd4cebd8 TakenVersion=1b8d0547f61e TestCounts=9c1332427159 Toolchain=8ecb7debf9ad ToolchainReported=d26392767c50 ToolchainReportedEvent=fa0a431c9c7b ToolchainUsed=6cc7ccabc9f8 ToolchainsByNodeLanguageValue=f97d1dd27613" ) const ( diff --git a/modules/mesh-delivery-contracts/go/seats/nodebuildnode/contract.go b/modules/mesh-delivery-contracts/go/seats/nodebuildnode/contract.go index 5b3a5f611..e512702ac 100644 --- a/modules/mesh-delivery-contracts/go/seats/nodebuildnode/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/nodebuildnode/contract.go @@ -23,7 +23,7 @@ const FormBuildStep = 1 // whose fields changed while its forms did not (design 47 H2 §780). const ( generatedForms = "1 build-step:1" - generatedFieldsDigest = "3c8081a3209e1638ad3cd1a0a3abe1ae979347bb22e7f0c35a2cc132df7e21b4" + generatedFieldsDigest = "AskArtifact=35eb85c27e97 AskTaken=8c917075eed4 AskTakenEvent=e4fc9b81e066 BuiltArtifact=b5fcef7a8b58 BuiltArtifactResolvedItem=3bcbbcfd1a1f Capacity=b40cca7ccdfa CheckAccept=ef89c6962ae4 CheckStepAccept=ef89c6962ae4 CurrentAnswer=7538f2f5e68e DeliveryAccept=ef89c6962ae4 DeliveryStepAccept=ef89c6962ae4 DetectedStep=a6fcd7d0eca4 DetectedSteps=05198185c776 DetectedStepsByModuleArtifactValue=cb35b5775cc6 Drop=fb4637978e86 DropAnswer=7538f2f5e68e Fetch=6e12677bbc2c FetchAnswer=46fc3d5bd7ee FetchBesideItem=774b4bf88ba4 FetchBuildsItem=aee5adc97246 FetchPackage=20d1668a0eee FetchRefusal=de1518848b4c KeptArtifactAnswer=706729f8ccb9 KeptResult=8657683cdcd7 LevelAnswer=143c69c28a6a LevelAnswerDigest=d54b7fd7b1da LevelAnswerDigestNeedsItem=946b37d1d4a1 LevelAnswerDigestPackagesItem=a7d30558470d LevelAnswerKeptItem=85d3c2f78632 LevelAnswerUnmetItem=946b37d1d4a1 ModuleTree=00bb59e9f262 OutputAnswer=a3b42bd5e791 Pause=d6521e0cdd1e PauseAnswer=7538f2f5e68e PausesByCapacityNodeValue=5392cf505c80 PausesByDroppedIDValue=0e15ac9cacbd PausesByPausedNodeValue=d111aad0f0cf PlacedBeside=53479337ff18 Program=b48ae74f34e0 RecheckAccept=ef89c6962ae4 ResumeAnswer=7538f2f5e68e RunHead=774b4bf88ba4 RunInput=3dc41505a4b7 RunJob=88af2a7f432b RunProgram=6fd636999d54 Step=607e5f1a91cc StepAsk=9a8c9c8918b1 StepAskBuild=de784b6c05da StepAskCheck=b77941df6dea StepAskCompose=4c6a08e10231 StepEnded=45ff4650b620 StepEndedEvent=207787118dac StepProgress=d25781cc895a StepProgressEvent=179344ce0ca2 StepResult=67f88be36d0e StepRun=6d551ed0ed46 StepsAnswer=2c02cac2df23 StepsByAskerNodeIDValue=50ccfd4cebd8 StepsByNodeIDValue=50ccfd4cebd8 TakenVersion=1b8d0547f61e TestCounts=9c1332427159 Toolchain=8ecb7debf9ad ToolchainReported=d26392767c50 ToolchainReportedEvent=fa0a431c9c7b ToolchainUsed=6cc7ccabc9f8 ToolchainsByNodeLanguageValue=f97d1dd27613" ) const ( diff --git a/modules/mesh-delivery-contracts/go/seats/npmpackageregistry/contract.go b/modules/mesh-delivery-contracts/go/seats/npmpackageregistry/contract.go index 2c8cc8210..f040a1268 100644 --- a/modules/mesh-delivery-contracts/go/seats/npmpackageregistry/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/npmpackageregistry/contract.go @@ -21,7 +21,7 @@ const FormRegistry = 1 // whose fields changed while its forms did not (design 47 H2 §780). const ( generatedForms = "1 registry:1" - generatedFieldsDigest = "b80afb127966ec05c9c822eab0ab43488e6ee0a9d0f43cb1334e4fa32f07bb35" + generatedFieldsDigest = "Artifact=79361e4ab1cd KeptEvent=ec3ef89ef8a7 Outcome=1e66f7bf6725 PublishAnswer=a0df0b922e1e PublishPartAnswer=aebe3c6c89e9 PublishedEvent=ec3ef89ef8a7 RefusedEvent=ec3ef89ef8a7 RemoveAnswer=bccb5a322d69 RemovedEvent=ec3ef89ef8a7 VersionsAnswer=47e11ca2aea9" ) const ( diff --git a/modules/mesh-delivery-contracts/go/seats/ociartifactregistry/contract.go b/modules/mesh-delivery-contracts/go/seats/ociartifactregistry/contract.go index a02b05089..8c68e1310 100644 --- a/modules/mesh-delivery-contracts/go/seats/ociartifactregistry/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/ociartifactregistry/contract.go @@ -22,7 +22,7 @@ const FormRegistry = 1 // whose fields changed while its forms did not (design 47 H2 §780). const ( generatedForms = "1 registry:1" - generatedFieldsDigest = "8e4c974b178e7cef0139786b22ae88e0a82c036d2283ca621957a769932f9a59" + generatedFieldsDigest = "Artifact=79361e4ab1cd HeldEvent=b6d4c12500df Hold=c5a97a2f2d5a HoldAnswer=7d536ccb729f HoldsBySeatNameDigestValue=db093998a869 KeptEvent=ec3ef89ef8a7 ListAnswer=ca49dd7f20ee Listed=b9f1d1232e64 Outcome=1e66f7bf6725 PublishAnswer=a0df0b922e1e PublishPartAnswer=aebe3c6c89e9 PublishedEvent=ec3ef89ef8a7 RefusedEvent=ec3ef89ef8a7 ReleaseAnswer=d30bd6000a16 ReleasedEvent=b6d4c12500df RemoveAnswer=bccb5a322d69 RemovedEvent=ec3ef89ef8a7 Repository=740e54e0b3b0 VersionsAnswer=47e11ca2aea9 WindowsByCallerValue=23d9294dde92 WindowsByCallerValueDroppedItem=d748f0e58825" ) const ( diff --git a/modules/mesh-delivery-contracts/seats/mesh-builds/fixtures/events.json b/modules/mesh-delivery-contracts/seats/mesh-builds/fixtures/events.json index dd3723f73..174a449b9 100644 --- a/modules/mesh-delivery-contracts/seats/mesh-builds/fixtures/events.json +++ b/modules/mesh-delivery-contracts/seats/mesh-builds/fixtures/events.json @@ -95,5 +95,29 @@ ], "said": "nats:program did not build" } + }, + { + "name": "an ask taken at the pull", + "of": "event:ask-taken", + "subject": "mesh.seat.mesh-builds.event.ask-taken.main-3589-mesh-sdk-unit", + "given": { + "ask": "main-3589-mesh-sdk-unit", + "node": "anchor", + "at": "2026-11-21T22:00:00Z" + } + }, + { + "name": "a version reserved at a fingerprint", + "of": "event:version-reserved", + "subject": "mesh.seat.mesh-builds.event.version-reserved", + "given": { + "module": "mesh-sdk", + "artifact": "mesh-sdk:go", + "path": "git.novox.be/novox/mesh-sdk/go", + "version": "0.1.21", + "fingerprint": "sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef", + "revision": "412", + "form": 1 + } } ] diff --git a/modules/mesh-delivery-contracts/seats/mesh-builds/seat.json b/modules/mesh-delivery-contracts/seats/mesh-builds/seat.json index 4f68b5ebb..311c58e46 100644 --- a/modules/mesh-delivery-contracts/seats/mesh-builds/seat.json +++ b/modules/mesh-delivery-contracts/seats/mesh-builds/seat.json @@ -122,6 +122,36 @@ "published" ] } + }, + { + "name": "drop", + "description": "End an ask on the seat's work queue for a caller that no longer waits for it (its step ended by its bound): one waiting is ended dropped when it is pulled, one taken is cancelled; both end the step dropped, naming who dropped it and why, so no holder works on it after (design 47 H2 §778; ADR 0664 §4).", + "input": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "the ask's id" + }, + "by": { + "type": "string", + "description": "who drops it" + }, + "why": { + "type": "string", + "description": "why the caller no longer waits" + } + }, + "required": [ + "id", + "why" + ] + }, + "answer": { + "type": "object", + "description": "whether the ask was held here" + }, + "class": "act" } ], "accepts": [ @@ -163,6 +193,71 @@ "max-age-days": 90, "max-mib": 32 } + }, + { + "name": "ask-taken", + "subject": "ask-taken.", + "body": { + "type": "object", + "properties": { + "ask": { + "type": "string", + "description": "the ask's id" + }, + "node": { + "type": "string", + "description": "the node whose holder took it" + }, + "at": { + "type": "string", + "format": "date-time", + "description": "when it was taken" + } + }, + "required": [ + "ask", + "node", + "at" + ], + "description": "the seat's holder took the ask from the seat's work queue, at the pull: only the holder says it; the runner arms the ask's bound from it (design 47 H2 §777, §778)" + } + }, + { + "name": "version-reserved", + "body": { + "type": "object", + "properties": { + "module": { + "type": "string" + }, + "artifact": { + "type": "string" + }, + "path": { + "type": "string", + "description": "the package's path" + }, + "version": { + "type": "string" + }, + "fingerprint": { + "type": "string" + }, + "revision": { + "type": "string", + "description": "the catalog revision the reservation was made at" + } + }, + "required": [ + "module", + "artifact", + "path", + "version", + "fingerprint", + "revision" + ], + "description": "the builder reserved a version for a module's artifact at a fingerprint: the indexer re-pins once, at the reservation (design 47 H2 §805)" + } } ], "family": { diff --git a/modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/events.json b/modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/events.json index 3381500a1..1bd9c8815 100644 --- a/modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/events.json +++ b/modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/events.json @@ -352,5 +352,15 @@ } ] } + }, + { + "name": "an ask taken at the pull", + "of": "event:ask-taken", + "subject": "mesh.seat.mesh-wants.event.ask-taken.main-3589-mesh-sdk-unit", + "given": { + "ask": "main-3589-mesh-sdk-unit", + "node": "anchor", + "at": "2026-11-21T22:00:00Z" + } } ] diff --git a/modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/states.json b/modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/states.json index d5e7b03eb..43a7e17a7 100644 --- a/modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/states.json +++ b/modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/states.json @@ -19,6 +19,19 @@ "version": "0.1.14" } }, + { + "name": "a want written by a composition run, at form 2", + "of": "state:wants/want..", + "given": { + "v": 1, + "fp": "src2:b427bdde1f100e2f52490cfa9df0c5112dd3700226b4892349f0c14a15a4af56", + "version": "0.1.15", + "pipeline": "main.3589", + "rank": 2, + "run": "3589", + "form": 2 + } + }, { "name": "a node's own want", "of": "state:wants/want..node", diff --git a/modules/mesh-delivery-contracts/seats/mesh-wants/seat.json b/modules/mesh-delivery-contracts/seats/mesh-wants/seat.json index b827436e9..69c859799 100644 --- a/modules/mesh-delivery-contracts/seats/mesh-wants/seat.json +++ b/modules/mesh-delivery-contracts/seats/mesh-wants/seat.json @@ -277,6 +277,36 @@ "run" ] } + }, + { + "name": "drop", + "description": "End an ask on the seat's work queue for a caller that no longer waits for it (its step ended by its bound): one waiting is ended dropped when it is pulled, one taken is cancelled; both end the step dropped, naming who dropped it and why, so no holder works on it after (design 47 H2 §778; ADR 0664 §4).", + "input": { + "type": "object", + "properties": { + "id": { + "type": "string", + "description": "the ask's id" + }, + "by": { + "type": "string", + "description": "who drops it" + }, + "why": { + "type": "string", + "description": "why the caller no longer waits" + } + }, + "required": [ + "id", + "why" + ] + }, + "answer": { + "type": "object", + "description": "whether the ask was held here" + }, + "class": "act" } ], "accepts": [ @@ -525,6 +555,34 @@ "at" ] } + }, + { + "name": "ask-taken", + "subject": "ask-taken.", + "body": { + "type": "object", + "properties": { + "ask": { + "type": "string", + "description": "the ask's id" + }, + "node": { + "type": "string", + "description": "the node whose holder took it" + }, + "at": { + "type": "string", + "format": "date-time", + "description": "when it was taken" + } + }, + "required": [ + "ask", + "node", + "at" + ], + "description": "the seat's holder took the ask from the seat's work queue, at the pull: only the holder says it; the runner arms the ask's bound from it (design 47 H2 §777, §778)" + } } ], "family": { @@ -597,6 +655,10 @@ "type": "integer", "minimum": 1, "description": "the mover's tier in that pipeline's delivery order, from 1; the node-engine applies one pipeline's wants by it; absent with pipeline (design 47 H §750, §771, H-A-37)" + }, + "run": { + "type": "string", + "description": "the pipeline sequence of the composition run that wrote this want, in decimal: the holder writes by compare-and-set refusing a lower run, and the node-engine applies a want again only when its run is newer than the one it applied (design 47 H2 §813 (1); H-A-355 (1))" } } }, @@ -1786,5 +1848,6 @@ "step": "place", "on": "every" } - ] + ], + "form": 2 } diff --git a/modules/mesh-delivery-contracts/ts/seats/meshbuilds/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/meshbuilds/index.d.ts index c2e1f26e3..dc1a4d4c9 100644 --- a/modules/mesh-delivery-contracts/ts/seats/meshbuilds/index.d.ts +++ b/modules/mesh-delivery-contracts/ts/seats/meshbuilds/index.d.ts @@ -7,6 +7,7 @@ export declare const seat: "mesh-builds"; export declare const verbs: { readonly reserved: "reserved"; readonly published: "published"; + readonly drop: "drop"; }; export declare const accepts: { @@ -17,6 +18,8 @@ export declare const events: { readonly packagePublished: "package-published"; readonly toolchainAgreed: "toolchain-agreed"; readonly stepEnded: "step-ended"; + readonly askTaken: "ask-taken"; + readonly versionReserved: "version-reserved"; }; export declare const family: { readonly name: "mesh-builds.events"; readonly maxAgeDays: 7 }; @@ -35,6 +38,12 @@ export declare function stepEndedSubject(node: string): string; export declare const stepEndedSubjectAll: "mesh.seat.mesh-builds.event.step-ended.*"; +export declare function askTakenSubject(ask: string): string; + +export declare const askTakenSubjectAll: "mesh.seat.mesh-builds.event.ask-taken.*"; + +export declare const versionReservedSubject: "mesh.seat.mesh-builds.event.version-reserved"; + export declare const stepSubject: "mesh.seat.mesh-builds.accept.step"; /** one entry a candidate's build builds: a module at the fingerprint of its build inputs, and the commit that fingerprint was read at */ @@ -204,6 +213,19 @@ export interface PublishedAnswer { "version"?: string; } +/** is what drop takes. */ +export interface DropInput { + /** who drops it */ + "by"?: string; + /** the ask's id */ + "id": string; + /** why the caller no longer waits */ + "why": string; +} + +/** is what drop answers. */ +export type DropAnswer = Record; + /** is the body of step. */ export type StepAccept = StepRun; @@ -216,3 +238,29 @@ export type ToolchainAgreedEvent = ToolchainAgreed; /** is the body of the event step-ended. */ export type StepEndedEvent = StepEnded; +/** is the body of the event ask-taken. */ +export interface AskTakenEvent { + /** the ask's id */ + "ask": string; + /** when it was taken */ + "at": string; + /** is the form of what this value carries, left out while it is 1 (design 47 H2 §780). */ + "form"?: number; + /** the node whose holder took it */ + "node": string; +} + +/** is the body of the event version-reserved. */ +export interface VersionReservedEvent { + "artifact": string; + "fingerprint": string; + /** is the form of what this value carries, left out while it is 1 (design 47 H2 §780). */ + "form"?: number; + "module": string; + /** the package's path */ + "path": string; + /** the catalog revision the reservation was made at */ + "revision": string; + "version": string; +} + diff --git a/modules/mesh-delivery-contracts/ts/seats/meshbuilds/index.js b/modules/mesh-delivery-contracts/ts/seats/meshbuilds/index.js index 6710b83b9..f454abb13 100644 --- a/modules/mesh-delivery-contracts/ts/seats/meshbuilds/index.js +++ b/modules/mesh-delivery-contracts/ts/seats/meshbuilds/index.js @@ -7,6 +7,7 @@ export const seat = "mesh-builds"; export const verbs = { reserved: "reserved", published: "published", + drop: "drop", }; export const accepts = { @@ -17,6 +18,8 @@ export const events = { packagePublished: "package-published", toolchainAgreed: "toolchain-agreed", stepEnded: "step-ended", + askTaken: "ask-taken", + versionReserved: "version-reserved", }; export const family = { name: "mesh-builds.events", maxAgeDays: 7 }; @@ -37,5 +40,13 @@ export function stepEndedSubject(node) { export const stepEndedSubjectAll = "mesh.seat.mesh-builds.event.step-ended.*"; +export function askTakenSubject(ask) { + return "mesh.seat.mesh-builds.event.ask-taken." + ask; +} + +export const askTakenSubjectAll = "mesh.seat.mesh-builds.event.ask-taken.*"; + +export const versionReservedSubject = "mesh.seat.mesh-builds.event.version-reserved"; + export const stepSubject = "mesh.seat.mesh-builds.accept.step"; diff --git a/modules/mesh-delivery-contracts/ts/seats/meshwants/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/meshwants/index.d.ts index 007909112..b9f4ef056 100644 --- a/modules/mesh-delivery-contracts/ts/seats/meshwants/index.d.ts +++ b/modules/mesh-delivery-contracts/ts/seats/meshwants/index.d.ts @@ -13,6 +13,7 @@ export declare const verbs: { readonly input: "input"; readonly compositions: "compositions"; readonly compositionsDrop: "compositions-drop"; + readonly drop: "drop"; }; export declare const accepts: { @@ -32,6 +33,7 @@ export declare const events: { readonly room: "room"; readonly stepEnded: "step-ended"; readonly stepProgress: "step-progress"; + readonly askTaken: "ask-taken"; }; export declare const family: { readonly name: "mesh-wants.events"; readonly maxAgeDays: 7 }; @@ -74,6 +76,10 @@ export declare function stepProgressSubject(node: string): string; export declare const stepProgressSubjectAll: "mesh.seat.mesh-wants.event.step-progress.*"; +export declare function askTakenSubject(ask: string): string; + +export declare const askTakenSubjectAll: "mesh.seat.mesh-wants.event.ask-taken.*"; + export declare const stepSubject: "mesh.seat.mesh-wants.accept.step"; export declare const states: { @@ -666,6 +672,19 @@ export interface CompositionsDropAnswer { "run": CompositionRun; } +/** is what drop takes. */ +export interface DropInput { + /** who drops it */ + "by"?: string; + /** the ask's id */ + "id": string; + /** why the caller no longer waits */ + "why": string; +} + +/** is what drop answers. */ +export type DropAnswer = Record; + /** is the body of step. */ export type StepAccept = StepRun; @@ -752,6 +771,18 @@ export interface StepProgressEvent { "shared"?: Shared[]; } +/** is the body of the event ask-taken. */ +export interface AskTakenEvent { + /** the ask's id */ + "ask": string; + /** when it was taken */ + "at": string; + /** is the form of what this value carries, left out while it is 1 (design 47 H2 §780). */ + "form"?: number; + /** the node whose holder took it */ + "node": string; +} + /** is one value of the state wants under the key want... */ export interface WantsByWantNodeModuleValue { /** again or skip */ @@ -769,6 +800,8 @@ export interface WantsByWantNodeModuleValue { "removed"?: boolean; /** live: the operator's answer to a held revert, to start the reverted build on the live data as it is, with nothing restored (design 47 G section 710) */ "revert"?: "live"; + /** the pipeline sequence of the composition run that wrote this want, in decimal: the holder writes by compare-and-set refusing a lower run, and the node-engine applies a want again only when its run is newer than the one it applied (design 47 H2 §813 (1); H-A-355 (1)) */ + "run"?: string; "self"?: boolean; "v"?: number; /** the version released at the build the want names: the newest released on the placement's branch whose pipeline passed, or the placement's build's (design 47 H §750) */ diff --git a/modules/mesh-delivery-contracts/ts/seats/meshwants/index.js b/modules/mesh-delivery-contracts/ts/seats/meshwants/index.js index b0c21d4bc..7c9016b74 100644 --- a/modules/mesh-delivery-contracts/ts/seats/meshwants/index.js +++ b/modules/mesh-delivery-contracts/ts/seats/meshwants/index.js @@ -13,6 +13,7 @@ export const verbs = { input: "input", compositions: "compositions", compositionsDrop: "compositions-drop", + drop: "drop", }; export const accepts = { @@ -32,6 +33,7 @@ export const events = { room: "room", stepEnded: "step-ended", stepProgress: "step-progress", + askTaken: "ask-taken", }; export const family = { name: "mesh-wants.events", maxAgeDays: 7 }; @@ -82,6 +84,12 @@ export function stepProgressSubject(node) { export const stepProgressSubjectAll = "mesh.seat.mesh-wants.event.step-progress.*"; +export function askTakenSubject(ask) { + return "mesh.seat.mesh-wants.event.ask-taken." + ask; +} + +export const askTakenSubjectAll = "mesh.seat.mesh-wants.event.ask-taken.*"; + export const stepSubject = "mesh.seat.mesh-wants.accept.step"; export const states = {