spidersan 0.20.1 → 0.20.2

package/dist/lib/graph.d.ts

@@ -0,0 +1,38 @@
+export type NodeId = string;
+/**
+ * Build a conflict adjacency map: for each branch, which other branches
+ * share overlapping files?
+ * Pure function — takes branch data, returns a Map.
+ */
+export declare function buildConflictGraph(branches: Array<{
+    name: string;
+    files: string[];
+}>): Map<NodeId, NodeId[]>;
+/**
+ * Fold declared dependencies into a conflict graph as DIRECTED edges.
+ * An edge u→v gives v in-degree, so v sorts after u: "A depends on B"
+ * becomes edge B→A (B merges first). Because conflict edges are symmetric,
+ * a dependent that ALSO file-overlaps its dep (the normal stacked-branch
+ * case) forms a 2-cycle that would swallow the dep edge and fall back to
+ * alphabetical cycle-breaking — so the opposing dependent→dep edge is
+ * REMOVED: the declared direction wins over the undirected conflict.
+ * Unknown/self deps are dropped by topologicalSort's normalization.
+ * Returns a new map; inputs untouched.
+ */
+export declare function addDependencyEdges(graph: Map<NodeId, NodeId[]>, branches: Array<{
+    name: string;
+    dependsOn?: string[];
+}>): Map<NodeId, NodeId[]>;
+/**
+ * Topological sort with tie-breaking by blocking count.
+ * Returns branches in recommended merge order.
+ * Cycles are broken by inserting branches at earliest valid position.
+ * blockingCounts is optional; when omitted, sort is alphabetical within tied groups.
+ */
+export declare function topologicalSort(nodes: NodeId[], graph: Map<NodeId, NodeId[]>, blockingCounts?: Map<NodeId, number>): NodeId[];
+/**
+ * For each node, count how many other nodes are (transitively) blocked by it.
+ * Used for rarest-first prioritization.
+ */
+export declare function calculateBlockingCounts(nodes: NodeId[], graph: Map<NodeId, NodeId[]>): Map<NodeId, number>;
+//# sourceMappingURL=graph.d.ts.map

package/dist/lib/graph.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../src/lib/graph.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC;AA0C5B;;;;GAIG;AACH,wBAAgB,kBAAkB,CAC9B,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GACnD,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAqCvB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAC9B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAC5B,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GACxD,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAsBvB;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC3B,KAAK,EAAE,MAAM,EAAE,EACf,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAC5B,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACrC,MAAM,EAAE,CAoDV;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACnC,KAAK,EAAE,MAAM,EAAE,EACf,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAC7B,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CA2BrB"}

package/dist/lib/graph.js

@@ -0,0 +1,165 @@
+function compareNodeIds(left, right, blockingCounts) {
+    if (blockingCounts) {
+        const leftCount = blockingCounts.get(left) ?? 0;
+        const rightCount = blockingCounts.get(right) ?? 0;
+        if (leftCount !== rightCount) {
+            return rightCount - leftCount;
+        }
+    }
+    return left.localeCompare(right);
+}
+function normalizeGraph(nodes, graph) {
+    const knownNodes = new Set(nodes);
+    const normalized = new Map();
+    for (const node of nodes) {
+        const neighbors = graph.get(node) ?? [];
+        const uniqueNeighbors = new Set();
+        for (const neighbor of neighbors) {
+            if (neighbor !== node && knownNodes.has(neighbor)) {
+                uniqueNeighbors.add(neighbor);
+            }
+        }
+        normalized.set(node, Array.from(uniqueNeighbors).sort((left, right) => left.localeCompare(right)));
+    }
+    return normalized;
+}
+/**
+ * Build a conflict adjacency map: for each branch, which other branches
+ * share overlapping files?
+ * Pure function — takes branch data, returns a Map.
+ */
+export function buildConflictGraph(branches) {
+    const fileToBranches = new Map();
+    for (const branch of branches) {
+        for (const file of new Set(branch.files)) {
+            let branchNames = fileToBranches.get(file);
+            if (!branchNames) {
+                branchNames = new Set();
+                fileToBranches.set(file, branchNames);
+            }
+            branchNames.add(branch.name);
+        }
+    }
+    const graph = new Map();
+    for (const branch of branches) {
+        const conflicts = new Set();
+        for (const file of new Set(branch.files)) {
+            const branchNames = fileToBranches.get(file);
+            if (!branchNames) {
+                continue;
+            }
+            for (const otherBranch of branchNames) {
+                if (otherBranch !== branch.name) {
+                    conflicts.add(otherBranch);
+                }
+            }
+        }
+        graph.set(branch.name, Array.from(conflicts).sort((left, right) => left.localeCompare(right)));
+    }
+    return graph;
+}
+/**
+ * Fold declared dependencies into a conflict graph as DIRECTED edges.
+ * An edge u→v gives v in-degree, so v sorts after u: "A depends on B"
+ * becomes edge B→A (B merges first). Because conflict edges are symmetric,
+ * a dependent that ALSO file-overlaps its dep (the normal stacked-branch
+ * case) forms a 2-cycle that would swallow the dep edge and fall back to
+ * alphabetical cycle-breaking — so the opposing dependent→dep edge is
+ * REMOVED: the declared direction wins over the undirected conflict.
+ * Unknown/self deps are dropped by topologicalSort's normalization.
+ * Returns a new map; inputs untouched.
+ */
+export function addDependencyEdges(graph, branches) {
+    const merged = new Map();
+    for (const [node, neighbors] of graph.entries()) {
+        merged.set(node, [...neighbors]);
+    }
+    for (const branch of branches) {
+        for (const dep of branch.dependsOn ?? []) {
+            const out = merged.get(dep) ?? [];
+            if (!out.includes(branch.name)) {
+                out.push(branch.name);
+            }
+            merged.set(dep, out);
+            const back = merged.get(branch.name);
+            if (back) {
+                merged.set(branch.name, back.filter((n) => n !== dep));
+            }
+        }
+    }
+    return merged;
+}
+/**
+ * Topological sort with tie-breaking by blocking count.
+ * Returns branches in recommended merge order.
+ * Cycles are broken by inserting branches at earliest valid position.
+ * blockingCounts is optional; when omitted, sort is alphabetical within tied groups.
+ */
+export function topologicalSort(nodes, graph, blockingCounts) {
+    const normalizedGraph = normalizeGraph(nodes, graph);
+    const inDegree = new Map();
+    const remaining = new Set(nodes);
+    const available = [];
+    const order = [];
+    for (const node of nodes) {
+        inDegree.set(node, 0);
+    }
+    for (const neighbors of normalizedGraph.values()) {
+        for (const neighbor of neighbors) {
+            inDegree.set(neighbor, (inDegree.get(neighbor) ?? 0) + 1);
+        }
+    }
+    for (const node of nodes) {
+        if ((inDegree.get(node) ?? 0) === 0) {
+            available.push(node);
+        }
+    }
+    available.sort((left, right) => compareNodeIds(left, right, blockingCounts));
+    while (remaining.size > 0) {
+        let current = available.shift();
+        if (!current) {
+            current = Array.from(remaining).sort((left, right) => compareNodeIds(left, right, blockingCounts))[0];
+        }
+        if (!current || !remaining.has(current)) {
+            continue;
+        }
+        remaining.delete(current);
+        order.push(current);
+        for (const neighbor of normalizedGraph.get(current) ?? []) {
+            const nextDegree = (inDegree.get(neighbor) ?? 0) - 1;
+            inDegree.set(neighbor, nextDegree);
+            if (nextDegree === 0 && remaining.has(neighbor)) {
+                available.push(neighbor);
+            }
+        }
+        available.sort((left, right) => compareNodeIds(left, right, blockingCounts));
+    }
+    return order;
+}
+/**
+ * For each node, count how many other nodes are (transitively) blocked by it.
+ * Used for rarest-first prioritization.
+ */
+export function calculateBlockingCounts(nodes, graph) {
+    const normalizedGraph = normalizeGraph(nodes, graph);
+    const counts = new Map();
+    for (const node of nodes) {
+        const seen = new Set();
+        const stack = [...(normalizedGraph.get(node) ?? [])];
+        while (stack.length > 0) {
+            const current = stack.pop();
+            if (!current || current === node || seen.has(current)) {
+                continue;
+            }
+            seen.add(current);
+            for (const neighbor of normalizedGraph.get(current) ?? []) {
+                if (!seen.has(neighbor) && neighbor !== node) {
+                    stack.push(neighbor);
+                }
+            }
+        }
+        counts.set(node, seen.size);
+    }
+    return counts;
+}
+//# sourceMappingURL=graph.js.map

package/dist/lib/graph.js.map

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

package/dist/lib/machine.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Single source of truth for this machine's identity (~/.envoak/machine.json).
+ *
+ * Four near-copies of this loader had drifted apart (registry-sync, dashboard,
+ * github-sync, and an inline one in cross-conflicts): two read `id || machine_id`,
+ * one read `machine_id || id`, and the missing-file fallback was either
+ * `fallback-<hostname>` or the literal 'unknown'. The id is used to exclude THIS
+ * machine when pulling cross-machine registries, so a divergent fallback means a
+ * machine can fail to filter itself out and conflict against its own branches
+ * (tb-ly0b).
+ */
+import type { MachineIdentity } from '../types/cloud.js';
+export declare function loadMachineIdentity(): Promise<MachineIdentity>;
+//# sourceMappingURL=machine.d.ts.map

package/dist/lib/machine.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"machine.d.ts","sourceRoot":"","sources":["../../src/lib/machine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEzD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,eAAe,CAAC,CAsBpE"}

package/dist/lib/machine.js

@@ -0,0 +1,38 @@
+/**
+ * Single source of truth for this machine's identity (~/.envoak/machine.json).
+ *
+ * Four near-copies of this loader had drifted apart (registry-sync, dashboard,
+ * github-sync, and an inline one in cross-conflicts): two read `id || machine_id`,
+ * one read `machine_id || id`, and the missing-file fallback was either
+ * `fallback-<hostname>` or the literal 'unknown'. The id is used to exclude THIS
+ * machine when pulling cross-machine registries, so a divergent fallback means a
+ * machine can fail to filter itself out and conflict against its own branches
+ * (tb-ly0b).
+ */
+import { readFile } from 'fs/promises';
+import { existsSync } from 'fs';
+import { join } from 'path';
+import { homedir, hostname as osHostname } from 'os';
+export async function loadMachineIdentity() {
+    const configPath = join(homedir(), '.envoak', 'machine.json');
+    if (existsSync(configPath)) {
+        try {
+            const data = JSON.parse(await readFile(configPath, 'utf-8'));
+            const id = data.id || data.machine_id;
+            if (id) {
+                return {
+                    id,
+                    name: data.name || data.machine_name || 'unknown',
+                    hostname: data.hostname || 'unknown',
+                };
+            }
+        }
+        catch {
+            // Unreadable/corrupt machine.json — fall through to the hostname
+            // fallback rather than throwing; identity is advisory, not critical.
+        }
+    }
+    const host = osHostname();
+    return { id: `fallback-${host}`, name: host, hostname: host };
+}
+//# sourceMappingURL=machine.js.map

package/dist/lib/machine.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"machine.js","sourceRoot":"","sources":["../../src/lib/machine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,QAAQ,IAAI,UAAU,EAAE,MAAM,IAAI,CAAC;AAGrD,MAAM,CAAC,KAAK,UAAU,mBAAmB;IACrC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;IAE9D,IAAI,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QACzB,IAAI,CAAC;YACD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;YAC7D,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC;YACtC,IAAI,EAAE,EAAE,CAAC;gBACL,OAAO;oBACH,EAAE;oBACF,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,YAAY,IAAI,SAAS;oBACjD,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,SAAS;iBACvC,CAAC;YACN,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACL,iEAAiE;YACjE,qEAAqE;QACzE,CAAC;IACL,CAAC;IAED,MAAM,IAAI,GAAG,UAAU,EAAE,CAAC;IAC1B,OAAO,EAAE,EAAE,EAAE,YAAY,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;AAClE,CAAC"}

package/dist/lib/notify.d.ts

@@ -0,0 +1,68 @@
+/**
+ * notify — the delivery seam for git-watch alerts.
+ *
+ * Every alert in git-events-subscriber.ts used to inline its own transport:
+ * `execFile('envoak', ['hive','signal',...], cb)` with the callback discarding
+ * the result. When `envoak hive signal` was removed (Envoak#148, ADR-0002) all
+ * five sites died at once, and because no site inspected its own result the
+ * daemon went on logging success for a month (sp-8iqm).
+ *
+ * So the transport lives behind one interface, and that interface returns a
+ * RESULT rather than swallowing it. A caller cannot accidentally claim success:
+ * there is a value it has to look at.
+ *
+ * Adapters are selected by env, so swapping transports is config, not code:
+ *   SPIDERSAN_ROOM_TOKEN — post to a toak.me room (POST /api/chat/send).
+ *                          Name matches the vault secret toak/SPIDERSAN_ROOM_TOKEN,
+ *                          so `envoak vault inject` supplies it directly.
+ *   unset            — nullNotifier: reports undelivered, never pretends
+ */
+export type Delivered = {
+    ok: true;
+} | {
+    ok: false;
+    reason: string;
+};
+export interface NotifyEvent {
+    repo: string;
+    branch: string;
+    /** Conflict tier. Callers gate on this themselves — policy is not ours. */
+    tier: number;
+    /** Human-readable line. May be LLM-generated — never key off this. */
+    message: string;
+    /**
+     * Stable identity of the underlying event, for deduplication. MUST be
+     * built only from deterministic facts (repo, branch, sha, action) — the
+     * tier>=2 path escalates to an LLM, so `message` differs between two
+     * deliveries of the same event and cannot be used here.
+     */
+    dedupe: string;
+    /** GitHub login or agent that triggered it, when known. */
+    agent?: string;
+    files?: string[];
+    /** Extra fields passed through to the room as structured metadata. */
+    details?: Record<string, unknown>;
+}
+/**
+ * A transport. One function — nothing here needs a class.
+ *
+ * CONTRACT: a Notifier MUST NOT throw. It reports failure by returning
+ * `{ok:false, reason}`. Call sites sit inside `catch` blocks that swallow
+ * AI-layer errors, so a thrown transport error would be misread as an AI
+ * failure and vanish — the same silence this module exists to remove.
+ */
+export type Notifier = (event: NotifyEvent) => Promise<Delivered>;
+/** Post to a toak.me room. The room join token is a read+write secret. */
+export declare function toakRoomNotifier(token: string, fetchImpl?: typeof fetch): Notifier;
+/**
+ * No transport configured. Reports undelivered rather than pretending — the
+ * whole point of sp-8iqm is that a severed channel must be visible.
+ */
+export declare const nullNotifier: Notifier;
+export declare function createNotifier(): Notifier;
+/**
+ * Deliver, then log the real outcome. This is the ONLY place allowed to say a
+ * notification was sent, and it says so only after looking at the result.
+ */
+export declare function deliver(notifier: Notifier, event: NotifyEvent, log: (m: string) => void): Promise<Delivered>;
+//# sourceMappingURL=notify.d.ts.map

package/dist/lib/notify.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"notify.d.ts","sourceRoot":"","sources":["../../src/lib/notify.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAKH,MAAM,MAAM,SAAS,GAAG;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAErE,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,2EAA2E;IAC3E,IAAI,EAAE,MAAM,CAAC;IACb,sEAAsE;IACtE,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;OAKG;IACH,MAAM,EAAE,MAAM,CAAC;IACf,2DAA2D;IAC3D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,sEAAsE;IACtE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC;AAED;;;;;;;GAOG;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;AAmClE,0EAA0E;AAC1E,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,GAAE,OAAO,KAAa,GAAG,QAAQ,CAiCzF;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,EAAE,QAGzB,CAAC;AAEH,wBAAgB,cAAc,IAAI,QAAQ,CAGzC;AAED;;;GAGG;AACH,wBAAsB,OAAO,CACzB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,WAAW,EAClB,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,GACzB,OAAO,CAAC,SAAS,CAAC,CAKpB"}

package/dist/lib/notify.js

@@ -0,0 +1,111 @@
+/**
+ * notify — the delivery seam for git-watch alerts.
+ *
+ * Every alert in git-events-subscriber.ts used to inline its own transport:
+ * `execFile('envoak', ['hive','signal',...], cb)` with the callback discarding
+ * the result. When `envoak hive signal` was removed (Envoak#148, ADR-0002) all
+ * five sites died at once, and because no site inspected its own result the
+ * daemon went on logging success for a month (sp-8iqm).
+ *
+ * So the transport lives behind one interface, and that interface returns a
+ * RESULT rather than swallowing it. A caller cannot accidentally claim success:
+ * there is a value it has to look at.
+ *
+ * Adapters are selected by env, so swapping transports is config, not code:
+ *   SPIDERSAN_ROOM_TOKEN — post to a toak.me room (POST /api/chat/send).
+ *                          Name matches the vault secret toak/SPIDERSAN_ROOM_TOKEN,
+ *                          so `envoak vault inject` supplies it directly.
+ *   unset            — nullNotifier: reports undelivered, never pretends
+ */
+import { createHash } from 'crypto';
+import { hostname } from 'os';
+const TOAK_URL = process.env.TOAK_CHAT_URL || 'https://toak.me/api/chat/send';
+// Bare name, no `agent:` prefix. Room allowlists match the sender string
+// EXACTLY — the `agent:<id>` form in toak's send route governs verification
+// upgrade, not allowlist matching, and conflating the two means an approved
+// `spidersan` would not admit a sender of `agent:spidersan`. The machine goes
+// in metadata instead, so one approval covers every host.
+const SENDER = process.env.SPIDERSAN_AGENT || 'spidersan';
+const MACHINE = process.env.TREEBIRD_MACHINE || hostname();
+/**
+ * Stable per event, so a catch-up poll that replays an event minutes later
+ * does not post it twice. The server's own default is a ~5s time bucket, far
+ * shorter than our reconnect window.
+ */
+function idempotencyKey(e) {
+    return createHash('sha256')
+        .update([e.repo, e.branch, e.tier, e.dedupe].join(' '))
+        .digest('hex');
+}
+/**
+ * The original emits were fire-and-forget with `{ timeout: 10000 }`. These are
+ * awaited inside the event handlers, so an unbounded fetch would stall the
+ * handler and queue every event behind it. Same budget as before.
+ */
+const TIMEOUT_MS = 10_000;
+function format(e) {
+    const who = e.agent ? ` by ${e.agent}` : '';
+    const files = e.files?.length ? `\nfiles: ${e.files.slice(0, 10).join(', ')}` : '';
+    return `TIER ${e.tier} conflict - ${e.repo}/${e.branch}${who}\n${e.message}${files}`;
+}
+/** Post to a toak.me room. The room join token is a read+write secret. */
+export function toakRoomNotifier(token, fetchImpl = fetch) {
+    return async (event) => {
+        try {
+            const res = await fetchImpl(TOAK_URL, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                signal: AbortSignal.timeout(TIMEOUT_MS),
+                body: JSON.stringify({
+                    token,
+                    sender: SENDER,
+                    content: format(event),
+                    idempotency_key: idempotencyKey(event),
+                    metadata: {
+                        machine: MACHINE,
+                        repo: event.repo,
+                        branch: event.branch,
+                        tier: event.tier,
+                        agent: event.agent,
+                        files: event.files,
+                        ...event.details,
+                    },
+                }),
+            });
+            // The POST response IS the call-time liveness check — no probe needed.
+            if (!res.ok) {
+                const body = await res.text().catch(() => '');
+                return { ok: false, reason: `${res.status} ${body.slice(0, 120)}`.trim() };
+            }
+            return { ok: true };
+        }
+        catch (err) {
+            return { ok: false, reason: err instanceof Error ? err.message : String(err) };
+        }
+    };
+}
+/**
+ * No transport configured. Reports undelivered rather than pretending — the
+ * whole point of sp-8iqm is that a severed channel must be visible.
+ */
+export const nullNotifier = async () => ({
+    ok: false,
+    reason: 'no transport configured (set SPIDERSAN_ROOM_TOKEN)',
+});
+export function createNotifier() {
+    const token = process.env.SPIDERSAN_ROOM_TOKEN;
+    return token ? toakRoomNotifier(token) : nullNotifier;
+}
+/**
+ * Deliver, then log the real outcome. This is the ONLY place allowed to say a
+ * notification was sent, and it says so only after looking at the result.
+ */
+export async function deliver(notifier, event, log) {
+    const result = await notifier(event);
+    if (result.ok)
+        log(`notified: TIER ${event.tier} ${event.repo}/${event.branch}`);
+    else
+        log(`NOT NOTIFIED (TIER ${event.tier} ${event.repo}/${event.branch}): ${result.reason}`);
+    return result;
+}
+//# sourceMappingURL=notify.js.map

package/dist/lib/notify.js.map

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

package/dist/lib/outline.d.ts

@@ -0,0 +1,6 @@
+import { type SymbolConflict, type SymbolInfo } from './ast.js';
+/** ext includes the dot, e.g. '.py'. Only function/class/method symbols are kept. */
+export declare function outlineSymbols(content: string, ext: string): SymbolInfo[] | null;
+/** Same contract as ASTParser.findSymbolConflicts, for any language ast-grep outlines. null = unavailable. */
+export declare function findOutlineConflicts(ext: string, contentA: string, labelA: string, contentB: string, labelB: string, baseContent?: string): SymbolConflict[] | null;
+//# sourceMappingURL=outline.d.ts.map

package/dist/lib/outline.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"outline.d.ts","sourceRoot":"","sources":["../../src/lib/outline.ts"],"names":[],"mappings":"AAUA,OAAO,EAAkB,KAAK,cAAc,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAShF,qFAAqF;AACrF,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,UAAU,EAAE,GAAG,IAAI,CAiChF;AAED,8GAA8G;AAC9G,wBAAgB,oBAAoB,CAChC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAChC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAChC,WAAW,CAAC,EAAE,MAAM,GACrB,cAAc,EAAE,GAAG,IAAI,CAMzB"}

package/dist/lib/outline.js

@@ -0,0 +1,60 @@
+/**
+ * outline.ts — spike: symbol extraction for non-TS languages via `ast-grep outline`.
+ *
+ * Optional: needs the `ast-grep` binary on PATH. Returns null when it is missing
+ * or fails, so callers can skip (never conclude "no conflicts" from null).
+ */
+import { execFileSync } from 'child_process';
+import { mkdtempSync, writeFileSync, rmSync } from 'fs';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { compareSymbols } from './ast.js';
+/** ext includes the dot, e.g. '.py'. Only function/class/method symbols are kept. */
+export function outlineSymbols(content, ext) {
+    const dir = mkdtempSync(join(tmpdir(), 'spidersan-outline-'));
+    try {
+        const file = join(dir, `f${ext}`);
+        writeFileSync(file, content);
+        const out = execFileSync('ast-grep', ['outline', '--json=compact', file], {
+            encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'],
+        });
+        const files = JSON.parse(out);
+        // `[]` = ast-grep doesn't know this file type; that is "unknown", not "no symbols"
+        if (!Array.isArray(files) || files.length === 0)
+            return null;
+        const items = files[0].items ?? [];
+        const bytes = Buffer.from(content);
+        const symbols = [];
+        const add = (it, parent) => {
+            const type = it.symbolType;
+            if (type !== 'function' && type !== 'class' && type !== 'method')
+                return;
+            symbols.push({
+                name: it.name, type,
+                startLine: it.range.start.line + 1, endLine: it.range.end.line + 1,
+                ...(parent ? { parent } : {}),
+                // byteOffset, not line slicing: exact text of the symbol
+                content: bytes.subarray(it.range.byteOffset.start, it.range.byteOffset.end).toString('utf-8'),
+            });
+            it.members?.forEach(m => add(m, it.name));
+        };
+        items.forEach(it => add(it));
+        return symbols;
+    }
+    catch {
+        return null;
+    }
+    finally {
+        rmSync(dir, { recursive: true, force: true });
+    }
+}
+/** Same contract as ASTParser.findSymbolConflicts, for any language ast-grep outlines. null = unavailable. */
+export function findOutlineConflicts(ext, contentA, labelA, contentB, labelB, baseContent) {
+    const a = outlineSymbols(contentA, ext);
+    const b = outlineSymbols(contentB, ext);
+    const base = baseContent === undefined ? undefined : outlineSymbols(baseContent, ext);
+    if (!a || !b || base === null)
+        return null;
+    return compareSymbols(a, labelA, b, labelB, base);
+}
+//# sourceMappingURL=outline.js.map

package/dist/lib/outline.js.map

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

package/dist/lib/push-registry.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Pushed-branch rows in spider_registries — the reader side.
+ *
+ * The `spidersan-webhook` edge function (treebird repo) registers every branch pushed
+ * to a watched repo, whoever pushed it (Codex, Copilot, a cloud agent, the web editor,
+ * a person), under one virtual machine, `github-push`. The write stays server-side:
+ * GitHub's HMAC proves the event and the service key never leaves Supabase.
+ *
+ * Such a row is shadowed — dropped on read — whenever a real machine has the same
+ * branch, so a branch registered by the machine that pushed it never shows twice or
+ * conflicts with itself (see dropShadowedPushRows).
+ */
+import type { MachineRegistryView } from '../types/cloud.js';
+export declare const PUSH_MACHINE_ID = "github-push";
+/**
+ * Drop pushed-branch rows a real registration already covers. Applied on every read
+ * (pull) BEFORE the caller's own machine is excluded, so a branch the caller itself
+ * registered doesn't come back as "github/<branch>" and conflict with itself.
+ * `ownBranches` covers the race where the webhook beats the pusher's own registry-sync.
+ */
+export declare function dropShadowedPushRows(views: MachineRegistryView[], ownBranches?: Iterable<string>): MachineRegistryView[];
+//# sourceMappingURL=push-registry.d.ts.map

package/dist/lib/push-registry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"push-registry.d.ts","sourceRoot":"","sources":["../../src/lib/push-registry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE7D,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,mBAAmB,EAAE,EAAE,WAAW,GAAE,QAAQ,CAAC,MAAM,CAAM,GAAG,mBAAmB,EAAE,CAS5H"}

package/dist/lib/push-registry.js

@@ -0,0 +1,21 @@
+export const PUSH_MACHINE_ID = 'github-push';
+/**
+ * Drop pushed-branch rows a real registration already covers. Applied on every read
+ * (pull) BEFORE the caller's own machine is excluded, so a branch the caller itself
+ * registered doesn't come back as "github/<branch>" and conflict with itself.
+ * `ownBranches` covers the race where the webhook beats the pusher's own registry-sync.
+ */
+export function dropShadowedPushRows(views, ownBranches = []) {
+    const covered = new Set(ownBranches);
+    for (const v of views) {
+        if (v.machine_id === PUSH_MACHINE_ID)
+            continue;
+        for (const b of v.branches)
+            if (b.status === 'active')
+                covered.add(b.name);
+    }
+    return views
+        .map(v => v.machine_id !== PUSH_MACHINE_ID ? v : { ...v, branches: v.branches.filter(b => !covered.has(b.name)) })
+        .filter(v => v.machine_id !== PUSH_MACHINE_ID || v.branches.length > 0);
+}
+//# sourceMappingURL=push-registry.js.map

package/dist/lib/push-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"push-registry.js","sourceRoot":"","sources":["../../src/lib/push-registry.ts"],"names":[],"mappings":"AAcA,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC;AAE7C;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAAC,KAA4B,EAAE,cAAgC,EAAE;IACjG,MAAM,OAAO,GAAG,IAAI,GAAG,CAAS,WAAW,CAAC,CAAC;IAC7C,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,CAAC,UAAU,KAAK,eAAe;YAAE,SAAS;QAC/C,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ;YAAE,IAAI,CAAC,CAAC,MAAM,KAAK,QAAQ;gBAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC/E,CAAC;IACD,OAAO,KAAK;SACP,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;SACjH,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,eAAe,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAChF,CAAC"}