agent-relay 9.2.3 → 10.0.0

package/dist/cli/commands/integration-cleanup-journal.js

@@ -0,0 +1,299 @@
+import { spawn } from 'node:child_process';
+import { createHash } from 'node:crypto';
+import fs from 'node:fs';
+import path from 'node:path';
+import { getProjectPaths } from '@agent-relay/config';
+import { formatBrokerNotFoundError, getBrokerBinaryPath } from '@agent-relay/harness-driver/broker-path';
+export class CleanupJournalError extends Error {
+    code;
+    constructor(code, message) {
+        super(message);
+        this.code = code;
+        this.name = 'CleanupJournalError';
+    }
+}
+/** Stable identity for dedup/removal. Order-insensitive over pathGlobs; an
+ * owned entry is keyed by its attemptId too, so a transaction only ever adds,
+ * upgrades, or clears ITS OWN entries and never a concurrent attempt's. The
+ * delimiter is an escaped NUL, which cannot occur in any component. */
+export function cleanupEntryKey(entry) {
+    const globs = [...(entry.pathGlobs ?? [])].sort().join(',');
+    return [
+        entry.kind,
+        entry.scope,
+        entry.id ?? '',
+        entry.provider ?? '',
+        entry.resource ?? '',
+        entry.url ?? '',
+        globs,
+        entry.owner?.attemptId ?? '',
+    ].join('\u0000');
+}
+const LOCK_TIMEOUT_MS = 5_000;
+const CONCRETE_KINDS = new Set([
+    'relayfile-webhook-subscription',
+    'relay-webhook',
+    'relay-subscription',
+]);
+function isNonEmptyString(value) {
+    return typeof value === 'string' && value.trim() !== '';
+}
+function isOptionalString(value) {
+    return value === undefined || isNonEmptyString(value);
+}
+function isValidOwner(owner) {
+    if (owner === undefined)
+        return true;
+    if (!owner || typeof owner !== 'object')
+        return false;
+    const candidate = owner;
+    return (typeof candidate.pid === 'number' &&
+        Number.isInteger(candidate.pid) &&
+        candidate.pid > 0 &&
+        isNonEmptyString(candidate.host) &&
+        isNonEmptyString(candidate.attemptId) &&
+        typeof candidate.heartbeatAt === 'number' &&
+        Number.isFinite(candidate.heartbeatAt) &&
+        candidate.heartbeatAt > 0);
+}
+/** Discriminated validation — anything short of a well-formed entry is corrupt,
+ * so a mangled journal can never be silently treated as "nothing pending". */
+function isValidEntry(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return false;
+    const entry = value;
+    if (!isNonEmptyString(entry.scope))
+        return false;
+    if (!isValidOwner(entry.owner))
+        return false;
+    if (!isOptionalString(entry.relayfileWorkspaceId))
+        return false;
+    if (CONCRETE_KINDS.has(entry.kind))
+        return isNonEmptyString(entry.id);
+    if (entry.kind === 'subscribe-attempt') {
+        if (entry.operation !== undefined &&
+            entry.operation !== 'subscribe' &&
+            entry.operation !== 'unsubscribe') {
+            return false;
+        }
+        if (entry.operation === 'unsubscribe') {
+            return isNonEmptyString(entry.provider) && isNonEmptyString(entry.resource);
+        }
+        return (isNonEmptyString(entry.url) &&
+            isNonEmptyString(entry.provider) &&
+            isNonEmptyString(entry.resource) &&
+            isNonEmptyString(entry.webhookName) &&
+            isNonEmptyString(entry.writebackUrl) &&
+            isNonEmptyString(entry.relayScope) &&
+            Array.isArray(entry.pathGlobs) &&
+            entry.pathGlobs.length > 0 &&
+            entry.pathGlobs.every(isNonEmptyString) &&
+            isOptionalString(entry.webhookId) &&
+            isOptionalString(entry.webhookSubscriptionId) &&
+            isOptionalString(entry.subscriptionId));
+    }
+    return false;
+}
+function parseEntries(raw, file) {
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch {
+        throw new CleanupJournalError('corrupt', `The pending-cleanup journal at ${file} is not valid JSON. Nothing was swept or overwritten; inspect it (it may reference external resources that still need deletion) and remove it to continue.`);
+    }
+    if (!Array.isArray(parsed) || !parsed.every(isValidEntry)) {
+        throw new CleanupJournalError('corrupt', `The pending-cleanup journal at ${file} has an unexpected shape. Nothing was swept or overwritten; inspect it and remove it to continue.`);
+    }
+    return parsed;
+}
+async function beginJournalTransaction(lockFile, journalFile) {
+    const binary = getBrokerBinaryPath();
+    if (!binary) {
+        throw new CleanupJournalError('io', formatBrokerNotFoundError());
+    }
+    const child = spawn(binary, [
+        'journal-lock',
+        '--file',
+        lockFile,
+        '--journal-file',
+        journalFile,
+        '--timeout-ms',
+        String(LOCK_TIMEOUT_MS),
+    ], { stdio: ['pipe', 'pipe', 'pipe'] });
+    const exit = new Promise((resolve) => {
+        child.on('exit', (code) => resolve(code));
+        child.on('error', () => resolve(null));
+    });
+    let exited = false;
+    void exit.then(() => {
+        exited = true;
+    });
+    // Exact framed handshake: buffer stdout until the first newline and demand
+    // the line be precisely `locked` — no substring matching, and a hard
+    // startup deadline that kills a wedged helper.
+    await new Promise((resolve, reject) => {
+        let settled = false;
+        let buffer = '';
+        const settle = (fn) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(deadline);
+            fn();
+        };
+        const deadline = setTimeout(() => {
+            settle(() => {
+                child.kill('SIGKILL');
+                reject(new CleanupJournalError('io', `The journal-lock helper did not complete its handshake for ${lockFile} in time and was killed.`));
+            });
+        }, LOCK_TIMEOUT_MS + 2_000);
+        child.stdout.on('data', (chunk) => {
+            buffer += chunk.toString('utf8');
+            const newline = buffer.indexOf('\n');
+            if (newline < 0)
+                return;
+            const line = buffer.slice(0, newline);
+            if (line === 'locked') {
+                settle(resolve);
+            }
+            else {
+                settle(() => {
+                    child.kill('SIGKILL');
+                    reject(new CleanupJournalError('io', `The journal-lock helper sent an unexpected handshake for ${lockFile}.`));
+                });
+            }
+        });
+        child.on('error', (err) => settle(() => reject(new CleanupJournalError('io', `Could not spawn the journal-lock helper (${binary}): ${err.message}`))));
+        void exit.then((code) => {
+            settle(() => {
+                if (code === 4) {
+                    reject(new CleanupJournalError('locked', `Timed out waiting for the pending-cleanup journal lock at ${lockFile}: another agent-relay process holds it. The kernel releases it automatically when that process exits; retry afterwards.`));
+                }
+                else if (code === 3) {
+                    reject(new CleanupJournalError('locked', `The pending-cleanup journal lock at ${lockFile} contains an unrecognized sentinel from an older format. Nothing was swept or overwritten; inspect and remove the file to continue.`));
+                }
+                else if (code === 2) {
+                    // clap usage error: this broker binary predates the journal-lock
+                    // helper (version skew), or the invocation is malformed.
+                    reject(new CleanupJournalError('io', `The resolved agent-relay-broker binary (${binary}) does not support the journal-lock helper; upgrade the broker (or set AGENT_RELAY_BIN to a current build) and retry.`));
+                }
+                else {
+                    reject(new CleanupJournalError('io', `The journal-lock helper exited unexpectedly (code ${code ?? 'unknown'}) before acquiring ${lockFile}.`));
+                }
+            });
+        });
+    });
+    const finish = async (payload, failure) => {
+        const committing = payload !== undefined;
+        if (exited) {
+            if (committing) {
+                // The lock (and with it transactional isolation) is already gone; the
+                // journal is untouched — surface instead of committing blind.
+                throw new CleanupJournalError('io', failure);
+            }
+            return; // abort: nothing left to release
+        }
+        // The helper can die between the `exited` check and (or during) the
+        // stdin write: swallow the stream error (EPIPE would otherwise be an
+        // unhandled 'error' event) and never hang on an end-callback that will
+        // no longer fire — the authoritative verdict is the exit code below.
+        await new Promise((resolve) => {
+            let settled = false;
+            const settle = () => {
+                if (settled)
+                    return;
+                settled = true;
+                resolve();
+            };
+            const stdin = child.stdin;
+            stdin.once('error', settle);
+            void exit.then(settle);
+            try {
+                if (committing) {
+                    stdin.end(payload, settle);
+                }
+                else {
+                    stdin.end(settle);
+                }
+            }
+            catch {
+                settle();
+            }
+        });
+        const code = await exit;
+        if (committing && code !== 0) {
+            throw new CleanupJournalError('io', failure);
+        }
+    };
+    return {
+        async abort() {
+            if (exited)
+                return;
+            await finish(undefined, '');
+        },
+        async commit(payload) {
+            // Framed envelope: magic/version + declared byte length + SHA-256 of
+            // the payload. The helper commits ONLY after both validate exactly, so
+            // a parent dying mid-write (partial bytes + clean EOF) can never
+            // replace good journal contents with a truncated payload. Frame
+            // construction failures release the lock (abort) instead of leaving
+            // the helper's stdin open.
+            let framed;
+            try {
+                const body = Buffer.from(payload, 'utf8');
+                const digest = createHash('sha256').update(body).digest('hex');
+                framed = Buffer.concat([Buffer.from(`ARJL1\n${body.byteLength}\n${digest}\n`, 'utf8'), body]);
+            }
+            catch (err) {
+                await finish(undefined, '');
+                throw new CleanupJournalError('io', `Could not frame the pending-cleanup journal payload: ${err instanceof Error ? err.message : String(err)}`);
+            }
+            await finish(framed, `The journal-lock helper was lost before the pending-cleanup journal at ${journalFile} could be committed; the journal was left unmodified.`);
+        },
+    };
+}
+/** File-backed CleanupJournal in the project data dir. Paths resolve per call.
+ * `dataDirOverride` exists for tests only — production callers use the default. */
+export function fileCleanupJournal(dataDirOverride) {
+    const journalFile = () => path.join(dataDirOverride ?? getProjectPaths().dataDir, 'pending-cleanups.json');
+    const read = (file) => {
+        let raw;
+        try {
+            raw = fs.readFileSync(file, 'utf8');
+        }
+        catch (err) {
+            if (err.code === 'ENOENT')
+                return [];
+            throw new CleanupJournalError('io', `Could not read the pending-cleanup journal at ${file}: ${err instanceof Error ? err.message : String(err)}`);
+        }
+        return parseEntries(raw, file);
+    };
+    return {
+        async list() {
+            return read(journalFile());
+        },
+        async update(mutate) {
+            const file = journalFile();
+            fs.mkdirSync(path.dirname(file), { recursive: true });
+            const transaction = await beginJournalTransaction(`${file}.lock`, file);
+            // EVERYTHING that can throw before the commit — the read, the mutator,
+            // and the serialization itself — runs inside the abort-protected block,
+            // or a failure would leave the helper's stdin open and the lock held
+            // until this process exits.
+            let payload;
+            try {
+                const next = await mutate(read(file));
+                payload = `${JSON.stringify(next)}\n`;
+            }
+            catch (err) {
+                await transaction.abort();
+                throw err;
+            }
+            // The helper performs the durable replacement (temp + fsync + atomic
+            // rename + dir fsync) while it still holds the kernel lock.
+            await transaction.commit(payload);
+        },
+    };
+}
+//# sourceMappingURL=integration-cleanup-journal.js.map

package/dist/cli/commands/integration-cleanup-journal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"integration-cleanup-journal.js","sourceRoot":"","sources":["../../../src/cli/commands/integration-cleanup-journal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAwHzG,MAAM,OAAO,mBAAoB,SAAQ,KAAK;IAE1B;IADlB,YACkB,IAAiC,EACjD,OAAe;QAEf,KAAK,CAAC,OAAO,CAAC,CAAC;QAHC,SAAI,GAAJ,IAAI,CAA6B;QAIjD,IAAI,CAAC,IAAI,GAAG,qBAAqB,CAAC;IACpC,CAAC;CACF;AAED;;;uEAGuE;AACvE,MAAM,UAAU,eAAe,CAAC,KAA0B;IACxD,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5D,OAAO;QACL,KAAK,CAAC,IAAI;QACV,KAAK,CAAC,KAAK;QACX,KAAK,CAAC,EAAE,IAAI,EAAE;QACd,KAAK,CAAC,QAAQ,IAAI,EAAE;QACpB,KAAK,CAAC,QAAQ,IAAI,EAAE;QACpB,KAAK,CAAC,GAAG,IAAI,EAAE;QACf,KAAK;QACL,KAAK,CAAC,KAAK,EAAE,SAAS,IAAI,EAAE;KAC7B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACnB,CAAC;AAED,MAAM,eAAe,GAAG,KAAK,CAAC;AAE9B,MAAM,cAAc,GAAwB,IAAI,GAAG,CAAC;IAClD,gCAAgC;IAChC,eAAe;IACf,oBAAoB;CACrB,CAAC,CAAC;AAEH,SAAS,gBAAgB,CAAC,KAAc;IACtC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;AAC1D,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACtC,OAAO,KAAK,KAAK,SAAS,IAAI,gBAAgB,CAAC,KAAK,CAAC,CAAC;AACxD,CAAC;AAED,SAAS,YAAY,CAAC,KAAc;IAClC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACrC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACtD,MAAM,SAAS,GAAG,KAA4B,CAAC;IAC/C,OAAO,CACL,OAAO,SAAS,CAAC,GAAG,KAAK,QAAQ;QACjC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC;QAC/B,SAAS,CAAC,GAAG,GAAG,CAAC;QACjB,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC;QAChC,gBAAgB,CAAC,SAAS,CAAC,SAAS,CAAC;QACrC,OAAO,SAAS,CAAC,WAAW,KAAK,QAAQ;QACzC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,WAAW,CAAC;QACtC,SAAS,CAAC,WAAW,GAAG,CAAC,CAC1B,CAAC;AACJ,CAAC;AAED;8EAC8E;AAC9E,SAAS,YAAY,CAAC,KAAc;IAClC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9E,MAAM,KAAK,GAAG,KAA4B,CAAC;IAC3C,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACjD,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7C,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,oBAAoB,CAAC;QAAE,OAAO,KAAK,CAAC;IAChE,IAAI,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;QAAE,OAAO,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACtE,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;QACvC,IACE,KAAK,CAAC,SAAS,KAAK,SAAS;YAC7B,KAAK,CAAC,SAAS,KAAK,WAAW;YAC/B,KAAK,CAAC,SAAS,KAAK,aAAa,EACjC,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,KAAK,CAAC,SAAS,KAAK,aAAa,EAAE,CAAC;YACtC,OAAO,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC9E,CAAC;QACD,OAAO,CACL,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC;YAC3B,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC;YAChC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC;YAChC,gBAAgB,CAAC,KAAK,CAAC,WAAW,CAAC;YACnC,gBAAgB,CAAC,KAAK,CAAC,YAAY,CAAC;YACpC,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAC;YAClC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC;YAC9B,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;YAC1B,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,gBAAgB,CAAC;YACvC,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC;YACjC,gBAAgB,CAAC,KAAK,CAAC,qBAAqB,CAAC;YAC7C,gBAAgB,CAAC,KAAK,CAAC,cAAc,CAAC,CACvC,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,YAAY,CAAC,GAAW,EAAE,IAAY;IAC7C,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,mBAAmB,CAC3B,SAAS,EACT,kCAAkC,IAAI,4JAA4J,CACnM,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,mBAAmB,CAC3B,SAAS,EACT,kCAAkC,IAAI,mGAAmG,CAC1I,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AA+BD,KAAK,UAAU,uBAAuB,CAAC,QAAgB,EAAE,WAAmB;IAC1E,MAAM,MAAM,GAAG,mBAAmB,EAAE,CAAC;IACrC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,mBAAmB,CAAC,IAAI,EAAE,yBAAyB,EAAE,CAAC,CAAC;IACnE,CAAC;IACD,MAAM,KAAK,GAAG,KAAK,CACjB,MAAM,EACN;QACE,cAAc;QACd,QAAQ;QACR,QAAQ;QACR,gBAAgB;QAChB,WAAW;QACX,cAAc;QACd,MAAM,CAAC,eAAe,CAAC;KACxB,EACD,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CACpC,CAAC;IAEF,MAAM,IAAI,GAAG,IAAI,OAAO,CAAgB,CAAC,OAAO,EAAE,EAAE;QAClD,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1C,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IACH,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;QAClB,MAAM,GAAG,IAAI,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,2EAA2E;IAC3E,qEAAqE;IACrE,+CAA+C;IAC/C,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC1C,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,MAAM,GAAG,CAAC,EAAc,EAAE,EAAE;YAChC,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,YAAY,CAAC,QAAQ,CAAC,CAAC;YACvB,EAAE,EAAE,CAAC;QACP,CAAC,CAAC;QACF,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE;YAC/B,MAAM,CAAC,GAAG,EAAE;gBACV,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACtB,MAAM,CACJ,IAAI,mBAAmB,CACrB,IAAI,EACJ,8DAA8D,QAAQ,0BAA0B,CACjG,CACF,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,EAAE,eAAe,GAAG,KAAK,CAAC,CAAC;QAC5B,KAAK,CAAC,MAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAa,EAAE,EAAE;YACzC,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACjC,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,OAAO,GAAG,CAAC;gBAAE,OAAO;YACxB,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;YACtC,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtB,MAAM,CAAC,OAAO,CAAC,CAAC;YAClB,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,EAAE;oBACV,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBACtB,MAAM,CACJ,IAAI,mBAAmB,CACrB,IAAI,EACJ,4DAA4D,QAAQ,GAAG,CACxE,CACF,CAAC;gBACJ,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CACxB,MAAM,CAAC,GAAG,EAAE,CACV,MAAM,CACJ,IAAI,mBAAmB,CAAC,IAAI,EAAE,4CAA4C,MAAM,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC,CACrG,CACF,CACF,CAAC;QACF,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACtB,MAAM,CAAC,GAAG,EAAE;gBACV,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBACf,MAAM,CACJ,IAAI,mBAAmB,CACrB,QAAQ,EACR,6DAA6D,QAAQ,yHAAyH,CAC/L,CACF,CAAC;gBACJ,CAAC;qBAAM,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBACtB,MAAM,CACJ,IAAI,mBAAmB,CACrB,QAAQ,EACR,uCAAuC,QAAQ,qIAAqI,CACrL,CACF,CAAC;gBACJ,CAAC;qBAAM,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;oBACtB,iEAAiE;oBACjE,yDAAyD;oBACzD,MAAM,CACJ,IAAI,mBAAmB,CACrB,IAAI,EACJ,2CAA2C,MAAM,uHAAuH,CACzK,CACF,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,MAAM,CACJ,IAAI,mBAAmB,CACrB,IAAI,EACJ,qDAAqD,IAAI,IAAI,SAAS,sBAAsB,QAAQ,GAAG,CACxG,CACF,CAAC;gBACJ,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,KAAK,EAAE,OAA2B,EAAE,OAAe,EAAiB,EAAE;QACnF,MAAM,UAAU,GAAG,OAAO,KAAK,SAAS,CAAC;QACzC,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,UAAU,EAAE,CAAC;gBACf,sEAAsE;gBACtE,8DAA8D;gBAC9D,MAAM,IAAI,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC/C,CAAC;YACD,OAAO,CAAC,iCAAiC;QAC3C,CAAC;QACD,oEAAoE;QACpE,qEAAqE;QACrE,uEAAuE;QACvE,qEAAqE;QACrE,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,IAAI,OAAO,GAAG,KAAK,CAAC;YACpB,MAAM,MAAM,GAAG,GAAG,EAAE;gBAClB,IAAI,OAAO;oBAAE,OAAO;gBACpB,OAAO,GAAG,IAAI,CAAC;gBACf,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC;YACF,MAAM,KAAK,GAAG,KAAK,CAAC,KAAM,CAAC;YAC3B,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC5B,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACvB,IAAI,CAAC;gBACH,IAAI,UAAU,EAAE,CAAC;oBACf,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAC7B,CAAC;qBAAM,CAAC;oBACN,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACpB,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,EAAE,CAAC;YACX,CAAC;QACH,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC;QACxB,IAAI,UAAU,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC,CAAC;IAEF,OAAO;QACL,KAAK,CAAC,KAAK;YACT,IAAI,MAAM;gBAAE,OAAO;YACnB,MAAM,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC9B,CAAC;QACD,KAAK,CAAC,MAAM,CAAC,OAAe;YAC1B,qEAAqE;YACrE,uEAAuE;YACvE,iEAAiE;YACjE,gEAAgE;YAChE,oEAAoE;YACpE,2BAA2B;YAC3B,IAAI,MAAc,CAAC;YACnB,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAC1C,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAC/D,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,KAAK,MAAM,IAAI,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;YAChG,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;gBAC5B,MAAM,IAAI,mBAAmB,CAC3B,IAAI,EACJ,wDAAwD,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAC3G,CAAC;YACJ,CAAC;YACD,MAAM,MAAM,CACV,MAAM,EACN,0EAA0E,WAAW,uDAAuD,CAC7I,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED;mFACmF;AACnF,MAAM,UAAU,kBAAkB,CAAC,eAAwB;IACzD,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,eAAe,EAAE,CAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC;IAE3G,MAAM,IAAI,GAAG,CAAC,IAAY,EAAyB,EAAE;QACnD,IAAI,GAAW,CAAC;QAChB,IAAI,CAAC;YACH,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACtC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAK,GAA6B,CAAC,IAAI,KAAK,QAAQ;gBAAE,OAAO,EAAE,CAAC;YAChE,MAAM,IAAI,mBAAmB,CAC3B,IAAI,EACJ,iDAAiD,IAAI,KAAK,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAC7G,CAAC;QACJ,CAAC;QACD,OAAO,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACjC,CAAC,CAAC;IAEF,OAAO;QACL,KAAK,CAAC,IAAI;YACR,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAC7B,CAAC;QACD,KAAK,CAAC,MAAM,CAAC,MAAM;YACjB,MAAM,IAAI,GAAG,WAAW,EAAE,CAAC;YAC3B,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACtD,MAAM,WAAW,GAAG,MAAM,uBAAuB,CAAC,GAAG,IAAI,OAAO,EAAE,IAAI,CAAC,CAAC;YACxE,uEAAuE;YACvE,wEAAwE;YACxE,qEAAqE;YACrE,4BAA4B;YAC5B,IAAI,OAAe,CAAC;YACpB,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBACtC,OAAO,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;YACxC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC;gBAC1B,MAAM,GAAG,CAAC;YACZ,CAAC;YACD,qEAAqE;YACrE,4DAA4D;YAC5D,MAAM,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/cli/commands/integration.d.ts

@@ -1,5 +1,7 @@
 import type { Command } from 'commander';
+import { type CleanupJournal } from './integration-cleanup-journal.js';
 import { type SdkCommandDeps } from '../lib/sdk-command.js';
+import type { SdkClientOptions } from '../lib/sdk-client.js';
 import { MIN_RELAYFILE_VERSION, assertRelayfileVersion, type RelayfileClientOptions } from '@relayfile/client';
 export { MIN_RELAYFILE_VERSION, assertRelayfileVersion };
 export interface LocalRelayOptions {
@@ -12,6 +14,11 @@ export interface RelayfileBinding {
     channel: string;
     webhookId: string;
     subscriptionId: string;
+    /** relayfile-cloud subscription that forwards provider records to the inbound webhook. */
+    webhookSubscriptionId?: string;
+    /** Workspace that subscription was created in — pins cleanup deletes across
+     * active-workspace switches. */
+    webhookSubscriptionWorkspaceId?: string;
 }
 export interface RelayfileResolvedResource {
     /** Canonical VFS path glob relayfile stores the binding under (begins with '/'). */
@@ -24,10 +31,15 @@ export interface RelayfileWritebackBinding {
     url: string;
     /** Per-channel HMAC secret the subscription signs deliveries with. */
     secret: string;
+    /** Workspace that resolved this binding (daemons >= relayfile#346) — the
+     * pre-create workspace pin for the cleanup journal. */
+    workspaceId?: string;
 }
 export interface RelayfileWebhookSubscription {
     subscriptionId: string;
     secret?: string;
+    /** Workspace the subscription was created in (daemons >= relayfile#346). */
+    workspaceId?: string;
 }
 export interface RelayfileBridge {
     isConnected(provider: string): Promise<boolean>;
@@ -39,6 +51,8 @@ export interface RelayfileBridge {
         webhookId: string;
         webhookToken: string;
         subscriptionId: string;
+        webhookSubscriptionId: string;
+        webhookSubscriptionWorkspaceId?: string;
     }): Promise<void>;
     listBindings(): Promise<RelayfileBinding[]>;
     unbind(provider: string, resource: string): Promise<void>;
@@ -69,12 +83,29 @@ export interface RelayfileBridge {
         url: string;
         pathGlobs: string[];
         secret: string;
+        /** Pins the create to the pre-resolved workspace, so the created
+         * subscription can never land in a workspace other than the one already
+         * journaled in the attempt record. */
+        workspace?: string;
     }): Promise<RelayfileWebhookSubscription>;
-    deleteWebhookSubscription(subscriptionId: string): Promise<void>;
+    /** `workspace` pins the delete to the workspace the subscription was
+     * created in, guarding against active-workspace switches between runs. */
+    deleteWebhookSubscription(subscriptionId: string, workspace?: string): Promise<void>;
+    /** Lists a workspace's inbound webhook subscriptions so crash-recovery can
+     * find subscriptions whose server-assigned id was never persisted. */
+    listWebhookSubscriptions: (workspace?: string) => Promise<{
+        workspaceId?: string;
+        subscriptions: Array<{
+            subscriptionId: string;
+            url: string;
+            pathGlobs: string[];
+        }>;
+    }>;
 }
 export type IntegrationCommandDependencies = SdkCommandDeps & {
     resolveLocalRelayOptions: () => Promise<LocalRelayOptions | undefined>;
     relayfile: RelayfileBridge;
+    cleanupJournal: CleanupJournal;
     isInteractive: () => boolean;
     prompt: (question: string) => Promise<string>;
 };
@@ -86,5 +117,36 @@ export type IntegrationCommandDependencies = SdkCommandDeps & {
  * field/method drift is a typed error, not a silent runtime surprise.
  */
 export declare function defaultRelayfileBridge(options?: RelayfileClientOptions): RelayfileBridge;
+/**
+ * Non-secret identity of the relay connection a journal entry may retry
+ * through. The workspace key is a credential, so it is run through a
+ * purpose-domain PBKDF2 (never a bare hash — CodeQL
+ * js/insufficient-password-hash) with the base URL as the salt domain; only
+ * the derived digest is ever stored.
+ */
+export declare function relayCleanupScope(options: SdkClientOptions): string;
+/**
+ * Bounded lease window for entry owners, set safely ABOVE every remote
+ * request timeout any lifecycle or recovery performs (each spans seconds; a
+ * reconciliation at most a few request timeouts). Explicit bounded-lease
+ * tradeoff: a process paused (e.g. SIGSTOP) past this window loses its
+ * lease and a rival may proceed — accepted deliberately, because the
+ * alternative (pure pid probing) lets PID reuse wedge lifecycles FOREVER.
+ */
+/**
+ * Lease timing knobs, exported as one mutable object ONLY so tests can run
+ * deterministic renewal scenarios with tiny windows; production code never
+ * mutates it. renewalMs sits well below leaseMs so an active lifecycle
+ * refreshes its lease several times per window.
+ */
+export declare const OWNER_LEASE_CONFIG: {
+    leaseMs: number;
+    renewalMs: number;
+    /** Tolerated forward clock skew. A heartbeat further in the FUTURE than
+     * this is malformed or from a skewed clock and counts as expired —
+     * otherwise a finite future value (e.g. 9e15) would make its owner live
+     * forever and unbound the lease again. */
+    skewMs: number;
+};
 export declare function registerIntegrationCommands(program: Command, overrides?: Partial<IntegrationCommandDependencies>): void;
 //# sourceMappingURL=integration.d.ts.map

package/dist/cli/commands/integration.d.ts.map

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