From 0e67e56c7c0db245511590f815fc1c2c62938f45 Mon Sep 17 00:00:00 2001 From: jochen Date: Wed, 11 Nov 2026 20:35:24 +0100 Subject: [PATCH] CT17 (tag-wanted out): the checker's definition holds no tag-wanted MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Builds: design 47 G §528, §645, §321 Claude-Session: https://claude.ai/code/session_01JG73KEq4zoDfM9WtYpcQgZ --- .../go/seats/meshdeliverychecker/contract.go | 24 ---------- .../meshdeliverychecker/contract_test.go | 2 - .../fixtures/events.json | 14 ------ .../seats/mesh-delivery-checker/seat.json | 47 +------------------ .../ts/seats/meshdeliverychecker/index.d.ts | 21 --------- .../ts/seats/meshdeliverychecker/index.js | 5 -- 6 files changed, 1 insertion(+), 112 deletions(-) diff --git a/contracts/go/seats/meshdeliverychecker/contract.go b/contracts/go/seats/meshdeliverychecker/contract.go index 0460db0d..d3a20139 100644 --- a/contracts/go/seats/meshdeliverychecker/contract.go +++ b/contracts/go/seats/meshdeliverychecker/contract.go @@ -59,18 +59,12 @@ const SubjectOwedAll = "mesh.seat.mesh-delivery-checker.event.owed.*.*" // The holder's own events, listed beside the seat and published under the holder's subjects (ADR 0620 §2). const ( HolderEventVerdict = "verdict" - HolderEventTagWanted = "tag-wanted" HolderEventPreviewWritten = "preview.written" ) // HolderSubjectVerdict is where the holder publishes verdict, kept in checker.asks. func HolderSubjectVerdict(holder string) string { return "mesh.stream." + holder + ".event.verdict" } -// HolderSubjectTagWanted is where the holder publishes tag-wanted, kept in checker.asks. -func HolderSubjectTagWanted(holder string) string { - return "mesh.stream." + holder + ".event.tag-wanted" -} - // HolderSubjectPreviewWritten is where the holder publishes preview.written, kept in checks. func HolderSubjectPreviewWritten(holder string) string { return "mesh.stream." + holder + ".event.preview.written" @@ -416,24 +410,6 @@ type VerdictHolderEvent struct { Verdict string `json:"verdict"` } -// TagWantedHolderEvent is the body of the holder's event tag-wanted. -type TagWantedHolderEvent struct { - // the pull request's branch: its tag is removed when the branch ends - Branch string `json:"branch"` - // its head - Head string `json:"head"` - // the group member - Module string `json:"module"` - // the package it declares - Package string `json:"package"` - // the pull request - Pull int64 `json:"pull,omitempty"` - // owner/repo - Repository string `json:"repository"` - // the tag wanted - Tag string `json:"tag,omitempty"` -} - // VerdictsByGroupHeadsValueComposition is a type of the contract. type VerdictsByGroupHeadsValueComposition struct { Fpset string `json:"fpset,omitempty"` diff --git a/contracts/go/seats/meshdeliverychecker/contract_test.go b/contracts/go/seats/meshdeliverychecker/contract_test.go index 3dc846b8..d88df869 100644 --- a/contracts/go/seats/meshdeliverychecker/contract_test.go +++ b/contracts/go/seats/meshdeliverychecker/contract_test.go @@ -19,8 +19,6 @@ func TestFixtures(t *testing.T) { }{ {name: "verdict on the checker's own family", subject: "mesh.stream.mesh-delivery-checker.event.verdict", given: "{\"head\":\"cccccccccccccccccccccccccccccccccccccccc\",\"out-of-step\":[\"go/seats/meshbroker/contract.go\"],\"pull\":3,\"repository\":\"novox/mesh-contracts\",\"series\":[{\"artifact\":\"go\",\"from\":\"0.1\",\"module\":\"mesh-contracts\",\"to\":\"0.2\"}],\"verdict\":\"fail\"}", wire: "{\"head\":\"cccccccccccccccccccccccccccccccccccccccc\",\"out-of-step\":[\"go/seats/meshbroker/contract.go\"],\"pull\":3,\"repository\":\"novox/mesh-contracts\",\"series\":[{\"artifact\":\"go\",\"from\":\"0.1\",\"module\":\"mesh-contracts\",\"to\":\"0.2\"}],\"verdict\":\"fail\"}", decode: func(b []byte) (any, error) { var v VerdictHolderEvent; err := json.Unmarshal(b, &v); return v, err }, subjectIs: regexp.MustCompile("^mesh\\.stream\\.[a-z0-9-]+\\.event\\.verdict$")}, - {name: "tag-wanted on the checker's own family", subject: "mesh.stream.mesh-delivery-checker.event.tag-wanted", given: "{\"branch\":\"feat/registry\",\"head\":\"cccccccccccccccccccccccccccccccccccccccc\",\"module\":\"mesh-sdk\",\"package\":\"go\",\"pull\":170,\"repository\":\"novox/mesh-sdk\",\"tag\":\"registry-1966\"}", wire: "{\"branch\":\"feat/registry\",\"head\":\"cccccccccccccccccccccccccccccccccccccccc\",\"module\":\"mesh-sdk\",\"package\":\"go\",\"pull\":170,\"repository\":\"novox/mesh-sdk\",\"tag\":\"registry-1966\"}", - decode: func(b []byte) (any, error) { var v TagWantedHolderEvent; err := json.Unmarshal(b, &v); return v, err }, subjectIs: regexp.MustCompile("^mesh\\.stream\\.[a-z0-9-]+\\.event\\.tag-wanted$")}, {name: "preview.written on the checker's stream", subject: "mesh.stream.mesh-delivery-checker.event.preview.written", given: "{}", wire: "{}", decode: func(b []byte) (any, error) { var v map[string]any; err := json.Unmarshal(b, &v); return v, err }, subjectIs: regexp.MustCompile("^mesh\\.stream\\.[a-z0-9-]+\\.event\\.preview\\.written$")}, {name: "checked is said", subject: "mesh.seat.mesh-delivery-checker.event.checked", given: "{\"at\":\"2026-11-09T20:30:00Z\",\"catalog\":3612,\"entries\":[{\"fp\":\"src2:1480985e\",\"module\":\"mesh-delivery-gate\"}],\"group\":\"feat/47-G\",\"heads\":\"0123456789ab\",\"source\":3611,\"verdict\":\"pass\"}", wire: "{\"at\":\"2026-11-09T20:30:00Z\",\"catalog\":3612,\"entries\":[{\"fp\":\"src2:1480985e\",\"module\":\"mesh-delivery-gate\"}],\"group\":\"feat/47-G\",\"heads\":\"0123456789ab\",\"source\":3611,\"verdict\":\"pass\"}", diff --git a/contracts/seats/mesh-delivery-checker/fixtures/events.json b/contracts/seats/mesh-delivery-checker/fixtures/events.json index f73f5340..ff5755c8 100644 --- a/contracts/seats/mesh-delivery-checker/fixtures/events.json +++ b/contracts/seats/mesh-delivery-checker/fixtures/events.json @@ -21,20 +21,6 @@ ] } }, - { - "name": "tag-wanted on the checker's own family", - "of": "holder-event:tag-wanted", - "subject": "mesh.stream.mesh-delivery-checker.event.tag-wanted", - "given": { - "repository": "novox/mesh-sdk", - "pull": 170, - "head": "cccccccccccccccccccccccccccccccccccccccc", - "branch": "feat/registry", - "module": "mesh-sdk", - "package": "go", - "tag": "registry-1966" - } - }, { "name": "preview.written on the checker's stream", "of": "holder-event:preview.written", diff --git a/contracts/seats/mesh-delivery-checker/seat.json b/contracts/seats/mesh-delivery-checker/seat.json index 17c9b7f4..73ec5712 100644 --- a/contracts/seats/mesh-delivery-checker/seat.json +++ b/contracts/seats/mesh-delivery-checker/seat.json @@ -176,7 +176,7 @@ } } ], - "description": "The merge check's tries: start one, read one, end one. The seat says each check's end as checked and what the checker owes the forge as owed; the checker's other events stay under its own subjects (ADR 0620 \u00a72).", + "description": "The merge check's tries: start one, read one, end one. The seat says each check's end as checked and what the checker owes the forge as owed; the checker's other events stay under its own subjects (ADR 0620 §2).", "family": { "name": "mesh-delivery-checker.events", "max-age-days": 7 @@ -319,51 +319,6 @@ ] } }, - { - "name": "tag-wanted", - "subject": "mesh.stream..event.tag-wanted", - "family": "checker.asks", - "body": { - "type": "object", - "properties": { - "repository": { - "type": "string", - "description": "owner/repo" - }, - "pull": { - "type": "integer", - "description": "the pull request" - }, - "head": { - "type": "string", - "description": "its head" - }, - "branch": { - "type": "string", - "description": "the pull request's branch: its tag is removed when the branch ends" - }, - "module": { - "type": "string", - "description": "the group member" - }, - "package": { - "type": "string", - "description": "the package it declares" - }, - "tag": { - "type": "string", - "description": "the tag wanted" - } - }, - "required": [ - "repository", - "head", - "branch", - "module", - "package" - ] - } - }, { "name": "preview.written", "subject": "mesh.stream..event.preview.written", diff --git a/contracts/ts/seats/meshdeliverychecker/index.d.ts b/contracts/ts/seats/meshdeliverychecker/index.d.ts index 90aaca97..33710ac4 100644 --- a/contracts/ts/seats/meshdeliverychecker/index.d.ts +++ b/contracts/ts/seats/meshdeliverychecker/index.d.ts @@ -28,14 +28,11 @@ export declare const owedSubjectAll: "mesh.seat.mesh-delivery-checker.event.owed export declare const holderEvents: { readonly verdict: "verdict"; - readonly tagWanted: "tag-wanted"; readonly previewWritten: "preview.written"; }; export declare function verdictHolderSubject(holder: string): string; -export declare function tagWantedHolderSubject(holder: string): string; - export declare function previewWrittenHolderSubject(holder: string): string; export declare const states: { @@ -225,24 +222,6 @@ export interface VerdictHolderEvent { "verdict": string; } -/** is the body of the holder's event tag-wanted. */ -export interface TagWantedHolderEvent { - /** the pull request's branch: its tag is removed when the branch ends */ - "branch": string; - /** its head */ - "head": string; - /** the group member */ - "module": string; - /** the package it declares */ - "package": string; - /** the pull request */ - "pull"?: number; - /** owner/repo */ - "repository": string; - /** the tag wanted */ - "tag"?: string; -} - export interface VerdictsByGroupHeadsValueComposition { "fpset"?: string; "machines"?: string[]; diff --git a/contracts/ts/seats/meshdeliverychecker/index.js b/contracts/ts/seats/meshdeliverychecker/index.js index a88f35c2..f5d59fc9 100644 --- a/contracts/ts/seats/meshdeliverychecker/index.js +++ b/contracts/ts/seats/meshdeliverychecker/index.js @@ -30,7 +30,6 @@ export const owedSubjectAll = "mesh.seat.mesh-delivery-checker.event.owed.*.*"; export const holderEvents = { verdict: "verdict", - tagWanted: "tag-wanted", previewWritten: "preview.written", }; @@ -38,10 +37,6 @@ export function verdictHolderSubject(holder) { return "mesh.stream." + holder + ".event.verdict"; } -export function tagWantedHolderSubject(holder) { - return "mesh.stream." + holder + ".event.tag-wanted"; -} - export function previewWrittenHolderSubject(holder) { return "mesh.stream." + holder + ".event.preview.written"; }