@agentcomms/events-daemon 0.27.1 → 0.29.0

package/README.md

@@ -123,6 +123,12 @@ approval preview then shows exactly what changes.
   - `doctor`, a content-free health report.
   
   Every command takes `--json`. The [CLI reference](../../docs/reference/events-daemon-cli.md) lists them all.
+- **What it delivered:** from 0.29.0, what each delivery came to (delivered, failed, or dropped before it was
+  delivered) is a line in agent-communications' private activity log, under the event service's own session. A line
+  names the rule, the account the events came from, how many events, the target and the outcome. It never holds the
+  event, its sender or its subject, nor a webhook's URL. `agentcomms activity sessions` lists the session, and
+  `agentcomms activity record off` stops the recording
+  ([activity](../../README.md#what-your-agents-did-activity)).
 
 ## Agents and approvals
 

package/dist/{b3-contract-D1Zy-xLG.mjs → b3-contract-BmdhGHkq.mjs}

@@ -852,7 +852,7 @@ async function removeTarget(targetId, options = {}) {
 //#endregion
 //#region src/version.ts
 /** The package version, read from package.json at build time. */
-const VERSION = "0.27.1";
+const VERSION = "0.29.0";
 //#endregion
 //#region src/mcp/server.ts
 function reply(data) {

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { $ as addSubscriber, $t as isControlHello, A as normaliseSourceOptions, At as updateJudge, B as canonicalJudgeKindEnablement, Bt as deliveriesList, C as normaliseActivationDocument, Ct as judgeKindsList, D as normaliseGmailSourceOptions, Dt as removeJudge, E as classifySourceOptionChange, Et as judgesList, F as assertCreatableLayaJudge, Ft as doctor, G as registerLayaEnablementInputs, Gt as catalogueShow, H as layaEnablementInputsFor, Ht as heldList, I as assertLayaJudgeKindAvailable, It as ACTIVATION_FAILURE, J as addTarget, Jt as probeControl, K as createEventsMcpServer, Kt as approvalView, L as assertLayaRuleJudgeOffered, Lt as isActivationFailureCode, M as APPROVED_TYPESAFE_MODELS, Mt as assertDoctorReportV1, N as JUDGE_BUDGET_ID, Nt as assertDoctorReportV2, O as normaliseResendSourceOptions, Ot as removeJudgeModel, P as JUDGE_KIND_DEFINITIONS, Pt as assertDoctorReportV3, Q as targetTest, Qt as encodeControlFrame, R as canonicalJudge, Rt as disableAll, S as disclosureBindingFor, St as enableJudgeKind, T as sseDeliveryTarget, Tt as judgeTest, U as layaJudgeKindDefinitionFor, Ut as retryDelivery, V as judgeKindDefinition, Vt as dropDelivery, W as layaJudgeTermsFor, Wt as catalogueList, X as targetsList, Xt as ControlFrameReader, Y as removeTarget$1, Yt as CONTROL_PROTOCOL_VERSIONS, Z as updateTarget, Zt as controlFailure, _ as isOwnerControlWireOperation, _t as pause, an as readInstance, at as loadSqlite, b as canonicalSubscriber, bt as budgetShow, cn as assertControlSupported, ct as createRule$1, d as B3_SECRET_TERMINAL_ORIGIN, dn as verifyControlSocket, dt as removeRule, en as isControlRequest, et as removeSubscriber, f as isB3ControlOperation, fn as verifyPrivateSocketDirectory, ft as ruleShow$1, g as OWNER_CONTROL_WIRES, gn as eventPaths, gt as ruleTestRetained, h as layaJudgePreviewFor, hn as ensureOwnerOnlyFile, ht as ruleTest, in as processIsLive, it as status, j as normaliseWhatsAppSourceOptions, jt as enableAll, k as normaliseSlackSourceOptions, kt as updateBudget, ln as assertSocketPathFits, lt as disableRule$1, m as renderB3ApprovalPreviewV1, mn as ensureEventSocketDirectory, mt as updateRule, nn as mayRecoverStaleInstance, nt as updateSubscriber, on as removeInstance, ot as sourceShow$1, p as isB3SecretOperation, pn as ensureEventPaths, pt as rulesList, q as VERSION, qt as EventControlClient, rn as newInstanceRecord, rt as stop, sn as writeInstance, st as sourcesList, tn as negotiateVersion, tt as subscribersList, un as controlEndpoint, ut as enableRule, v as activationDocumentDigest, vt as resume, w as canonicalSseSubscriber, wt as judgeModelStatus, x as canonicalTarget, xt as disableJudgeKind, y as canonicalFullRuleDocument, yt as addJudge, z as canonicalJudgeBudget, zt as decideHeld } from "./b3-contract-D1Zy-xLG.mjs";
+import { $ as addSubscriber, $t as isControlHello, A as normaliseSourceOptions, At as updateJudge, B as canonicalJudgeKindEnablement, Bt as deliveriesList, C as normaliseActivationDocument, Ct as judgeKindsList, D as normaliseGmailSourceOptions, Dt as removeJudge, E as classifySourceOptionChange, Et as judgesList, F as assertCreatableLayaJudge, Ft as doctor, G as registerLayaEnablementInputs, Gt as catalogueShow, H as layaEnablementInputsFor, Ht as heldList, I as assertLayaJudgeKindAvailable, It as ACTIVATION_FAILURE, J as addTarget, Jt as probeControl, K as createEventsMcpServer, Kt as approvalView, L as assertLayaRuleJudgeOffered, Lt as isActivationFailureCode, M as APPROVED_TYPESAFE_MODELS, Mt as assertDoctorReportV1, N as JUDGE_BUDGET_ID, Nt as assertDoctorReportV2, O as normaliseResendSourceOptions, Ot as removeJudgeModel, P as JUDGE_KIND_DEFINITIONS, Pt as assertDoctorReportV3, Q as targetTest, Qt as encodeControlFrame, R as canonicalJudge, Rt as disableAll, S as disclosureBindingFor, St as enableJudgeKind, T as sseDeliveryTarget, Tt as judgeTest, U as layaJudgeKindDefinitionFor, Ut as retryDelivery, V as judgeKindDefinition, Vt as dropDelivery, W as layaJudgeTermsFor, Wt as catalogueList, X as targetsList, Xt as ControlFrameReader, Y as removeTarget$1, Yt as CONTROL_PROTOCOL_VERSIONS, Z as updateTarget, Zt as controlFailure, _ as isOwnerControlWireOperation, _t as pause, an as readInstance, at as loadSqlite, b as canonicalSubscriber, bt as budgetShow, cn as assertControlSupported, ct as createRule$1, d as B3_SECRET_TERMINAL_ORIGIN, dn as verifyControlSocket, dt as removeRule, en as isControlRequest, et as removeSubscriber, f as isB3ControlOperation, fn as verifyPrivateSocketDirectory, ft as ruleShow$1, g as OWNER_CONTROL_WIRES, gn as eventPaths, gt as ruleTestRetained, h as layaJudgePreviewFor, hn as ensureOwnerOnlyFile, ht as ruleTest, in as processIsLive, it as status, j as normaliseWhatsAppSourceOptions, jt as enableAll, k as normaliseSlackSourceOptions, kt as updateBudget, ln as assertSocketPathFits, lt as disableRule$1, m as renderB3ApprovalPreviewV1, mn as ensureEventSocketDirectory, mt as updateRule, nn as mayRecoverStaleInstance, nt as updateSubscriber, on as removeInstance, ot as sourceShow$1, p as isB3SecretOperation, pn as ensureEventPaths, pt as rulesList, q as VERSION, qt as EventControlClient, rn as newInstanceRecord, rt as stop, sn as writeInstance, st as sourcesList, tn as negotiateVersion, tt as subscribersList, un as controlEndpoint, ut as enableRule, v as activationDocumentDigest, vt as resume, w as canonicalSseSubscriber, wt as judgeModelStatus, x as canonicalTarget, xt as disableJudgeKind, y as canonicalFullRuleDocument, yt as addJudge, z as canonicalJudgeBudget, zt as decideHeld } from "./b3-contract-BmdhGHkq.mjs";
 import { a as createLayaWorkerBoundary, d as encodeWorkerFrame, h as isLayaTemplateId, l as WorkerFrameParser, u as createWorkerRequestId, v as installErrorSink } from "./worker-boundary-probe-CFN6EsyK.mjs";
 import { _ as JUDGE_KIND_TYPESAFE, c as validateLocalEndpoint, d as assertApprovedAddressSet, f as parseIpLiteral, h as JUDGE_KIND_LAYA, i as webhookDeliveryTarget, l as AddressPolicyError, m as JUDGE_KINDS, n as canonicalWebhookTarget, p as EventDomainError, r as secretWebhookUrlDescriptor, t as canonicalSecretWebhookUrl, u as assertAddressAllowed, v as assertJudgeKindEnabled, y as isJudgeKind } from "./webhook-target-EzLIFpIY.mjs";
 import { c as migrateEventSecrets, i as RecordStorageError, l as openEventSecretStore, n as LayaModelRepository, o as WriterQuiescer, s as withEventWriterLease, t as EventRecordCipher } from "./records-BRl5wEbC.mjs";
@@ -7,7 +7,7 @@ import process$1 from "node:process";
 import { createHash, createHmac, randomBytes, randomUUID, timingSafeEqual } from "node:crypto";
 import { appendFile, chmod, lstat, mkdir, mkdtemp, open, readFile, readdir, rename, rm, statfs, writeFile } from "node:fs/promises";
 import net, { createServer } from "node:net";
-import { CommsError, TaintCollector, agentMarker, canPrompt, canonicalJson, escapeForDisplay, hashChallenge, isCommsError, isDangerous, neutralise, newBoundary, openCore, renderFencedBody, resolvePaths, sanitizeHtmlToText, sanitizePlainText, sha256Hex, stripInvisible, wrapUntrusted } from "@agentcomms/core";
+import { CommsError, TaintCollector, agentMarker, canPrompt, canonicalJson, escapeForDisplay, hashChallenge, isCommsError, isDangerous, neutralise, newBoundary, openCore, recordActivity, renderFencedBody, resolvePaths, sanitizeHtmlToText, sanitizePlainText, sessionIdentity, sha256Hex, stripInvisible, wrapUntrusted } from "@agentcomms/core";
 import fs, { constants, createReadStream } from "node:fs";
 import path, { basename, dirname, join, resolve, sep } from "node:path";
 import { CATALOGUE, TEST_CLOUD_EVENT, TEST_CLOUD_EVENT_BYTES, applyRepresentation, buildCloudEvent, canonicalJson as canonicalJson$1, catalogueEntry, classifyMapped, cloudEventBytes, compileMapping, conditionPointers, evaluateCondition, evaluateMapping, eventId, eventIdPreimage, expandPattern, getPointer, gmailMessageLabelledV1, gmailMessageReceivedV1, gmailMessageSentV1, parsePointer, validateEvent, whatsappMessageKey } from "@agentcomms/events";
@@ -14893,6 +14893,189 @@ var TargetResumeControl = class {
 	}
 };
 //#endregion
+//#region src/runtime/delivery-activity.ts
+/**
+* The event service's own "told" lines in agent-communications' activity log (activity design S1, §8 Task 2c): one
+* line for what each delivery came to — delivered, failed, or dropped — naming the rule, the account its events came
+* from, how many events, the target, and the outcome.
+*
+* - **Never content.** A line is built only from a delivery's rule id, account id, target id and closed terminal
+*   state. No payload, CloudEvent, sender, subject, event id or provider error text is read, so none can be written
+*   (events design D7, D8 and Appendix A keep every payload out of every log). A target is named by its id, never its
+*   URL or a secret.
+* - **After the outcome is durable.** The outcome is read back from the committed `deliveries` row; every delivery
+*   transaction is synchronous, so no read here sees one half-done, and a pass inside an open transaction waits for
+*   the next.
+* - **Once.** Each delivery is counted in exactly one line: the first terminal state it is seen in. A dead letter
+*   whose payload is later purged, or dropped, is not counted again. Deliveries already finished when this process
+*   started were counted by the process that finished them.
+* - **Grouped.** Outcomes seen in one pass with the same rule, account, target and outcome are one line, whose count
+*   is how many events they were ("Delivered 3 events from david-on-slack to my-hook").
+* - **Best effort, as every activity line is (§4.6).** Recording never changes or delays a delivery, never throws, and
+*   a line lost to a crash between a delivery's commit and the next pass is not written later: the event database
+*   stays the record of what was delivered.
+*/
+/** The activity log's operation for a delivery outcome. Not a capability: no CLI or MCP call makes it. */
+const DELIVERY_ACTIVITY_OPERATION = "events.delivery";
+/** The channel word a delivery outcome is recorded under: the event service's. */
+const DELIVERY_ACTIVITY_CHANNEL = "events";
+/** How often the owner records the outcomes reached since its last pass, by default. */
+const DELIVERY_ACTIVITY_INTERVAL_MS = 5e3;
+/** Deliveries that may still be delivered; every other state is an outcome. */
+const OPEN_STATES = "('queued', 'retryable', 'disclosing')";
+/**
+* Each terminal delivery state as an activity outcome:
+* - `ok`: delivered;
+* - `failed`: every attempt failed, its deadline passed first, or its stored copy could not be read;
+* - `refused`: dropped before it was delivered, because its rule, target, subscriber or account was removed, collection
+*   was switched off, or its chat was hidden.
+*/
+const OUTCOMES = Object.freeze({
+	delivered: "ok",
+	"dead-lettered": "failed",
+	"retention-expired": "failed",
+	"content-unreadable": "failed",
+	cancelled: "refused",
+	"in-flight-at-disable": "refused",
+	"in-flight-at-account-removal": "refused"
+});
+var DeliveryActivity = class {
+	#store;
+	#core;
+	#config;
+	#sessionOf;
+	#session;
+	/** The highest delivery row seen; every row above it is new since the last pass. */
+	#high;
+	/** Rows seen while they could still be delivered. */
+	#open = /* @__PURE__ */ new Set();
+	#timer;
+	#writing = Promise.resolve();
+	#stopped = false;
+	/** Set when the baseline could not be read: this process then records nothing. */
+	#blind = false;
+	/** Takes the baseline: what is already finished was counted by the process that finished it. */
+	constructor(options) {
+		this.#store = options.store;
+		this.#core = options.core;
+		this.#config = options.config;
+		this.#sessionOf = options.session ?? (() => sessionIdentity("daemon"));
+		try {
+			const database = this.#store.database;
+			this.#high = Number(database.prepare("SELECT coalesce(max(rowid), 0) AS high FROM deliveries").get().high);
+			for (const row of database.prepare(`SELECT rowid AS seq FROM deliveries WHERE state IN ${OPEN_STATES}`).all()) this.#open.add(Number(row.seq));
+		} catch {
+			this.#high = 0;
+			this.#blind = true;
+		}
+	}
+	/** Records the outcomes reached since the last pass every `intervalMs`, until `stop`. */
+	start(intervalMs = DELIVERY_ACTIVITY_INTERVAL_MS) {
+		if (this.#timer !== void 0 || this.#stopped || this.#blind) return;
+		this.#timer = setInterval(() => {
+			this.record();
+		}, intervalMs);
+		this.#timer.unref?.();
+	}
+	/**
+	* Records every outcome reached since the last pass, and resolves once its lines are written. Never throws. The
+	* rows are read and marked counted at once, before anything awaits, so two passes never count one delivery twice.
+	*/
+	record() {
+		if (this.#blind) return this.#writing;
+		let settled;
+		try {
+			settled = this.#settle();
+		} catch {
+			settled = [];
+		}
+		if (settled.length > 0) this.#writing = this.#writing.then(() => this.#write(settled));
+		return this.#writing;
+	}
+	/** Stops the timer and records what the last work finished. Call it before the event database closes. */
+	async stop() {
+		if (this.#timer !== void 0) clearInterval(this.#timer);
+		this.#timer = void 0;
+		if (this.#stopped) return this.#writing;
+		this.#stopped = true;
+		return this.record();
+	}
+	#settle() {
+		const database = this.#store.database;
+		if (database.isTransaction) return [];
+		const columns = "d.rowid AS seq, d.rule_id, d.account_id, d.target_id, d.state, d.dead_lettered_at";
+		const watched = this.#open.size === 0 ? [] : database.prepare(`SELECT ${columns} FROM json_each(?) AS watching JOIN deliveries d ON d.rowid = watching.value`).all(JSON.stringify([...this.#open]));
+		const fresh = database.prepare(`SELECT ${columns} FROM deliveries d WHERE d.rowid > ? ORDER BY d.rowid`).all(this.#high);
+		const seen = /* @__PURE__ */ new Set();
+		const settled = [];
+		for (const row of [...watched, ...fresh]) {
+			const seq = Number(row.seq);
+			if (seen.has(seq)) continue;
+			seen.add(seq);
+			if (seq > this.#high) this.#high = seq;
+			const outcome = OUTCOMES[row.state];
+			if (outcome === void 0) {
+				this.#open.add(seq);
+				continue;
+			}
+			this.#open.delete(seq);
+			settled.push({
+				rule: row.rule_id,
+				accountId: row.account_id,
+				target: row.target_id,
+				outcome,
+				reason: outcome === "ok" ? void 0 : row.dead_lettered_at !== null ? "dead-lettered" : row.state
+			});
+		}
+		for (const seq of this.#open) if (!seen.has(seq)) this.#open.delete(seq);
+		return settled;
+	}
+	async #write(settled) {
+		try {
+			const groups = /* @__PURE__ */ new Map();
+			for (const one of settled) {
+				const key = JSON.stringify([
+					one.rule,
+					one.accountId,
+					one.target,
+					one.outcome,
+					one.reason ?? null
+				]);
+				const group = groups.get(key);
+				if (group === void 0) groups.set(key, {
+					...one,
+					count: 1
+				});
+				else group.count += 1;
+			}
+			const aliases = /* @__PURE__ */ new Map();
+			try {
+				for (const account of await connectedEventAccounts(this.#config)) aliases.set(account.accountId, account.account);
+			} catch {}
+			this.#session ??= this.#sessionOf();
+			const session = await this.#session;
+			for (const group of groups.values()) await recordActivity(this.#core, {
+				channel: DELIVERY_ACTIVITY_CHANNEL,
+				account: {
+					id: group.accountId,
+					alias: aliases.get(group.accountId) ?? ""
+				},
+				operation: DELIVERY_ACTIVITY_OPERATION,
+				kind: "told",
+				outcome: group.outcome,
+				...group.reason === void 0 ? {} : { reason: group.reason },
+				session,
+				ms: 0,
+				count: group.count,
+				told: {
+					rule: group.rule,
+					target: group.target
+				}
+			});
+		} catch {}
+	}
+};
+//#endregion
 //#region src/runtime/expiry.ts
 /** Runs every source-specific decrypted expiry before any adapter can inspect a retained source record. */
 var SourceStageExpiryGroup = class {
@@ -23727,6 +23910,11 @@ async function startOwnerWithLock(options, stateDir, paths, lock, started, onDat
 		}),
 		assertObjectSecretReady: b3Ports.assertObjectSecretReady
 	});
+	const deliveryActivity = new DeliveryActivity({
+		store: database,
+		core,
+		config: core.config
+	});
 	const gmailSourceFor = async (accountId) => {
 		const config = await core.config.load();
 		const alias = Object.entries(config.inboxes).find(([, inbox]) => inbox.id === accountId && inbox.provider === "gmail")?.[0];
@@ -24166,6 +24354,7 @@ async function startOwnerWithLock(options, stateDir, paths, lock, started, onDat
 				unregisterLayaWorker();
 				unregisterLayaInputs();
 				unregisterLayaPurge();
+				await deliveryActivity.stop();
 				database.close();
 				await removeInstance(paths, instance.instanceId);
 				await rm(paths.controlToken, { force: true });
@@ -24202,6 +24391,7 @@ async function startOwnerWithLock(options, stateDir, paths, lock, started, onDat
 		}
 		await writeInstance(paths, instance);
 		scheduler.start();
+		deliveryActivity.start(options.tickMs ?? 5e3);
 		return owner;
 	} catch (error) {
 		await owner.stop();

package/dist/index.mjs

@@ -1 +1 @@
-export { t as B3_APPROVAL_VIEW_VARIANTS, n as B3_CAPABILITIES, r as B3_CONTROL_CONTRACT, i as B3_CONTROL_ERROR_CODES, a as B3_CONTROL_V1_OPERATION_SPECS, o as B3_CONTROL_V1_RESULT_OPERATIONS, s as B3_CONTROL_V1_SCHEMA_VERSION, c as B3_CONTROL_V1_SUCCESSOR_REQUIREMENT, l as B3_DESKTOP_CONTROL_OPERATIONS, u as B3_JUDGE_UNAVAILABLE_VARIANTS, d as B3_SECRET_TERMINAL_ORIGIN, K as createEventsMcpServer, m as renderB3ApprovalPreviewV1, it as status } from "./b3-contract-D1Zy-xLG.mjs";
+export { t as B3_APPROVAL_VIEW_VARIANTS, n as B3_CAPABILITIES, r as B3_CONTROL_CONTRACT, i as B3_CONTROL_ERROR_CODES, a as B3_CONTROL_V1_OPERATION_SPECS, o as B3_CONTROL_V1_RESULT_OPERATIONS, s as B3_CONTROL_V1_SCHEMA_VERSION, c as B3_CONTROL_V1_SUCCESSOR_REQUIREMENT, l as B3_DESKTOP_CONTROL_OPERATIONS, u as B3_JUDGE_UNAVAILABLE_VARIANTS, d as B3_SECRET_TERMINAL_ORIGIN, K as createEventsMcpServer, m as renderB3ApprovalPreviewV1, it as status } from "./b3-contract-BmdhGHkq.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentcomms/events-daemon",
-  "version": "0.27.1",
+  "version": "0.29.0",
   "description": "The local event service for agent-communications: rules you approve deliver Gmail, Slack, Resend and WhatsApp events to a signed webhook, a local live stream or a dry-run log.",
   "type": "module",
   "license": "MIT",
@@ -37,12 +37,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@agentcomms/core": "0.27.1",
-    "@agentcomms/events": "0.27.1",
-    "@agentcomms/gmail": "0.27.1",
-    "@agentcomms/resend": "0.27.1",
-    "@agentcomms/whatsapp": "0.27.1",
-    "@agentcomms/slack": "0.27.1"
+    "@agentcomms/core": "0.29.0",
+    "@agentcomms/slack": "0.29.0",
+    "@agentcomms/whatsapp": "0.29.0",
+    "@agentcomms/resend": "0.29.0",
+    "@agentcomms/gmail": "0.29.0",
+    "@agentcomms/events": "0.29.0"
   },
   "devDependencies": {
     "@modelcontextprotocol/client": "2.3.1",
@@ -73,5 +73,5 @@
     "typecheck": "tsc -p tsconfig.json",
     "test": "node --import ../../test/helpers/loopback-seal-preload.mjs --experimental-strip-types --disable-warning=ExperimentalWarning --test \"test/**/*.test.ts\" test/laya-runtime-package.test.mjs"
   },
-  "gitHead": "a8f295c394ffaff3ca32c61865573240fba1473c"
+  "gitHead": "762fe2c8369643c09059cc6dc1f2a782ba835b46"
 }