@agentcomms/events-daemon 0.18.0 → 0.18.1

package/README.md

@@ -40,19 +40,23 @@ safe way to see what a rule would send before you point it at a webhook.
 agent-events target add '{"targetId":"log","version":1,"kind":"dry-run","retentionMs":86400000}'
 
 # 2. a rule: every received Gmail message with a subject, mapped to its subject only
-agent-events sources list          # the Gmail account ids you can name in a rule
+agent-events sources list          # every connected account a rule can name: its source, id and name
 agent-events rule create "$(cat rule.json)"
 
 # 3. turn it on: each step prints an approval, which you approve by typing its challenge
-agent-events rule enable mail-subjects 1
-agent-events approve <approval-id>
 agent-events enable-all            # the standing approval that starts collection
 agent-events approve <approval-id>
+agent-events rule enable mail-subjects 1
+agent-events approve <approval-id> # offers to test the target first; answering no is fine
 
-# 4. read what matched
+# 4. read what matched: the list gives each record's id, and show prints that record
 agent-events dryrun list
+agent-events dryrun show <record-id>
 ```
 
+Switch collection on before approving the rule: a pending target can be tested only while collection is on. If a test
+cannot run, the approval says why and still asks for its challenge.
+
 `rule.json`:
 
 ```json

package/dist/{b3-contract-B6UBBK7F.mjs → b3-contract-BZIj-LWV.mjs}

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

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { $ as sourcesList, $t as assertControlSupported, A as normaliseWhatsAppSourceOptions, At as decideHeld, B as addTarget, Bt as CONTROL_PROTOCOL_VERSIONS, C as canonicalSseSubscriber, Ct as enableAll, D as normaliseResendSourceOptions, Dt as ACTIVATION_FAILURE, E as normaliseGmailSourceOptions, Et as doctor, F as canonicalJudgeBudget, Ft as catalogueList, G as addSubscriber, Gt as isControlRequest, H as targetsList, Ht as controlFailure, I as canonicalJudgeKindEnablement, It as catalogueShow, J as updateSubscriber, Jt as newInstanceRecord, K as removeSubscriber, Kt as negotiateVersion, L as judgeKindDefinition, Lt as approvalView, M as JUDGE_BUDGET_ID, Mt as dropDelivery, N as JUDGE_KIND_DEFINITIONS, Nt as heldList, O as normaliseSlackSourceOptions, Ot as isActivationFailureCode, P as canonicalJudge, Pt as retryDelivery, Q as sourceShow$1, Qt as writeInstance, R as createEventsMcpServer, Rt as EventControlClient, S as normaliseActivationDocument, St as updateJudge, T as classifySourceOptionChange, Tt as assertDoctorReportV2, U as updateTarget, Ut as encodeControlFrame, V as removeTarget$1, Vt as ControlFrameReader, W as targetTest, Wt as isControlHello, X as status, Xt as readInstance, Y as stop, Yt as processIsLive, Z as loadSqlite, Zt as removeInstance, _ as activationDocumentDigest, _t as judgeTest, an as ensureEventSocketDirectory, at as rulesList, b as canonicalTarget, bt as removeJudgeModel, cn as installErrorSink, ct as ruleTestRetained, d as B3_SECRET_TERMINAL_ORIGIN, dt as addJudge, en as assertSocketPathFits, et as createRule$1, f as isB3ControlOperation, ft as budgetShow, g as isOwnerControlWireOperation, gt as judgeModelStatus, h as OWNER_CONTROL_WIRES, ht as judgeKindsList, in as ensureEventPaths, it as ruleShow$1, j as APPROVED_TYPESAFE_MODELS, jt as deliveriesList, k as normaliseSourceOptions, kt as disableAll, lt as pause, m as renderB3ApprovalPreviewV1, mt as enableJudgeKind, nn as verifyControlSocket, nt as enableRule, on as ensureOwnerOnlyFile, ot as updateRule, p as isB3SecretOperation, pt as disableJudgeKind, q as subscribersList, qt as mayRecoverStaleInstance, rn as verifyPrivateSocketDirectory, rt as removeRule, sn as eventPaths, st as ruleTest, tn as controlEndpoint, tt as disableRule$1, ut as resume, v as canonicalFullRuleDocument, vt as judgesList, w as sseDeliveryTarget, wt as assertDoctorReportV1, x as disclosureBindingFor, xt as updateBudget, y as canonicalSubscriber, yt as removeJudge, z as VERSION, zt as probeControl } from "./b3-contract-B6UBBK7F.mjs";
+import { $ as sourcesList, $t as assertControlSupported, A as normaliseWhatsAppSourceOptions, At as decideHeld, B as addTarget, Bt as CONTROL_PROTOCOL_VERSIONS, C as canonicalSseSubscriber, Ct as enableAll, D as normaliseResendSourceOptions, Dt as ACTIVATION_FAILURE, E as normaliseGmailSourceOptions, Et as doctor, F as canonicalJudgeBudget, Ft as catalogueList, G as addSubscriber, Gt as isControlRequest, H as targetsList, Ht as controlFailure, I as canonicalJudgeKindEnablement, It as catalogueShow, J as updateSubscriber, Jt as newInstanceRecord, K as removeSubscriber, Kt as negotiateVersion, L as judgeKindDefinition, Lt as approvalView, M as JUDGE_BUDGET_ID, Mt as dropDelivery, N as JUDGE_KIND_DEFINITIONS, Nt as heldList, O as normaliseSlackSourceOptions, Ot as isActivationFailureCode, P as canonicalJudge, Pt as retryDelivery, Q as sourceShow$1, Qt as writeInstance, R as createEventsMcpServer, Rt as EventControlClient, S as normaliseActivationDocument, St as updateJudge, T as classifySourceOptionChange, Tt as assertDoctorReportV2, U as updateTarget, Ut as encodeControlFrame, V as removeTarget$1, Vt as ControlFrameReader, W as targetTest, Wt as isControlHello, X as status, Xt as readInstance, Y as stop, Yt as processIsLive, Z as loadSqlite, Zt as removeInstance, _ as activationDocumentDigest, _t as judgeTest, an as ensureEventSocketDirectory, at as rulesList, b as canonicalTarget, bt as removeJudgeModel, cn as installErrorSink, ct as ruleTestRetained, d as B3_SECRET_TERMINAL_ORIGIN, dt as addJudge, en as assertSocketPathFits, et as createRule$1, f as isB3ControlOperation, ft as budgetShow, g as isOwnerControlWireOperation, gt as judgeModelStatus, h as OWNER_CONTROL_WIRES, ht as judgeKindsList, in as ensureEventPaths, it as ruleShow$1, j as APPROVED_TYPESAFE_MODELS, jt as deliveriesList, k as normaliseSourceOptions, kt as disableAll, lt as pause, m as renderB3ApprovalPreviewV1, mt as enableJudgeKind, nn as verifyControlSocket, nt as enableRule, on as ensureOwnerOnlyFile, ot as updateRule, p as isB3SecretOperation, pt as disableJudgeKind, q as subscribersList, qt as mayRecoverStaleInstance, rn as verifyPrivateSocketDirectory, rt as removeRule, sn as eventPaths, st as ruleTest, tn as controlEndpoint, tt as disableRule$1, ut as resume, v as canonicalFullRuleDocument, vt as judgesList, w as sseDeliveryTarget, wt as assertDoctorReportV1, x as disclosureBindingFor, xt as updateBudget, y as canonicalSubscriber, yt as removeJudge, z as VERSION, zt as probeControl } from "./b3-contract-BZIj-LWV.mjs";
 import { a as EventDomainError, d as isJudgeKind, f as validateLocalEndpoint, g as parseIpLiteral, h as assertApprovedAddressSet, i as webhookDeliveryTarget, l as JUDGE_KIND_TYPESAFE, m as assertAddressAllowed, n as canonicalWebhookTarget, o as JUDGE_KINDS, p as AddressPolicyError, r as secretWebhookUrlDescriptor, s as JUDGE_KIND_LAYA, t as canonicalSecretWebhookUrl, u as assertJudgeKindEnabled } from "./webhook-target-DyDTwWhV.mjs";
 import { a as WriterQuiescer, c as openEventSecretStore, o as withEventWriterLease, r as RecordStorageError, s as migrateEventSecrets, t as EventRecordCipher } from "./records-DsUxYBwb.mjs";
 import process$1 from "node:process";
@@ -9555,6 +9555,26 @@ async function assertLiveEventAccount(config, scope) {
 		source: scope.source
 	} });
 }
+/**
+* Every connected account a rule may name, loaded afresh: Gmail's inboxes by their stable `ibx_…` id and the other
+* channels' accounts by their `acc_…` id, each beside the name a person knows it by. What `sources list` shows, so
+* a first rule's account id can be read from it before any rule is active (CUE-474).
+*/
+async function connectedEventAccounts(config) {
+	const current = await config.load();
+	const found = [];
+	for (const [account, inbox] of Object.entries(current.inboxes)) if (inbox.provider === "gmail") found.push({
+		source: "gmail",
+		accountId: inbox.id,
+		account
+	});
+	for (const [account, entry] of Object.entries(current.accounts)) if (entry.platform === "slack" || entry.platform === "resend" || entry.platform === "whatsapp") found.push({
+		source: entry.platform,
+		accountId: entry.id,
+		account
+	});
+	return found.sort((left, right) => `${left.source}\u0000${left.account}`.localeCompare(`${right.source}\u0000${right.account}`));
+}
 /** The current stable ids for one source, loaded afresh at the boundary. */
 async function liveEventAccountIds(config, source) {
 	const current = await config.load();
@@ -14543,7 +14563,8 @@ var B3TargetTestControl = class {
              SELECT 1 FROM object_revocations AS revoked
              WHERE revoked.kind = 'target' AND revoked.object_id = target.target_id AND revoked.version = target.version
            )`).get(targetId, targetVersion);
-		if (row === void 0 || row.enabled !== 1) return refuse("the exact target version is not live");
+		if (row === void 0) return refuse("the exact target version is not live");
+		if (row.enabled !== 1) return refuse("collection is switched off: switch it on with enable-all first, or approve without the test");
 		if (selectorKind === "active") {
 			if (this.#store.database.prepare(`SELECT 1 AS present
            FROM target_version_references AS reference
@@ -21069,7 +21090,7 @@ async function startOwnerWithLock(options, stateDir, paths, lock, started, onDat
 		control = await (options.startControlServer ?? startControlServer)({
 			endpoint: instance.endpoint,
 			token,
-			handle: async (request) => handleControl(owner, lifecycle, database, activations, dryrun, sourceRegistry, writerQuiescer, request, ownerB3Service, doctorReport),
+			handle: async (request) => handleControl(owner, lifecycle, database, activations, dryrun, sourceRegistry, writerQuiescer, request, ownerB3Service, doctorReport, () => connectedEventAccounts(core.config)),
 			verifyEndpoint: () => verifyPrivateSocketDirectory(paths)
 		});
 		if (options.startControlServer === void 0) {
@@ -21100,7 +21121,7 @@ async function runEventOwner(options = {}) {
 		await owner.stop();
 	}
 }
-async function handleControl(owner, lifecycle, database, activations, dispatcher, sourceRegistry, writerQuiescer, request, b3OwnerService, doctorReport) {
+async function handleControl(owner, lifecycle, database, activations, dispatcher, sourceRegistry, writerQuiescer, request, b3OwnerService, doctorReport, connectedAccounts = async () => []) {
 	if (!isOwnerControlWireOperation(request.operation)) throw new CommsError("USAGE", "the local event control operation is not recognised");
 	if (isB3ControlOperation(request.operation)) {
 		if (!b3OwnerService) throw new CommsError("USAGE", "the local B3 control operation is not available");
@@ -21143,8 +21164,8 @@ async function handleControl(owner, lifecycle, database, activations, dispatcher
 				channel: definition.type.split(".")[0]
 			};
 		}
-		case OWNER_CONTROL_WIRES.sourcesList: return sourceRows(database, sourceRegistry);
-		case OWNER_CONTROL_WIRES.sourceShow: return sourceShow(database, sourceRegistry, requiredText(request.args.source, "source"));
+		case OWNER_CONTROL_WIRES.sourcesList: return sourceRows(database, sourceRegistry, await connectedAccounts());
+		case OWNER_CONTROL_WIRES.sourceShow: return sourceShow(database, sourceRegistry, requiredText(request.args.source, "source"), await connectedAccounts());
 		case OWNER_CONTROL_WIRES.rulesList: return ruleRows(database);
 		case OWNER_CONTROL_WIRES.ruleShow: return ruleShow(database, requiredText(request.args.ruleId, "rule id"));
 		case OWNER_CONTROL_WIRES.createRule:
@@ -21217,7 +21238,12 @@ function targetRows(database) {
 function createTarget(database, document) {
 	return domain(() => new ImmutableVersions(database.database).createTarget(document));
 }
-function sourceRows(database, sourceRegistry) {
+/**
+* Each source's accounts: the scopes active rules read, and every connected account a rule may name, which has no
+* cursor scope until a rule reads it. Each carries the name it was connected under, so a person, or an agent writing
+* a first rule, can tell `ibx_…` from `ibx_…` (CUE-474).
+*/
+function sourceRows(database, sourceRegistry, connected = []) {
 	const rows = database.database.prepare("SELECT document FROM rule_versions WHERE state IN ('active', 'superseded')").all();
 	const scopes = /* @__PURE__ */ new Map();
 	for (const row of rows) {
@@ -21239,17 +21265,28 @@ function sourceRows(database, sourceRegistry) {
 			} catch {}
 		}
 	}
-	const ordered = [...scopes.values()].sort((left, right) => `${left.source}\u0000${left.accountId}\u0000${left.cursorScope}`.localeCompare(`${right.source}\u0000${right.accountId}\u0000${right.cursorScope}`));
+	const nameOf = new Map(connected.map((entry) => [`${entry.source}\u0000${entry.accountId}`, entry.account]));
+	const accounts = [...scopes.values()].map((scope) => ({
+		...scope,
+		account: nameOf.get(`${scope.source}\u0000${scope.accountId}`) ?? null
+	}));
+	for (const entry of connected) if (!accounts.some((row) => row.source === entry.source && row.accountId === entry.accountId)) accounts.push({
+		source: entry.source,
+		accountId: entry.accountId,
+		account: entry.account,
+		cursorScope: null
+	});
+	const ordered = accounts.sort((left, right) => `${left.source}\u0000${left.accountId}\u0000${left.cursorScope ?? ""}`.localeCompare(`${right.source}\u0000${right.accountId}\u0000${right.cursorScope ?? ""}`));
 	return sourceRegistry.sources().map((source) => ({
 		source,
 		accounts: ordered.filter((scope) => scope.source === source)
 	}));
 }
-function sourceShow(database, sourceRegistry, source) {
+function sourceShow(database, sourceRegistry, source, connected = []) {
 	if (!sourceRegistry.sources().includes(source)) throw new CommsError("NOT_FOUND", "the requested source is not configured");
 	return {
 		source,
-		accounts: sourceRows(database, sourceRegistry).find((row) => row.source === source).accounts
+		accounts: sourceRows(database, sourceRegistry, connected).find((row) => row.source === source).accounts
 	};
 }
 async function acquireWithStaleRecovery(paths) {
@@ -21397,6 +21434,22 @@ function terminalSafeJson(value) {
 function renderApprovalViewForTerminal(result) {
 	return escapeForDisplay(renderB3ApprovalPreviewV1(result).terminal);
 }
+/**
+* An optional test the owner refused is reported and the approval goes on to its challenge (CUE-475): declining the
+* test was always allowed, so a test that could not run must not end the approval for the person.
+*/
+async function optionalTest(label, test) {
+	try {
+		return await test();
+	} catch (error) {
+		if (!isCommsError(error)) throw error;
+		return {
+			...label,
+			test: "not run",
+			reason: error.message
+		};
+	}
+}
 /** Runs the only interactive terminal approval path; the owner, not this client, made every pending-target selector. */
 async function runTerminalApprovalFlow(input) {
 	const start = await input.start(input.approvalId);
@@ -21404,13 +21457,14 @@ async function runTerminalApprovalFlow(input) {
 		const selector = start.pendingTargetSelectors[index];
 		if (selector === void 0) continue;
 		const answer = await input.terminal.question(`Test pending target ${index + 1} with the fixed synthetic payload before approving? [y/N] `);
-		if (/^\s*(?:y|yes)\s*$/iu.test(answer)) input.print(await input.testPendingTarget(selector));
+		if (/^\s*(?:y|yes)\s*$/iu.test(answer)) input.print(await optionalTest({ pendingTarget: index + 1 }, () => input.testPendingTarget(selector)));
 	}
 	for (let index = 0; index < start.pendingRuleJudgeTestSelectors.length; index += 1) {
 		const selector = start.pendingRuleJudgeTestSelectors[index];
 		if (selector === void 0) continue;
 		const answer = await input.terminal.question(`Test pending rule judge ${index + 1} with the fixed synthetic payload before approving? [y/N] `);
-		if (/^\s*(?:y|yes)\s*$/iu.test(answer) && input.testPendingRuleJudge !== void 0) input.print(await input.testPendingRuleJudge(selector));
+		const testPendingRuleJudge = input.testPendingRuleJudge;
+		if (/^\s*(?:y|yes)\s*$/iu.test(answer) && testPendingRuleJudge !== void 0) input.print(await optionalTest({ pendingRuleJudge: index + 1 }, () => testPendingRuleJudge(selector)));
 	}
 	const answer = await input.terminal.question(`Type this approval challenge: ${escapeForDisplay(start.challenge)}\n> `);
 	input.print(await input.approve(input.approvalId, answer));
@@ -21436,6 +21490,7 @@ async function run(argv, deps = {}) {
 	}
 	const env = deps.env ?? process.env;
 	const program = new Command();
+	runEnvironment.set(program, env);
 	let ran = false;
 	program.name("agent-events").description("The local event-emission service: one foreground owner and local control clients.").option("--json", "write machine-readable output").option("--no-color", "never colour the output").option("--config-dir <dir>", "pin the configuration directory for this run").option("--state-dir <dir>", "pin the state directory for this run").option("--data-dir <dir>", "pin the data directory for this run").option("--secrets-dir <dir>", "pin the secrets directory for this run").option("--downloads-dir <dir>", "pin the downloads directory for this run").configureOutput({
 		writeOut: (text) => streams.stdout.write(escapeForDisplay(text)),
@@ -21868,10 +21923,19 @@ async function run(argv, deps = {}) {
 		return 1;
 	}
 }
+/**
+* The state directory a control client looks in: the one pinned for this run, or the one the environment this CLI was
+* given resolves to. A caller that passes its own `env` to `run` reaches its own owner, never the one the process
+* environment names.
+*/
 function controlOptions(program) {
 	const { stateDir } = program.opts();
-	return stateDir === void 0 ? {} : { stateDir };
+	if (stateDir !== void 0) return { stateDir };
+	const env = runEnvironment.get(program);
+	return env === void 0 ? {} : { stateDir: resolvePaths({ env }).stateDir };
 }
+/** The environment each program was made with, read by `controlOptions` outside `run`'s closure. */
+const runEnvironment = /* @__PURE__ */ new WeakMap();
 function parseVersion(value) {
 	const version = Number(value);
 	if (!Number.isSafeInteger(version) || version < 1) throw new CommsError("USAGE", "rule version must be a positive integer");

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { R as createEventsMcpServer, X as status, a as B3_CONTROL_V1_OPERATION_SPECS, c as B3_CONTROL_V1_SUCCESSOR_REQUIREMENT, d as B3_SECRET_TERMINAL_ORIGIN, i as B3_CONTROL_ERROR_CODES, l as B3_DESKTOP_CONTROL_OPERATIONS, m as renderB3ApprovalPreviewV1, n as B3_CAPABILITIES, o as B3_CONTROL_V1_RESULT_OPERATIONS, r as B3_CONTROL_CONTRACT, s as B3_CONTROL_V1_SCHEMA_VERSION, t as B3_APPROVAL_VIEW_VARIANTS, u as B3_JUDGE_UNAVAILABLE_VARIANTS } from "./b3-contract-B6UBBK7F.mjs";
+import { R as createEventsMcpServer, X as status, a as B3_CONTROL_V1_OPERATION_SPECS, c as B3_CONTROL_V1_SUCCESSOR_REQUIREMENT, d as B3_SECRET_TERMINAL_ORIGIN, i as B3_CONTROL_ERROR_CODES, l as B3_DESKTOP_CONTROL_OPERATIONS, m as renderB3ApprovalPreviewV1, n as B3_CAPABILITIES, o as B3_CONTROL_V1_RESULT_OPERATIONS, r as B3_CONTROL_CONTRACT, s as B3_CONTROL_V1_SCHEMA_VERSION, t as B3_APPROVAL_VIEW_VARIANTS, u as B3_JUDGE_UNAVAILABLE_VARIANTS } from "./b3-contract-BZIj-LWV.mjs";
 export { B3_APPROVAL_VIEW_VARIANTS, B3_CAPABILITIES, B3_CONTROL_CONTRACT, B3_CONTROL_ERROR_CODES, B3_CONTROL_V1_OPERATION_SPECS, B3_CONTROL_V1_RESULT_OPERATIONS, B3_CONTROL_V1_SCHEMA_VERSION, B3_CONTROL_V1_SUCCESSOR_REQUIREMENT, B3_DESKTOP_CONTROL_OPERATIONS, B3_JUDGE_UNAVAILABLE_VARIANTS, B3_SECRET_TERMINAL_ORIGIN, createEventsMcpServer, renderB3ApprovalPreviewV1, status };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentcomms/events-daemon",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "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",
@@ -34,12 +34,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@agentcomms/events": "0.18.0",
-    "@agentcomms/resend": "0.18.0",
-    "@agentcomms/gmail": "0.18.0",
-    "@agentcomms/slack": "0.18.0",
-    "@agentcomms/core": "0.18.0",
-    "@agentcomms/whatsapp": "0.18.0"
+    "@agentcomms/core": "0.18.1",
+    "@agentcomms/gmail": "0.18.1",
+    "@agentcomms/events": "0.18.1",
+    "@agentcomms/whatsapp": "0.18.1",
+    "@agentcomms/slack": "0.18.1",
+    "@agentcomms/resend": "0.18.1"
   },
   "devDependencies": {
     "@modelcontextprotocol/client": "2.3.1",
@@ -70,5 +70,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\""
   },
-  "gitHead": "a55c5383b35a8214b9e481e2a148b0e29a663a9f"
+  "gitHead": "fc398edc67287e411f8c5cb821f434220cb83aa5"
 }