@detergent-software/conductor 1.0.0-dev.9 → 1.0.1-dev.1

package/build/watchers/boards-writes.js

@@ -0,0 +1,83 @@
+import { z } from 'zod';
+import { ConductorError } from "../errors.js";
+import { NotePostError } from "../notes.js";
+import { adoMessage, boardsAsk, expectOk, requireBoard, tagsOf, workItemId } from "./boards.js";
+// The conductor's writes to ADO Boards: phase notes as discussion comments, and a rule's tag edit.
+// Neither takes from the watchers' budget, as Linear's writes don't.
+const created = z.looseObject({ id: z.number() });
+// A note as a markdown discussion comment. A refused request (4xx, or 203, ADO's sign-in page for
+// a token it doesn't take) posted nothing; a lost answer or a 5xx may have posted it.
+export function boardsNotes(options = {}) {
+    return {
+        comment: async (item, body, profile) => {
+            const board = requireBoard(profile);
+            const id = itemId(item, board, (message) => new NotePostError(message, 'no'));
+            const ask = boardsAsk(options, board, null);
+            let answer;
+            try {
+                answer = await ask(`wit/workItems/${id}/comments?format=markdown`, { body: { text: body }, method: 'POST', version: '7.1-preview.4' });
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                // No az token: nothing was sent.
+                if (error instanceof ConductorError)
+                    throw new NotePostError(message, 'no', error.details);
+                throw new NotePostError(`Azure DevOps unreachable: ${message}`, 'unknown');
+            }
+            if (answer.status === 203 || (answer.status >= 400 && answer.status < 500)) {
+                throw new NotePostError(`Azure DevOps refused the comment on ${item} (${answer.status}${adoMessage(answer.body)})`, 'no');
+            }
+            const comment = answer.status >= 200 && answer.status < 300 ? created.safeParse(answer.body).data : undefined;
+            if (!comment)
+                throw new NotePostError(`Azure DevOps' answer to the comment on ${item} didn't read (${answer.status})`, 'unknown');
+            return { id: String(comment.id), url: `${board.base}/_workitems/edit/${id}` };
+        },
+    };
+}
+const tagged = z.looseObject({ fields: z.record(z.string(), z.unknown()), rev: z.number() });
+// A tag added to or removed from a work item: a patch of `System.Tags` alone, refused by ADO when
+// the item changed since it was read (`test /rev`), so a concurrent edit isn't overwritten.
+export function boardsLabels(options = {}) {
+    return {
+        label: async (item, label, op, profile) => {
+            const board = requireBoard(profile);
+            const id = itemId(item, board, (message) => new ConductorError(message));
+            const ask = boardsAsk(options, board, null);
+            const read = await readTags(ask, id, item);
+            const has = read.tags.some((t) => t.toLowerCase() === label.toLowerCase());
+            if (has === (op === 'add'))
+                return 'already';
+            const tags = op === 'add' ? [...read.tags, label] : read.tags.filter((t) => t.toLowerCase() !== label.toLowerCase());
+            // `add` on System.Tags merges into the tags there (removing nothing), so a list that replaces
+            // them is a `replace`, which needs the field to exist.
+            const patch = [
+                { op: 'test', path: '/rev', value: read.rev },
+                { op: read.tags.length > 0 ? 'replace' : 'add', path: '/fields/System.Tags', value: tags.join('; ') },
+            ];
+            const answer = await ask(`wit/workitems/${id}`, { body: patch, contentType: 'application/json-patch+json', method: 'PATCH' });
+            const failed = `Azure DevOps didn't ${op} the tag "${label}" on ${item}`;
+            if (answer.status < 200 || answer.status > 299)
+                throw new ConductorError(`${failed} (${answer.status}${adoMessage(answer.body)})`);
+            // A patch ADO takes without changing anything still answers 200, so the answer's tags decide.
+            const after = tagged.safeParse(answer.body).data;
+            const now = tagsOf(after?.fields['System.Tags']).some((t) => t.toLowerCase() === label.toLowerCase());
+            if (!after || now !== (op === 'add'))
+                throw new ConductorError(`${failed}: its tags are "${String(after?.fields['System.Tags'] ?? '')}"`);
+            return op === 'add' ? 'added' : 'removed';
+        },
+    };
+}
+function itemId(item, board, error) {
+    const id = workItemId(item, board);
+    if (id === null)
+        throw error(`${item} isn't an item of the board keyed ${board.key}, such as ${board.key}-1234`);
+    return id;
+}
+async function readTags(ask, id, item) {
+    const answer = await ask(`wit/workitems/${id}?fields=System.Tags`);
+    if (answer.status === 404)
+        throw new ConductorError(`Azure DevOps Boards has no work item ${id} (${item})`);
+    const w = tagged.parse(expectOk(answer, `work item ${id}`));
+    return { rev: w.rev, tags: tagsOf(w.fields['System.Tags']) };
+}
+//# sourceMappingURL=boards-writes.js.map

package/build/watchers/boards-writes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"boards-writes.js","sourceRoot":"","sources":["../../src/watchers/boards-writes.ts"],"names":[],"mappings":"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"}

package/build/watchers/boards.js

@@ -0,0 +1,271 @@
+import { z } from 'zod';
+import { ConductorError } from "../errors.js";
+import { notePrefixes } from "../profile.js";
+import { adoRequest, azToken } from "./ado-api.js";
+import { approvalAfterPlan, phaseOf } from "./linear.js";
+import { perWait, spend, WaitProblem } from "./source.js";
+// State names to types for the Scrum, Agile, Basic and CMMI processes; a profile adds its own.
+const BUILT_IN_STATES = {
+    active: 'started',
+    approved: 'unstarted',
+    closed: 'completed',
+    committed: 'started',
+    doing: 'started',
+    done: 'completed',
+    'in progress': 'started',
+    new: 'unstarted',
+    proposed: 'unstarted',
+    removed: 'canceled',
+    resolved: 'started',
+    'to do': 'unstarted',
+};
+export const OPEN_TYPES = new Set(['backlog', 'started', 'unstarted']);
+export const CLOSED_TYPES = new Set(['canceled', 'completed']);
+// ADO's own message in an error answer, as ": <message>", or nothing.
+export function adoMessage(body) {
+    const message = z.looseObject({ message: z.string() }).safeParse(body).data?.message;
+    return message ? `: ${message}` : '';
+}
+// The profile's board, or null when its tracker isn't ADO Boards.
+export function boardOf(profile) {
+    if (profile?.tracker.kind !== 'ado-boards')
+        return null;
+    const { tracker } = profile;
+    const organization = (tracker.organization ?? profile.codeHost.organization).replace(/\/+$/, '');
+    const project = tracker.project ?? profile.codeHost.project;
+    return {
+        areaRoot: tracker.areaRoot ?? project,
+        base: `${organization}/${encodeURIComponent(project)}`,
+        humanLabel: tracker.humanLabel,
+        key: tracker.key,
+        organization,
+        priority: tracker.priority,
+        project,
+        query: tracker.query,
+        states: Object.fromEntries(Object.entries(tracker.states).map(([name, type]) => [name.toLowerCase(), type])),
+    };
+}
+export function boardsAsk({ fetch: fetcher = globalThis.fetch, token = azToken() }, board, budget) {
+    return async (path, { organization = false, version = '7.1', ...init } = {}) => {
+        if (budget)
+            spend(budget);
+        const url = `${organization ? board.organization : board.base}/_apis/${path}${path.includes('?') ? '&' : '?'}api-version=${version}`;
+        return adoRequest(fetcher, token, url, { ...init, ...(budget ? { onRetry: () => spend(budget) } : {}) });
+    };
+}
+// A comment's text: markdown as it is, the web UI's HTML as plain lines.
+export function commentText(text, format) {
+    if (!text)
+        return '';
+    return format?.toLowerCase() === 'html' ? htmlText(text) : text;
+}
+// An answer that has to be 2xx, else an Error naming what was asked: a WaitProblem for a 400 or
+// 404, which asking again won't change (a project or item ADO doesn't have).
+export function expectOk(answer, what) {
+    if (answer.status >= 200 && answer.status <= 299)
+        return answer.body;
+    const message = `Azure DevOps answered ${answer.status} for ${what}${adoMessage(answer.body)}`;
+    throw answer.status === 400 || answer.status === 404 ? new WaitProblem(message) : new Error(message);
+}
+// HTML to the text a reader sees: block ends and <br> as new lines, tags dropped, entities decoded.
+export function htmlText(html) {
+    return html
+        .replace(/<br\s*\/?>/gi, '\n')
+        .replace(/<\/(?:blockquote|div|h[1-6]|li|p|pre|tr)>/gi, '\n')
+        .replace(/<[^>]*>/g, '')
+        .replace(/&nbsp;/g, ' ')
+        .replace(/&lt;/g, '<')
+        .replace(/&gt;/g, '>')
+        .replace(/&quot;/g, '"')
+        .replace(/&#(\d+);/g, (_, code) => String.fromCodePoint(Number(code)))
+        .replace(/&amp;/g, '&');
+}
+// The state's type, by the profile's map, then the built-in one; null for a state neither knows,
+// which is neither open nor closed, so such an item is never launched or retired.
+export function stateType(state, board) {
+    const name = state.toLowerCase();
+    return board.states[name] ?? BUILT_IN_STATES[name] ?? null;
+}
+// `System.Tags` ("human; docs") as a list.
+export function tagsOf(tags) {
+    return typeof tags === 'string'
+        ? tags
+            .split(';')
+            .map((t) => t.trim())
+            .filter((t) => t !== '')
+        : [];
+}
+// The work item id of `CAD-1234` on the board keyed CAD, or null for another key.
+export function workItemId(item, board) {
+    const match = /^([A-Za-z][A-Za-z0-9]*)-(\d+)$/.exec(item);
+    return match?.[1]?.toUpperCase() === board.key && match[2] ? Number(match[2]) : null;
+}
+const BATCH = 200;
+// The work items with these fields (or all of them and their relations, with `relations`), in
+// batches of 200. An id ADO doesn't have is left out.
+export async function readWorkItems(ask, ids, { fields, relations = false }) {
+    const found = [];
+    for (let at = 0; at < ids.length; at += BATCH) {
+        const batch = ids.slice(at, at + BATCH);
+        // ADO takes either fields or an expand, not both.
+        const body = { errorPolicy: 'Omit', ids: batch, ...(relations ? { $expand: 'Relations' } : { fields }) };
+        const answer = expectOk(await ask('wit/workitemsbatch', { body, method: 'POST' }), 'wit/workitemsbatch');
+        found.push(...z.object({ value: z.array(workItem.nullable()) }).parse(answer).value.flatMap((w) => (w ? [w] : [])));
+    }
+    return found;
+}
+export const workItem = z.looseObject({
+    fields: z.record(z.string(), z.unknown()),
+    id: z.number(),
+    relations: z.array(z.looseObject({ rel: z.string(), url: z.string() })).nullish(),
+    rev: z.number(),
+});
+const commentPage = z.looseObject({
+    comments: z.array(z.looseObject({
+        createdBy: z.looseObject({ id: z.string() }).nullish(),
+        createdDate: z.string(),
+        format: z.string().nullish(),
+        id: z.number(),
+        isDeleted: z.boolean().optional(),
+        text: z.string().nullish(),
+    })),
+    continuationToken: z.string().nullish(),
+});
+const connection = z.looseObject({ authenticatedUser: z.looseObject({ id: z.string() }) });
+// A work item's discussion comments, oldest first, without deleted ones.
+export async function readComments(ask, id) {
+    const comments = [];
+    for (let first = true, token = null; first || token; first = false) {
+        const path = `wit/workItems/${id}/comments?$top=200${token ? `&continuationToken=${encodeURIComponent(token)}` : ''}`;
+        const page = commentPage.parse(expectOk(await ask(path, { version: '7.1-preview.4' }), `the comments of work item ${id}`));
+        for (const c of page.comments) {
+            if (!c.isDeleted)
+                comments.push({ authorId: c.createdBy?.id ?? null, body: commentText(c.text, c.format), createdAt: c.createdDate });
+        }
+        token = page.continuationToken ?? null;
+    }
+    return comments;
+}
+// The az login's identity, whose `approve` / `revise:` counts.
+export async function readViewer(ask) {
+    return connection.parse(expectOk(await ask('connectionData', { organization: true, version: '7.1-preview' }), 'connectionData')).authenticatedUser.id;
+}
+const WAIT_FIELDS = ['System.Id', 'System.Rev', 'System.State', 'System.Tags', 'System.CommentCount'];
+// The approval and item waits on Boards items, for the ADO source. Each pass reads every waited
+// item of a board in one batch (state, tags, rev, comment count), and reads an item's comments only
+// when a wait needs them and they changed since the last read. State lives in memory.
+export function boardsWaits(options = {}) {
+    const boards = new Map();
+    return {
+        check: async (waits, budget, outcomes) => {
+            const byBoard = new Map();
+            for (const wait of waits) {
+                const c = wait.condition;
+                if ((c.kind !== 'approval' && c.kind !== 'item') || c.tracker !== 'ado-boards')
+                    continue;
+                const board = boardOf(wait.profile);
+                if (!board) {
+                    outcomes.set(wait.id, { error: "the project's profile has no ADO Boards tracker" });
+                    continue;
+                }
+                // By ADO project and key: two conducted projects can share an ADO project.
+                const at = `${board.base} ${board.key}`;
+                const group = byBoard.get(at) ?? { board, waits: [] };
+                group.waits.push(wait);
+                byBoard.set(at, group);
+            }
+            for (const [base, group] of byBoard) {
+                try {
+                    await checkBoard(base, group, budget, outcomes);
+                }
+                catch (error) {
+                    // A board ADO refuses (a 400 or 404: a project or item it doesn't have) is a problem with
+                    // its waits alone, so the PR and run waits of the same pass go on.
+                    if (!(error instanceof WaitProblem))
+                        throw error;
+                    for (const wait of group.waits)
+                        if (!outcomes.has(wait.id))
+                            outcomes.set(wait.id, { error: error.message });
+                }
+            }
+        },
+    };
+    async function checkBoard(base, group, budget, outcomes) {
+        const { board } = group;
+        const ask = boardsAsk(options, board, budget);
+        const state = boards.get(base) ?? { items: new Map(), viewer: null };
+        boards.set(base, state);
+        const idOf = new Map(group.waits.map((w) => [w.id, workItemId(itemOf(w), board)]));
+        const ids = [...new Set([...idOf.values()].flatMap((id) => (id === null ? [] : [id])))];
+        const read = await readWorkItems(ask, ids, { fields: WAIT_FIELDS });
+        const seen = new Map(read.map((w) => [w.id, w]));
+        // Only the items something waits on are kept, with their comments.
+        for (const id of state.items.keys())
+            if (!ids.includes(id))
+                state.items.delete(id);
+        for (const id of ids) {
+            const w = seen.get(id);
+            if (!w) {
+                state.items.delete(id);
+                continue;
+            }
+            const was = state.items.get(id);
+            const version = `${w.rev}/${String(w.fields['System.CommentCount'] ?? 0)}`;
+            state.items.set(id, {
+                comments: was?.comments ?? null,
+                readAt: was?.readAt ?? null,
+                state: String(w.fields['System.State'] ?? ''),
+                tags: tagsOf(w.fields['System.Tags']),
+                version,
+            });
+        }
+        const readsNotes = (wait) => wait.condition.kind === 'approval' || (wait.condition.kind === 'item' && wait.condition.field === 'note');
+        if (state.viewer === null && group.waits.some((w) => w.condition.kind === 'approval'))
+            state.viewer = await readViewer(ask);
+        for (const wait of group.waits) {
+            const c = wait.condition;
+            if (c.kind !== 'approval' && c.kind !== 'item')
+                continue;
+            await perWait(outcomes, wait.id, async () => {
+                const id = idOf.get(wait.id) ?? null;
+                if (id === null)
+                    throw new WaitProblem(`${c.item} isn't an item of the board keyed ${board.key}`);
+                const item = state.items.get(id);
+                if (!item)
+                    throw new WaitProblem(`Azure DevOps Boards has no work item ${id} (${c.item})`);
+                if (readsNotes(wait) && (item.comments === null || item.readAt !== item.version)) {
+                    item.comments = await readComments(ask, id);
+                    item.readAt = item.version;
+                }
+                const prefixes = notePrefixes(wait.profile);
+                if (c.kind === 'approval') {
+                    const found = approvalAfterPlan(item.comments ?? [], state.viewer, prefixes);
+                    return found ? `approval ${c.item}: ${found.kind}` : null;
+                }
+                const value = c.value.toLowerCase();
+                if (c.field === 'state') {
+                    const type = stateType(item.state, board);
+                    return item.state.toLowerCase() === value || type === value ? `item ${c.item} state ${item.state}` : null;
+                }
+                if (c.field === 'label') {
+                    const tag = item.tags.find((t) => t.toLowerCase() === value);
+                    return tag ? `item ${c.item} labelled ${tag}` : null;
+                }
+                const note = (item.comments ?? []).map((x) => phaseOf(x.body, prefixes)).find((p) => p?.toLowerCase() === value);
+                return note ? `item ${c.item} note ${note}` : null;
+            });
+        }
+    }
+}
+// A ConductorError for a project whose tracker isn't ADO Boards.
+export function requireBoard(profile) {
+    const board = boardOf(profile);
+    if (!board)
+        throw new ConductorError(`project ${profile?.name ?? '?'} has no ADO Boards tracker`);
+    return board;
+}
+function itemOf(wait) {
+    const c = wait.condition;
+    return c.kind === 'approval' || c.kind === 'item' ? c.item : '';
+}
+//# sourceMappingURL=boards.js.map

package/build/watchers/boards.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"boards.js","sourceRoot":"","sources":["../../src/watchers/boards.ts"],"names":[],"mappings":"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"}

package/build/watchers/conflicts.js

@@ -0,0 +1,132 @@
+import { ACTIVE_STATUSES } from "../store.js";
+// The wake text for a PR that conflicts with its base branch: the fact, and what the worker does
+// about it (worker protocol v1, as the work skill's `land` outcome `conflicts` says).
+export function conflictLine(pr, base) {
+    return `pr ${pr} conflicts with ${base}: merge origin/${base} into the branch (no rebase), resolve, rerun the checks, push and wait on the PR again`;
+}
+// A conflict spell per worker and watched ADO PR, from the first pass that sees `mergeStatus:
+// conflicts` to the first that sees a clean merge (or the PR merged or abandoned). Its first pass
+// wakes the worker once (`pr.conflicted`, and the PR's waits resolved with `conflictLine`); later
+// passes in the spell wake nobody, so a worker that parks again on the conflicted PR without
+// pushing stays parked. A conflict on a new source commit (a push) starts a new spell. A spell that outlives
+// `minutes`, with its wake undelivered or the conflict still seen, is stuck (`pr.conflict-stuck`,
+// once), which raises a `conflict` inbox item. Spells are in memory: a restart starts them over, so
+// a PR still in conflict wakes its worker once more.
+export function conflictSpells({ minutes, now, store }) {
+    const spells = new Map();
+    const event = (spell, kind, data) => {
+        store.appendEvent({
+            data: { base: spell.base, name: spell.name, pr: spell.number, repo: spell.repo, url: spell.url, worker: spell.worker, ...data },
+            kind,
+            project: spell.project,
+            subject: spell.item,
+        });
+    };
+    const ageMinutes = (spell) => (now().getTime() - spell.startedAt) / 60_000;
+    const stuck = (spell, reason) => {
+        const age = ageMinutes(spell);
+        if (spell.stuck || age < minutes)
+            return;
+        spell.stuck = true;
+        event(spell, 'pr.conflict-stuck', { minutes: Math.floor(age), reason });
+    };
+    const clear = (key, by) => {
+        const spell = spells.get(key);
+        if (!spell)
+            return;
+        spells.delete(key);
+        event(spell, 'pr.conflict-cleared', { by, minutes: Math.floor(ageMinutes(spell)) });
+    };
+    return {
+        observe: (checks, outcomes) => {
+            const wake = new Map();
+            // A spell is one worker's on one PR: each waiting worker is woken for it.
+            const groups = new Map();
+            for (const check of checks) {
+                const c = check.condition;
+                const wait = c.kind === 'pr' && c.host === 'ado' ? store.getWait(check.id) : null;
+                const worker = wait ? store.getWorker(wait.worker) : null;
+                if (c.kind !== 'pr' || !worker)
+                    continue;
+                const key = `${worker.id} pr:ado:${c.repo}#${c.number}`;
+                const group = groups.get(key) ?? { checks: [], worker };
+                group.checks.push(check);
+                groups.set(key, group);
+            }
+            for (const [key, { checks: group, worker }] of groups) {
+                const found = group.map((check) => ({ check, outcome: outcomes.get(check.id) }));
+                const ended = found.flatMap(({ outcome }) => (outcome && 'resolution' in outcome ? (/\b(merged|abandoned)$/.exec(outcome.resolution)?.[1] ?? []) : []));
+                if (ended[0] !== undefined) {
+                    clear(key, ended[0]);
+                    continue;
+                }
+                // Every outcome on the PR carries its merge state, a wait that resolved on its own too.
+                const merges = found.flatMap(({ outcome }) => (outcome && 'merge' in outcome && outcome.merge ? [outcome.merge] : []));
+                const conflict = merges.find((m) => m.conflicts);
+                if (!conflict) {
+                    if (merges.length > 0)
+                        clear(key, 'merges cleanly');
+                    continue;
+                }
+                const open = spells.get(key);
+                // A new source commit that still conflicts is the worker's push meeting a base that moved
+                // again before ADO said it merged cleanly: a new spell, and a new wake.
+                if (open && (open.commit === conflict.commit || conflict.commit === null)) {
+                    stuck(open, 'still conflicts');
+                    continue;
+                }
+                if (open)
+                    clear(key, 'pushed again');
+                const first = group[0];
+                if (first?.condition.kind !== 'pr')
+                    continue;
+                // The PR is one read for every wait on it, so the conflict holds for the waits the pass
+                // didn't get to as well. A wait that resolved on its own (a comment) carries both facts.
+                const line = conflictLine(first.condition.number, conflict.base);
+                const woken = found.filter(({ outcome }) => !outcome || !('error' in outcome));
+                for (const { check, outcome } of woken) {
+                    wake.set(check.id, outcome && 'resolution' in outcome ? `${outcome.resolution}; ${line}` : line);
+                }
+                const spell = {
+                    base: conflict.base,
+                    commit: conflict.commit,
+                    item: worker.item,
+                    name: worker.name,
+                    number: first.condition.number,
+                    project: worker.project,
+                    repo: first.condition.repo,
+                    startedAt: now().getTime(),
+                    stuck: false,
+                    url: prUrl(first.profile, first.condition.repo, first.condition.number),
+                    waits: woken.map(({ check }) => check.id),
+                    worker: worker.id,
+                };
+                spells.set(key, spell);
+                event(spell, 'pr.conflicted', { waits: spell.waits });
+            }
+            return wake;
+        },
+        sweep: () => {
+            for (const [key, spell] of spells) {
+                const worker = store.getWorker(spell.worker);
+                if (!worker || !ACTIVE_STATUSES.includes(worker.status)) {
+                    spells.delete(key);
+                    continue;
+                }
+                const undelivered = spell.waits.some((id) => {
+                    const wait = store.getWait(id);
+                    return wait !== null && wait.resolvedAt !== null && wait.deliveredAt === null;
+                });
+                if (undelivered)
+                    stuck(spell, 'not woken');
+            }
+        },
+    };
+}
+function prUrl(profile, repo, pr) {
+    if (profile?.codeHost.kind !== 'ado')
+        return null;
+    const base = `${profile.codeHost.organization.replace(/\/+$/, '')}/${encodeURIComponent(profile.codeHost.project)}`;
+    return `${base}/_git/${encodeURIComponent(repo)}/pullrequest/${pr}`;
+}
+//# sourceMappingURL=conflicts.js.map

package/build/watchers/conflicts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conflicts.js","sourceRoot":"","sources":["../../src/watchers/conflicts.ts"],"names":[],"mappings":"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"}

package/build/watchers/github.js

@@ -1,5 +1,7 @@
 import { z } from 'zod';
+import { notePrefixes } from "../profile.js";
 import { outputOf, run } from "../run.js";
+import { noteHeading } from "./linear.js";
 import { perPass, perWait, untilSpent, WaitProblem } from "./source.js";
 const pull = z.looseObject({
     head: z.looseObject({ sha: z.string() }),
@@ -56,9 +58,10 @@ export function githubSource({ gh = ghApi() } = {}) {
                             const failed = runs.filter((r) => !PASSING.has(r.conclusion ?? '')).map((r) => r.name);
                             return failed.length > 0 ? `${at} checks failed: ${failed.join(', ')}` : `${at} checks passed`;
                         }
-                        const note = `${wait.profile?.skills.work ?? 'work-issue'} · `;
+                        const notes = notePrefixes(wait.profile);
                         const since = Date.parse(wait.createdAt);
-                        const byPerson = (u, body, when) => u?.type !== 'Bot' && when != null && Date.parse(when) > since && !(body ?? '').replace(/^[#*\s]+/, '').startsWith(note);
+                        const isNote = (body) => noteHeading(body ?? '', notes) !== null;
+                        const byPerson = (u, body, when) => u?.type !== 'Bot' && when != null && Date.parse(when) > since && !isNote(body);
                         // The comment lists come oldest first, so they're asked from the wait on (`since`), which
                         // keeps a new comment on the first page. Reviews can't be asked that way; a PR has few.
                         const after = `per_page=100&since=${encodeURIComponent(wait.createdAt)}`;

package/build/watchers/github.js.map

@@ -1 +1 @@
-{"version":3,"file":"github.js","sourceRoot":"","sources":["../../src/watchers/github.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"github.js","sourceRoot":"","sources":["../../src/watchers/github.ts"],"names":[],"mappings":"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"}