@electric-ax/agents-server-conformance-tests 0.1.3 → 0.1.5

package/dist/index.cjs

@@ -217,7 +217,7 @@ function isEntityStreamPath$1(pathname) {
 	return segments.length >= 3 && (lastSegment === `main` || lastSegment === `error`);
 }
 function subscriptionEndpoint$1(baseUrl, id) {
-	return `${baseUrl}/v1/stream-meta/subscriptions/${encodeURIComponent(id)}`;
+	return `${baseUrl}/__ds/subscriptions/${encodeURIComponent(id)}`;
 }
 function subscriptionPattern$1(pattern) {
 	return pattern.replace(/^\/+/, ``);
@@ -253,8 +253,8 @@ var ElectricAgentsScenario = class {
 		this.steps.push({
 			kind: `send`,
 			payload,
-			from: opts.from,
-			type: opts.type
+			from: opts?.from,
+			type: opts?.type
 		});
 		return this;
 	}
@@ -263,7 +263,7 @@ var ElectricAgentsScenario = class {
 			kind: `sendTo`,
 			url,
 			payload,
-			from: opts.from
+			from: opts?.from
 		});
 		return this;
 	}
@@ -455,7 +455,7 @@ var ElectricAgentsScenario = class {
 		this.steps.push({
 			kind: `expectSendSchemaError`,
 			payload,
-			messageType: opts.type ?? `default`,
+			messageType: opts?.type ?? `default`,
 			code: `SCHEMA_VALIDATION_ERROR`,
 			status: 422
 		});
@@ -756,10 +756,7 @@ async function executeStep(ctx, step) {
 			if (!ctx.currentEntityUrl) throw new Error(`No current entity`);
 			const res = await electricAgentsFetch$1(ctx.baseUrl, `${ctx.currentEntityUrl}/send`, {
 				method: `POST`,
-				body: JSON.stringify({
-					from: `test`,
-					payload: { should: `fail` }
-				})
+				body: JSON.stringify({ payload: { should: `fail` } })
 			});
 			(0, vitest.expect)(res.status).toBe(step.status);
 			const body = await res.json();
@@ -1495,7 +1492,7 @@ function checkStateProtocolInvariants(events) {
 //#endregion
 //#region src/cli-dsl.ts
 function subscriptionEndpoint(baseUrl, id) {
-	return `${baseUrl}/v1/stream-meta/subscriptions/${encodeURIComponent(id)}`;
+	return `${baseUrl}/__ds/subscriptions/${encodeURIComponent(id)}`;
 }
 function subscriptionPattern(pattern) {
 	return pattern.replace(/^\/+/, ``);
@@ -1844,26 +1841,23 @@ function runElectricAgentsConformanceTests(config) {
 			name: `send-test-worker`,
 			description: `Test entity type for send`,
 			creation_schema: { type: `object` }
-		}).spawn(`send-test-worker`, `entity-1`).send({ task: `hello` }, { from: `user-1` }).expectWebhook().respondDone().readStream().expectStreamContains(`message_received`).custom(async (ctx) => {
-			const envelope = ctx.lastStreamMessages.find((m) => m.type === `message_received`);
-			(0, vitest.expect)(envelope.type).toBe(`message_received`);
+		}).spawn(`send-test-worker`, `entity-1`).send({ task: `hello` }).expectWebhook().respondDone().readStream().expectStreamContains(`inbox`).custom(async (ctx) => {
+			const envelope = ctx.lastStreamMessages.find((m) => m.type === `inbox`);
+			(0, vitest.expect)(envelope.type).toBe(`inbox`);
 			(0, vitest.expect)(envelope.key).toBeDefined();
-			(0, vitest.expect)(envelope.value?.from).toBe(`user-1`);
+			(0, vitest.expect)(envelope.value?.from).toMatch(/^\/principal\//);
 			(0, vitest.expect)(envelope.value?.payload).toEqual({ task: `hello` });
 		}).run());
 		(0, vitest.test)(`send triggers webhook with entity context`, () => electricAgents(config.baseUrl).subscription(`/webhook-ctx-agent/**`, `webhook-ctx-sub`).registerType({
 			name: `webhook-ctx-agent`,
 			description: `Test entity type for webhook context`,
 			creation_schema: { type: `object` }
-		}).spawn(`webhook-ctx-agent`, `entity-1`).send({ ping: true }, { from: `test` }).expectWebhook().expectEntityContext({ type: `webhook-ctx-agent` }).respondDone().run());
+		}).spawn(`webhook-ctx-agent`, `entity-1`).send({ ping: true }).expectWebhook().expectEntityContext({ type: `webhook-ctx-agent` }).respondDone().run());
 		(0, vitest.test)(`send to nonexistent entity returns 404`, () => electricAgents(config.baseUrl).custom(async (ctx) => {
 			const res = await fetch(`${ctx.baseUrl}${routeControlPlanePath(`/nonexistent-type/nonexistent-id/send`)}`, {
 				method: `POST`,
 				headers: { "content-type": `application/json` },
-				body: JSON.stringify({
-					from: `test`,
-					payload: {}
-				})
+				body: JSON.stringify({ payload: {} })
 			});
 			(0, vitest.expect)(res.status).toBe(404);
 		}).skipInvariants().run());
@@ -1873,13 +1867,13 @@ function runElectricAgentsConformanceTests(config) {
 				name: `order-test-agent-${id}`,
 				description: `Test entity type for ordering`,
 				creation_schema: { type: `object` }
-			}).spawn(`order-test-agent-${id}`, `entity-1`).send({ seq: 1 }, { from: `test` }).expectWebhook().respondDone().send({ seq: 2 }, { from: `test` }).expectWebhook().respondDone().send({ seq: 3 }, { from: `test` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
-				const msgs = ctx.lastStreamMessages.filter((m) => m.type === `message_received`);
+			}).spawn(`order-test-agent-${id}`, `entity-1`).send({ seq: 1 }).expectWebhook().respondDone().send({ seq: 2 }).expectWebhook().respondDone().send({ seq: 3 }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
+				const msgs = ctx.lastStreamMessages.filter((m) => m.type === `inbox`);
 				(0, vitest.expect)(msgs.length).toBe(3);
 				for (let i = 0; i < 3; i++) (0, vitest.expect)(msgs[i].value?.payload).toEqual({ seq: i + 1 });
 			}).run();
 		});
-		(0, vitest.test)(`send without from is rejected`, () => electricAgents(config.baseUrl).subscription(`/nofrom-test-agent/**`, `nofrom-test-sub`).registerType({
+		(0, vitest.test)(`send without from uses principal`, () => electricAgents(config.baseUrl).subscription(`/nofrom-test-agent/**`, `nofrom-test-sub`).registerType({
 			name: `nofrom-test-agent`,
 			description: `Test entity type for send without from`,
 			creation_schema: { type: `object` }
@@ -1888,10 +1882,8 @@ function runElectricAgentsConformanceTests(config) {
 				method: `POST`,
 				body: JSON.stringify({ payload: { hello: true } })
 			});
-			(0, vitest.expect)(res.status).toBe(400);
-			const body = await res.json();
-			(0, vitest.expect)(body.error.code).toBe(`INVALID_REQUEST`);
-		}).run());
+			(0, vitest.expect)(res.status).toBe(204);
+		}).expectWebhook().respondDone().run());
 	});
 	(0, vitest.describe)(`Electric Agents List`, () => {
 		(0, vitest.test)(`ps lists entities`, () => electricAgents(config.baseUrl).subscription(`/ps-test-worker/**`, `ps-test-worker-sub`).subscription(`/ps-test-agent/**`, `ps-test-agent-sub`).registerType({
@@ -1931,9 +1923,9 @@ function runElectricAgentsConformanceTests(config) {
 			name: `kill-persist-agent`,
 			description: `Test entity type for kill persistence`,
 			creation_schema: { type: `object` }
-		}).spawn(`kill-persist-agent`, `entity-1`).send({ before: `kill` }, { from: `test` }).expectWebhook().respondDone().kill().readStream().expectStreamContains(`message_received`).custom(async (ctx) => {
+		}).spawn(`kill-persist-agent`, `entity-1`).send({ before: `kill` }).expectWebhook().respondDone().kill().readStream().expectStreamContains(`inbox`).custom(async (ctx) => {
 			const msgs = ctx.lastStreamMessages;
-			const msgReceived = msgs.find((m) => m.type === `message_received`);
+			const msgReceived = msgs.find((m) => m.type === `inbox`);
 			(0, vitest.expect)(msgReceived.value?.payload).toEqual({ before: `kill` });
 			const stopped = msgs.find((m) => m.type === `entity_stopped`);
 			(0, vitest.expect)(stopped).toBeDefined();
@@ -1971,7 +1963,7 @@ function runElectricAgentsConformanceTests(config) {
 			name: `e2e-test-agent`,
 			description: `Test entity type for E2E lifecycle`,
 			creation_schema: { type: `object` }
-		}).spawn(`e2e-test-agent`, `entity-1`).expectStatus(`running`).send({ task: `do-something` }, { from: `user-1` }).expectWebhook().expectEntityContext({ type: `e2e-test-agent` }).respondDone().readStream().expectStreamContains(`message_received`).kill().custom(async (ctx) => {
+		}).spawn(`e2e-test-agent`, `entity-1`).expectStatus(`running`).send({ task: `do-something` }).expectWebhook().expectEntityContext({ type: `e2e-test-agent` }).respondDone().readStream().expectStreamContains(`inbox`).kill().custom(async (ctx) => {
 			const entity = await pollEntityStatus(ctx.baseUrl, ctx.currentEntityUrl, [`stopped`]);
 			(0, vitest.expect)(entity.status).toBe(`stopped`);
 		}).expectSendError(`NOT_RUNNING`, 409).run());
@@ -2226,10 +2218,7 @@ function runElectricAgentsConformanceTests(config) {
 					properties: { text: { type: `string` } },
 					required: [`text`]
 				} }
-			}).spawn(typeName, `entity-1`).send({ text: `hello` }, {
-				from: `user`,
-				type: `query`
-			}).expectWebhook().respondDone().run();
+			}).spawn(typeName, `entity-1`).send({ text: `hello` }, { type: `query` }).expectWebhook().respondDone().run();
 		});
 		(0, vitest.test)(`send rejects invalid typed message (C11)`, () => {
 			const typeName = `send-schema-inv-${Date.now()}`;
@@ -2242,10 +2231,7 @@ function runElectricAgentsConformanceTests(config) {
 					properties: { text: { type: `string` } },
 					required: [`text`]
 				} }
-			}).spawn(typeName, `entity-1`).expectSendSchemaError({ invalid: true }, {
-				from: `user`,
-				type: `query`
-			}).run();
+			}).spawn(typeName, `entity-1`).expectSendSchemaError({ invalid: true }, { type: `query` }).run();
 		});
 		(0, vitest.test)(`send rejects unknown message type (C13)`, () => {
 			const typeName = `send-unknown-type-${Date.now()}`;
@@ -2258,10 +2244,7 @@ function runElectricAgentsConformanceTests(config) {
 					properties: { text: { type: `string` } },
 					required: [`text`]
 				} }
-			}).spawn(typeName, `entity-1`).expectSendUnknownType({ text: `hi` }, {
-				from: `user`,
-				type: `unknown_type`
-			}).run();
+			}).spawn(typeName, `entity-1`).expectSendUnknownType({ text: `hi` }, { type: `unknown_type` }).run();
 		});
 		(0, vitest.test)(`send without type when no input_schemas accepts any`, () => {
 			const typeName = `send-no-schemas-${Date.now()}`;
@@ -2269,7 +2252,7 @@ function runElectricAgentsConformanceTests(config) {
 				name: typeName,
 				description: `Type without input schemas`,
 				creation_schema: { type: `object` }
-			}).spawn(typeName, `entity-1`).send({ anything: `goes` }, { from: `user` }).expectWebhook().respondDone().run();
+			}).spawn(typeName, `entity-1`).send({ anything: `goes` }).expectWebhook().respondDone().run();
 		});
 		(0, vitest.test)(`send with empty input_schemas rejects all`, () => {
 			const typeName = `send-empty-schemas-${Date.now()}`;
@@ -2278,10 +2261,7 @@ function runElectricAgentsConformanceTests(config) {
 				description: `Type with empty input schemas`,
 				creation_schema: { type: `object` },
 				input_schemas: {}
-			}).spawn(typeName, `entity-1`).expectSendUnknownType({ text: `anything` }, {
-				from: `user`,
-				type: `some_type`
-			}).run();
+			}).spawn(typeName, `entity-1`).expectSendUnknownType({ text: `anything` }, { type: `some_type` }).run();
 		});
 		vitest.test.skip(`write appends event to entity stream`, () => {
 			const typeName = `write-append-${Date.now()}`;
@@ -2456,10 +2436,7 @@ function runElectricAgentsConformanceTests(config) {
 				type: `object`,
 				properties: { action: { type: `string` } },
 				required: [`action`]
-			} } }).spawn(typeName, `entity-1`).send({ action: `do-it` }, {
-				from: `user`,
-				type: `command`
-			}).expectWebhook().respondDone().run();
+			} } }).spawn(typeName, `entity-1`).send({ action: `do-it` }, { type: `command` }).expectWebhook().respondDone().run();
 		});
 		(0, vitest.test)(`amend schemas rejects modifying existing keys (C16)`, () => {
 			const typeName = `amend-conflict-${Date.now()}`;
@@ -2641,13 +2618,10 @@ function runElectricAgentsConformanceTests(config) {
 								if (!url) return;
 								const res = await electricAgentsFetch(ctx.baseUrl, `${url}/send`, {
 									method: `POST`,
-									body: JSON.stringify({
-										from: `prop-test`,
-										payload: {
-											action: `prop-send`,
-											targetIdx
-										}
-									})
+									body: JSON.stringify({ payload: {
+										action: `prop-send`,
+										targetIdx
+									} })
 								});
 								(0, vitest.expect)(res.status).toBe(204);
 								ctx.history.push({
@@ -2656,8 +2630,7 @@ function runElectricAgentsConformanceTests(config) {
 									payload: {
 										action: `prop-send`,
 										targetIdx
-									},
-									from: `prop-test`
+									}
 								});
 							});
 							scenario.expectWebhook();
@@ -2969,12 +2942,12 @@ function runElectricAgentsConformanceTests(config) {
 			name: `sp-send-worker`,
 			description: `Test entity type for SP send format`,
 			creation_schema: { type: `object` }
-		}).spawn(`sp-send-worker`, `entity-1`).send({ text: `hello world` }, { from: `user-1` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
+		}).spawn(`sp-send-worker`, `entity-1`).send({ text: `hello world` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
 			const events = ctx.lastStreamMessages;
-			const msgEvent = events.find((e) => e.type === `message_received`);
-			(0, vitest.expect)(msgEvent.type).toBe(`message_received`);
+			const msgEvent = events.find((e) => e.type === `inbox`);
+			(0, vitest.expect)(msgEvent.type).toBe(`inbox`);
 			(0, vitest.expect)(msgEvent.key).toBeDefined();
-			(0, vitest.expect)(msgEvent.value?.from).toBe(`user-1`);
+			(0, vitest.expect)(msgEvent.value?.from).toMatch(/^\/principal\//);
 			(0, vitest.expect)(msgEvent.value?.payload).toEqual({ text: `hello world` });
 			(0, vitest.expect)(msgEvent.headers).toBeDefined();
 		}).run());
@@ -2982,9 +2955,9 @@ function runElectricAgentsConformanceTests(config) {
 			name: `sp-inv-worker`,
 			description: `Test entity type for SP invariant checks`,
 			creation_schema: { type: `object` }
-		}).spawn(`sp-inv-worker`, `entity-1`).send({ text: `first` }, { from: `tester` }).expectWebhook().respondDone().send({ text: `second` }, { from: `tester` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
+		}).spawn(`sp-inv-worker`, `entity-1`).send({ text: `first` }).expectWebhook().respondDone().send({ text: `second` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
 			const events = ctx.lastStreamMessages;
-			const messageEvents = events.filter((ev) => ev.type === `message_received`);
+			const messageEvents = events.filter((ev) => ev.type === `inbox`);
 			(0, vitest.expect)(messageEvents.length).toBe(2);
 			checkStateProtocolInvariants(events);
 		}).run());
@@ -2994,8 +2967,8 @@ function runElectricAgentsConformanceTests(config) {
 				name: `sp-keys-agent-${id}`,
 				description: `Test entity type for send key uniqueness`,
 				creation_schema: { type: `object` }
-			}).spawn(`sp-keys-agent-${id}`, `entity-1`).send({ seq: 1 }, { from: `test` }).expectWebhook().respondDone().send({ seq: 2 }, { from: `test` }).expectWebhook().respondDone().send({ seq: 3 }, { from: `test` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
-				const events = ctx.lastStreamMessages.filter((e) => e.type === `message_received`);
+			}).spawn(`sp-keys-agent-${id}`, `entity-1`).send({ seq: 1 }).expectWebhook().respondDone().send({ seq: 2 }).expectWebhook().respondDone().send({ seq: 3 }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
+				const events = ctx.lastStreamMessages.filter((e) => e.type === `inbox`);
 				(0, vitest.expect)(events.length).toBe(3);
 				for (let i = 0; i < 3; i++) (0, vitest.expect)(events[i].value?.payload).toEqual({ seq: i + 1 });
 			}).run();
@@ -3008,9 +2981,9 @@ function runElectricAgentsConformanceTests(config) {
 				name: `flum-agent-${id}`,
 				description: `Test send event format for webhook parsing`,
 				creation_schema: { type: `object` }
-			}).spawn(`flum-agent-${id}`, `entity-1`).send({ text: `test message for parsing` }, { from: `tester` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
+			}).spawn(`flum-agent-${id}`, `entity-1`).send({ text: `test message for parsing` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
 				const events = ctx.lastStreamMessages;
-				const msgEvent = events.find((e) => e.type === `message_received`);
+				const msgEvent = events.find((e) => e.type === `inbox`);
 				(0, vitest.expect)(msgEvent).toBeDefined();
 				(0, vitest.expect)(msgEvent.value?.payload).toBeDefined();
 				const payload = msgEvent.value.payload;
@@ -3023,10 +2996,10 @@ function runElectricAgentsConformanceTests(config) {
 				name: `flum-all-agent-${id}`,
 				description: `Test all events are SP format`,
 				creation_schema: { type: `object` }
-			}).spawn(`flum-all-agent-${id}`, `entity-1`).send({ text: `verify all SP` }, { from: `tester` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
+			}).spawn(`flum-all-agent-${id}`, `entity-1`).send({ text: `verify all SP` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
 				const events = ctx.lastStreamMessages;
 				(0, vitest.expect)(events.length).toBeGreaterThanOrEqual(1);
-				const hasMsg = events.some((e) => e.type === `message_received`);
+				const hasMsg = events.some((e) => e.type === `inbox`);
 				(0, vitest.expect)(hasMsg).toBe(true);
 				for (const ev of events) {
 					(0, vitest.expect)(ev.type, `every event must have type`).toBeDefined();
@@ -3071,7 +3044,7 @@ function runElectricAgentsConformanceTests(config) {
 			}).spawn(`no-payload-agent-${id}`, `entity-1`).custom(async (ctx) => {
 				const res = await electricAgentsFetch(ctx.baseUrl, `${ctx.currentEntityUrl}/send`, {
 					method: `POST`,
-					body: JSON.stringify({ from: `tester` })
+					body: JSON.stringify({})
 				});
 				(0, vitest.expect)(res.status).toBe(400);
 				const body = await res.json();
@@ -3140,7 +3113,6 @@ function runElectricAgentsConformanceTests(config) {
 				const res = await electricAgentsFetch(ctx.baseUrl, `${rev1EntityUrl}/send`, {
 					method: `POST`,
 					body: JSON.stringify({
-						from: `tester`,
 						payload: { reason: `bye` },
 						type: `farewell`
 					})
@@ -3170,7 +3142,7 @@ function runElectricAgentsConformanceTests(config) {
 				name: `seq-meta-agent-${id}`,
 				description: `Test sequential tag updates`,
 				creation_schema: { type: `object` }
-			}).spawn(`seq-meta-agent-${id}`, `entity-1`).send({ trigger: `claim` }, { from: `test` }).expectWebhook().custom(async (ctx) => {
+			}).spawn(`seq-meta-agent-${id}`, `entity-1`).send({ trigger: `claim` }).expectWebhook().custom(async (ctx) => {
 				const notification = ctx.notification;
 				const claimRes = await fetch(notification.parsed.callback, {
 					method: `POST`,
@@ -3314,10 +3286,7 @@ function runElectricAgentsConformanceTests(config) {
 				const res = await fetch(`${ctx.baseUrl}${routeControlPlanePath(`${ctx.currentEntityUrl}/send`)}`, {
 					method: `POST`,
 					headers: { "content-type": `application/json` },
-					body: JSON.stringify({
-						from: `tester`,
-						payload: `hi`
-					})
+					body: JSON.stringify({ payload: `hi` })
 				});
 				(0, vitest.expect)(res.status).toBe(204);
 			}).expectWebhook().respondDone().run();
@@ -3352,7 +3321,7 @@ function runElectricAgentsConformanceTests(config) {
 		});
 		(0, vitest.test)(`write to non-entity stream requires no auth`, async () => {
 			const id = Date.now();
-			const streamPath = `/v1/stream/plain-stream-auth-test-${id}`;
+			const streamPath = `/plain-stream-auth-test-${id}`;
 			const createRes = await fetch(`${config.baseUrl}${streamPath}`, {
 				method: `PUT`,
 				headers: { "Content-Type": `text/plain` },
@@ -3449,7 +3418,7 @@ function runCliConformanceTests(config) {
 				const streamRes = await fetch(`${baseUrl}${streams.main}?offset=0000000000000000_0000000000000000`);
 				const events = await streamRes.json();
 				(0, vitest.expect)(events.length).toBeGreaterThanOrEqual(1);
-				const msgEvent = events.find((e) => e.type === `message_received`);
+				const msgEvent = events.find((e) => e.type === `inbox`);
 				(0, vitest.expect)(msgEvent).toBeDefined();
 				const payload = msgEvent.value?.payload;
 				(0, vitest.expect)(payload.text).toBe(`hello world`);
@@ -3541,10 +3510,7 @@ function runMockAgentTests(config) {
 		const res = await fetch(`${baseUrl}${routeControlPlanePath(`${entityUrl}/send`)}`, {
 			method: `POST`,
 			headers: { "content-type": `application/json` },
-			body: JSON.stringify({
-				payload: { text },
-				from: `tester`
-			})
+			body: JSON.stringify({ payload: { text } })
 		});
 		(0, vitest.expect)(res.ok || res.status === 204, `send should succeed: ${res.status}`).toBe(true);
 	}

package/dist/index.d.cts

@@ -308,12 +308,12 @@ declare class ElectricAgentsScenario {
     parent?: string;
     initialMessage?: unknown;
   }): this;
-  send(payload: unknown, opts: {
-    from: string;
+  send(payload: unknown, opts?: {
+    from?: string;
     type?: string;
   }): this;
-  sendTo(url: string, payload: unknown, opts: {
-    from: string;
+  sendTo(url: string, payload: unknown, opts?: {
+    from?: string;
   }): this;
   kill(): this;
   killUrl(url: string): this;
@@ -366,15 +366,15 @@ declare class ElectricAgentsScenario {
   expectSpawnSchemaError(typeName: string, instanceId: string, opts?: {
     args?: Record<string, unknown>;
   }): this;
-  expectSendSchemaError(payload: unknown, opts: {
-    from: string;
+  expectSendSchemaError(payload: unknown, opts?: {
+    from?: string;
     type?: string;
   }): this;
   expectWriteSchemaError(payload: unknown, opts?: {
     type?: string;
   }): this;
   expectSendUnknownType(payload: unknown, opts: {
-    from: string;
+    from?: string;
     type: string;
   }): this;
   expectWriteUnknownType(payload: unknown, opts: {

package/dist/index.d.ts

@@ -308,12 +308,12 @@ declare class ElectricAgentsScenario {
     parent?: string;
     initialMessage?: unknown;
   }): this;
-  send(payload: unknown, opts: {
-    from: string;
+  send(payload: unknown, opts?: {
+    from?: string;
     type?: string;
   }): this;
-  sendTo(url: string, payload: unknown, opts: {
-    from: string;
+  sendTo(url: string, payload: unknown, opts?: {
+    from?: string;
   }): this;
   kill(): this;
   killUrl(url: string): this;
@@ -366,15 +366,15 @@ declare class ElectricAgentsScenario {
   expectSpawnSchemaError(typeName: string, instanceId: string, opts?: {
     args?: Record<string, unknown>;
   }): this;
-  expectSendSchemaError(payload: unknown, opts: {
-    from: string;
+  expectSendSchemaError(payload: unknown, opts?: {
+    from?: string;
     type?: string;
   }): this;
   expectWriteSchemaError(payload: unknown, opts?: {
     type?: string;
   }): this;
   expectSendUnknownType(payload: unknown, opts: {
-    from: string;
+    from?: string;
     type: string;
   }): this;
   expectWriteUnknownType(payload: unknown, opts: {

package/dist/index.js

@@ -193,7 +193,7 @@ function isEntityStreamPath$1(pathname) {
 	return segments.length >= 3 && (lastSegment === `main` || lastSegment === `error`);
 }
 function subscriptionEndpoint$1(baseUrl, id) {
-	return `${baseUrl}/v1/stream-meta/subscriptions/${encodeURIComponent(id)}`;
+	return `${baseUrl}/__ds/subscriptions/${encodeURIComponent(id)}`;
 }
 function subscriptionPattern$1(pattern) {
 	return pattern.replace(/^\/+/, ``);
@@ -229,8 +229,8 @@ var ElectricAgentsScenario = class {
 		this.steps.push({
 			kind: `send`,
 			payload,
-			from: opts.from,
-			type: opts.type
+			from: opts?.from,
+			type: opts?.type
 		});
 		return this;
 	}
@@ -239,7 +239,7 @@ var ElectricAgentsScenario = class {
 			kind: `sendTo`,
 			url,
 			payload,
-			from: opts.from
+			from: opts?.from
 		});
 		return this;
 	}
@@ -431,7 +431,7 @@ var ElectricAgentsScenario = class {
 		this.steps.push({
 			kind: `expectSendSchemaError`,
 			payload,
-			messageType: opts.type ?? `default`,
+			messageType: opts?.type ?? `default`,
 			code: `SCHEMA_VALIDATION_ERROR`,
 			status: 422
 		});
@@ -732,10 +732,7 @@ async function executeStep(ctx, step) {
 			if (!ctx.currentEntityUrl) throw new Error(`No current entity`);
 			const res = await electricAgentsFetch$1(ctx.baseUrl, `${ctx.currentEntityUrl}/send`, {
 				method: `POST`,
-				body: JSON.stringify({
-					from: `test`,
-					payload: { should: `fail` }
-				})
+				body: JSON.stringify({ payload: { should: `fail` } })
 			});
 			expect(res.status).toBe(step.status);
 			const body = await res.json();
@@ -1471,7 +1468,7 @@ function checkStateProtocolInvariants(events) {
 //#endregion
 //#region src/cli-dsl.ts
 function subscriptionEndpoint(baseUrl, id) {
-	return `${baseUrl}/v1/stream-meta/subscriptions/${encodeURIComponent(id)}`;
+	return `${baseUrl}/__ds/subscriptions/${encodeURIComponent(id)}`;
 }
 function subscriptionPattern(pattern) {
 	return pattern.replace(/^\/+/, ``);
@@ -1820,26 +1817,23 @@ function runElectricAgentsConformanceTests(config) {
 			name: `send-test-worker`,
 			description: `Test entity type for send`,
 			creation_schema: { type: `object` }
-		}).spawn(`send-test-worker`, `entity-1`).send({ task: `hello` }, { from: `user-1` }).expectWebhook().respondDone().readStream().expectStreamContains(`message_received`).custom(async (ctx) => {
-			const envelope = ctx.lastStreamMessages.find((m) => m.type === `message_received`);
-			expect(envelope.type).toBe(`message_received`);
+		}).spawn(`send-test-worker`, `entity-1`).send({ task: `hello` }).expectWebhook().respondDone().readStream().expectStreamContains(`inbox`).custom(async (ctx) => {
+			const envelope = ctx.lastStreamMessages.find((m) => m.type === `inbox`);
+			expect(envelope.type).toBe(`inbox`);
 			expect(envelope.key).toBeDefined();
-			expect(envelope.value?.from).toBe(`user-1`);
+			expect(envelope.value?.from).toMatch(/^\/principal\//);
 			expect(envelope.value?.payload).toEqual({ task: `hello` });
 		}).run());
 		test(`send triggers webhook with entity context`, () => electricAgents(config.baseUrl).subscription(`/webhook-ctx-agent/**`, `webhook-ctx-sub`).registerType({
 			name: `webhook-ctx-agent`,
 			description: `Test entity type for webhook context`,
 			creation_schema: { type: `object` }
-		}).spawn(`webhook-ctx-agent`, `entity-1`).send({ ping: true }, { from: `test` }).expectWebhook().expectEntityContext({ type: `webhook-ctx-agent` }).respondDone().run());
+		}).spawn(`webhook-ctx-agent`, `entity-1`).send({ ping: true }).expectWebhook().expectEntityContext({ type: `webhook-ctx-agent` }).respondDone().run());
 		test(`send to nonexistent entity returns 404`, () => electricAgents(config.baseUrl).custom(async (ctx) => {
 			const res = await fetch(`${ctx.baseUrl}${routeControlPlanePath(`/nonexistent-type/nonexistent-id/send`)}`, {
 				method: `POST`,
 				headers: { "content-type": `application/json` },
-				body: JSON.stringify({
-					from: `test`,
-					payload: {}
-				})
+				body: JSON.stringify({ payload: {} })
 			});
 			expect(res.status).toBe(404);
 		}).skipInvariants().run());
@@ -1849,13 +1843,13 @@ function runElectricAgentsConformanceTests(config) {
 				name: `order-test-agent-${id}`,
 				description: `Test entity type for ordering`,
 				creation_schema: { type: `object` }
-			}).spawn(`order-test-agent-${id}`, `entity-1`).send({ seq: 1 }, { from: `test` }).expectWebhook().respondDone().send({ seq: 2 }, { from: `test` }).expectWebhook().respondDone().send({ seq: 3 }, { from: `test` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
-				const msgs = ctx.lastStreamMessages.filter((m) => m.type === `message_received`);
+			}).spawn(`order-test-agent-${id}`, `entity-1`).send({ seq: 1 }).expectWebhook().respondDone().send({ seq: 2 }).expectWebhook().respondDone().send({ seq: 3 }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
+				const msgs = ctx.lastStreamMessages.filter((m) => m.type === `inbox`);
 				expect(msgs.length).toBe(3);
 				for (let i = 0; i < 3; i++) expect(msgs[i].value?.payload).toEqual({ seq: i + 1 });
 			}).run();
 		});
-		test(`send without from is rejected`, () => electricAgents(config.baseUrl).subscription(`/nofrom-test-agent/**`, `nofrom-test-sub`).registerType({
+		test(`send without from uses principal`, () => electricAgents(config.baseUrl).subscription(`/nofrom-test-agent/**`, `nofrom-test-sub`).registerType({
 			name: `nofrom-test-agent`,
 			description: `Test entity type for send without from`,
 			creation_schema: { type: `object` }
@@ -1864,10 +1858,8 @@ function runElectricAgentsConformanceTests(config) {
 				method: `POST`,
 				body: JSON.stringify({ payload: { hello: true } })
 			});
-			expect(res.status).toBe(400);
-			const body = await res.json();
-			expect(body.error.code).toBe(`INVALID_REQUEST`);
-		}).run());
+			expect(res.status).toBe(204);
+		}).expectWebhook().respondDone().run());
 	});
 	describe(`Electric Agents List`, () => {
 		test(`ps lists entities`, () => electricAgents(config.baseUrl).subscription(`/ps-test-worker/**`, `ps-test-worker-sub`).subscription(`/ps-test-agent/**`, `ps-test-agent-sub`).registerType({
@@ -1907,9 +1899,9 @@ function runElectricAgentsConformanceTests(config) {
 			name: `kill-persist-agent`,
 			description: `Test entity type for kill persistence`,
 			creation_schema: { type: `object` }
-		}).spawn(`kill-persist-agent`, `entity-1`).send({ before: `kill` }, { from: `test` }).expectWebhook().respondDone().kill().readStream().expectStreamContains(`message_received`).custom(async (ctx) => {
+		}).spawn(`kill-persist-agent`, `entity-1`).send({ before: `kill` }).expectWebhook().respondDone().kill().readStream().expectStreamContains(`inbox`).custom(async (ctx) => {
 			const msgs = ctx.lastStreamMessages;
-			const msgReceived = msgs.find((m) => m.type === `message_received`);
+			const msgReceived = msgs.find((m) => m.type === `inbox`);
 			expect(msgReceived.value?.payload).toEqual({ before: `kill` });
 			const stopped = msgs.find((m) => m.type === `entity_stopped`);
 			expect(stopped).toBeDefined();
@@ -1947,7 +1939,7 @@ function runElectricAgentsConformanceTests(config) {
 			name: `e2e-test-agent`,
 			description: `Test entity type for E2E lifecycle`,
 			creation_schema: { type: `object` }
-		}).spawn(`e2e-test-agent`, `entity-1`).expectStatus(`running`).send({ task: `do-something` }, { from: `user-1` }).expectWebhook().expectEntityContext({ type: `e2e-test-agent` }).respondDone().readStream().expectStreamContains(`message_received`).kill().custom(async (ctx) => {
+		}).spawn(`e2e-test-agent`, `entity-1`).expectStatus(`running`).send({ task: `do-something` }).expectWebhook().expectEntityContext({ type: `e2e-test-agent` }).respondDone().readStream().expectStreamContains(`inbox`).kill().custom(async (ctx) => {
 			const entity = await pollEntityStatus(ctx.baseUrl, ctx.currentEntityUrl, [`stopped`]);
 			expect(entity.status).toBe(`stopped`);
 		}).expectSendError(`NOT_RUNNING`, 409).run());
@@ -2202,10 +2194,7 @@ function runElectricAgentsConformanceTests(config) {
 					properties: { text: { type: `string` } },
 					required: [`text`]
 				} }
-			}).spawn(typeName, `entity-1`).send({ text: `hello` }, {
-				from: `user`,
-				type: `query`
-			}).expectWebhook().respondDone().run();
+			}).spawn(typeName, `entity-1`).send({ text: `hello` }, { type: `query` }).expectWebhook().respondDone().run();
 		});
 		test(`send rejects invalid typed message (C11)`, () => {
 			const typeName = `send-schema-inv-${Date.now()}`;
@@ -2218,10 +2207,7 @@ function runElectricAgentsConformanceTests(config) {
 					properties: { text: { type: `string` } },
 					required: [`text`]
 				} }
-			}).spawn(typeName, `entity-1`).expectSendSchemaError({ invalid: true }, {
-				from: `user`,
-				type: `query`
-			}).run();
+			}).spawn(typeName, `entity-1`).expectSendSchemaError({ invalid: true }, { type: `query` }).run();
 		});
 		test(`send rejects unknown message type (C13)`, () => {
 			const typeName = `send-unknown-type-${Date.now()}`;
@@ -2234,10 +2220,7 @@ function runElectricAgentsConformanceTests(config) {
 					properties: { text: { type: `string` } },
 					required: [`text`]
 				} }
-			}).spawn(typeName, `entity-1`).expectSendUnknownType({ text: `hi` }, {
-				from: `user`,
-				type: `unknown_type`
-			}).run();
+			}).spawn(typeName, `entity-1`).expectSendUnknownType({ text: `hi` }, { type: `unknown_type` }).run();
 		});
 		test(`send without type when no input_schemas accepts any`, () => {
 			const typeName = `send-no-schemas-${Date.now()}`;
@@ -2245,7 +2228,7 @@ function runElectricAgentsConformanceTests(config) {
 				name: typeName,
 				description: `Type without input schemas`,
 				creation_schema: { type: `object` }
-			}).spawn(typeName, `entity-1`).send({ anything: `goes` }, { from: `user` }).expectWebhook().respondDone().run();
+			}).spawn(typeName, `entity-1`).send({ anything: `goes` }).expectWebhook().respondDone().run();
 		});
 		test(`send with empty input_schemas rejects all`, () => {
 			const typeName = `send-empty-schemas-${Date.now()}`;
@@ -2254,10 +2237,7 @@ function runElectricAgentsConformanceTests(config) {
 				description: `Type with empty input schemas`,
 				creation_schema: { type: `object` },
 				input_schemas: {}
-			}).spawn(typeName, `entity-1`).expectSendUnknownType({ text: `anything` }, {
-				from: `user`,
-				type: `some_type`
-			}).run();
+			}).spawn(typeName, `entity-1`).expectSendUnknownType({ text: `anything` }, { type: `some_type` }).run();
 		});
 		test.skip(`write appends event to entity stream`, () => {
 			const typeName = `write-append-${Date.now()}`;
@@ -2432,10 +2412,7 @@ function runElectricAgentsConformanceTests(config) {
 				type: `object`,
 				properties: { action: { type: `string` } },
 				required: [`action`]
-			} } }).spawn(typeName, `entity-1`).send({ action: `do-it` }, {
-				from: `user`,
-				type: `command`
-			}).expectWebhook().respondDone().run();
+			} } }).spawn(typeName, `entity-1`).send({ action: `do-it` }, { type: `command` }).expectWebhook().respondDone().run();
 		});
 		test(`amend schemas rejects modifying existing keys (C16)`, () => {
 			const typeName = `amend-conflict-${Date.now()}`;
@@ -2617,13 +2594,10 @@ function runElectricAgentsConformanceTests(config) {
 								if (!url) return;
 								const res = await electricAgentsFetch(ctx.baseUrl, `${url}/send`, {
 									method: `POST`,
-									body: JSON.stringify({
-										from: `prop-test`,
-										payload: {
-											action: `prop-send`,
-											targetIdx
-										}
-									})
+									body: JSON.stringify({ payload: {
+										action: `prop-send`,
+										targetIdx
+									} })
 								});
 								expect(res.status).toBe(204);
 								ctx.history.push({
@@ -2632,8 +2606,7 @@ function runElectricAgentsConformanceTests(config) {
 									payload: {
 										action: `prop-send`,
 										targetIdx
-									},
-									from: `prop-test`
+									}
 								});
 							});
 							scenario.expectWebhook();
@@ -2945,12 +2918,12 @@ function runElectricAgentsConformanceTests(config) {
 			name: `sp-send-worker`,
 			description: `Test entity type for SP send format`,
 			creation_schema: { type: `object` }
-		}).spawn(`sp-send-worker`, `entity-1`).send({ text: `hello world` }, { from: `user-1` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
+		}).spawn(`sp-send-worker`, `entity-1`).send({ text: `hello world` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
 			const events = ctx.lastStreamMessages;
-			const msgEvent = events.find((e) => e.type === `message_received`);
-			expect(msgEvent.type).toBe(`message_received`);
+			const msgEvent = events.find((e) => e.type === `inbox`);
+			expect(msgEvent.type).toBe(`inbox`);
 			expect(msgEvent.key).toBeDefined();
-			expect(msgEvent.value?.from).toBe(`user-1`);
+			expect(msgEvent.value?.from).toMatch(/^\/principal\//);
 			expect(msgEvent.value?.payload).toEqual({ text: `hello world` });
 			expect(msgEvent.headers).toBeDefined();
 		}).run());
@@ -2958,9 +2931,9 @@ function runElectricAgentsConformanceTests(config) {
 			name: `sp-inv-worker`,
 			description: `Test entity type for SP invariant checks`,
 			creation_schema: { type: `object` }
-		}).spawn(`sp-inv-worker`, `entity-1`).send({ text: `first` }, { from: `tester` }).expectWebhook().respondDone().send({ text: `second` }, { from: `tester` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
+		}).spawn(`sp-inv-worker`, `entity-1`).send({ text: `first` }).expectWebhook().respondDone().send({ text: `second` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
 			const events = ctx.lastStreamMessages;
-			const messageEvents = events.filter((ev) => ev.type === `message_received`);
+			const messageEvents = events.filter((ev) => ev.type === `inbox`);
 			expect(messageEvents.length).toBe(2);
 			checkStateProtocolInvariants(events);
 		}).run());
@@ -2970,8 +2943,8 @@ function runElectricAgentsConformanceTests(config) {
 				name: `sp-keys-agent-${id}`,
 				description: `Test entity type for send key uniqueness`,
 				creation_schema: { type: `object` }
-			}).spawn(`sp-keys-agent-${id}`, `entity-1`).send({ seq: 1 }, { from: `test` }).expectWebhook().respondDone().send({ seq: 2 }, { from: `test` }).expectWebhook().respondDone().send({ seq: 3 }, { from: `test` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
-				const events = ctx.lastStreamMessages.filter((e) => e.type === `message_received`);
+			}).spawn(`sp-keys-agent-${id}`, `entity-1`).send({ seq: 1 }).expectWebhook().respondDone().send({ seq: 2 }).expectWebhook().respondDone().send({ seq: 3 }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
+				const events = ctx.lastStreamMessages.filter((e) => e.type === `inbox`);
 				expect(events.length).toBe(3);
 				for (let i = 0; i < 3; i++) expect(events[i].value?.payload).toEqual({ seq: i + 1 });
 			}).run();
@@ -2984,9 +2957,9 @@ function runElectricAgentsConformanceTests(config) {
 				name: `flum-agent-${id}`,
 				description: `Test send event format for webhook parsing`,
 				creation_schema: { type: `object` }
-			}).spawn(`flum-agent-${id}`, `entity-1`).send({ text: `test message for parsing` }, { from: `tester` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
+			}).spawn(`flum-agent-${id}`, `entity-1`).send({ text: `test message for parsing` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
 				const events = ctx.lastStreamMessages;
-				const msgEvent = events.find((e) => e.type === `message_received`);
+				const msgEvent = events.find((e) => e.type === `inbox`);
 				expect(msgEvent).toBeDefined();
 				expect(msgEvent.value?.payload).toBeDefined();
 				const payload = msgEvent.value.payload;
@@ -2999,10 +2972,10 @@ function runElectricAgentsConformanceTests(config) {
 				name: `flum-all-agent-${id}`,
 				description: `Test all events are SP format`,
 				creation_schema: { type: `object` }
-			}).spawn(`flum-all-agent-${id}`, `entity-1`).send({ text: `verify all SP` }, { from: `tester` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
+			}).spawn(`flum-all-agent-${id}`, `entity-1`).send({ text: `verify all SP` }).expectWebhook().respondDone().readStream().custom(async (ctx) => {
 				const events = ctx.lastStreamMessages;
 				expect(events.length).toBeGreaterThanOrEqual(1);
-				const hasMsg = events.some((e) => e.type === `message_received`);
+				const hasMsg = events.some((e) => e.type === `inbox`);
 				expect(hasMsg).toBe(true);
 				for (const ev of events) {
 					expect(ev.type, `every event must have type`).toBeDefined();
@@ -3047,7 +3020,7 @@ function runElectricAgentsConformanceTests(config) {
 			}).spawn(`no-payload-agent-${id}`, `entity-1`).custom(async (ctx) => {
 				const res = await electricAgentsFetch(ctx.baseUrl, `${ctx.currentEntityUrl}/send`, {
 					method: `POST`,
-					body: JSON.stringify({ from: `tester` })
+					body: JSON.stringify({})
 				});
 				expect(res.status).toBe(400);
 				const body = await res.json();
@@ -3116,7 +3089,6 @@ function runElectricAgentsConformanceTests(config) {
 				const res = await electricAgentsFetch(ctx.baseUrl, `${rev1EntityUrl}/send`, {
 					method: `POST`,
 					body: JSON.stringify({
-						from: `tester`,
 						payload: { reason: `bye` },
 						type: `farewell`
 					})
@@ -3146,7 +3118,7 @@ function runElectricAgentsConformanceTests(config) {
 				name: `seq-meta-agent-${id}`,
 				description: `Test sequential tag updates`,
 				creation_schema: { type: `object` }
-			}).spawn(`seq-meta-agent-${id}`, `entity-1`).send({ trigger: `claim` }, { from: `test` }).expectWebhook().custom(async (ctx) => {
+			}).spawn(`seq-meta-agent-${id}`, `entity-1`).send({ trigger: `claim` }).expectWebhook().custom(async (ctx) => {
 				const notification = ctx.notification;
 				const claimRes = await fetch(notification.parsed.callback, {
 					method: `POST`,
@@ -3290,10 +3262,7 @@ function runElectricAgentsConformanceTests(config) {
 				const res = await fetch(`${ctx.baseUrl}${routeControlPlanePath(`${ctx.currentEntityUrl}/send`)}`, {
 					method: `POST`,
 					headers: { "content-type": `application/json` },
-					body: JSON.stringify({
-						from: `tester`,
-						payload: `hi`
-					})
+					body: JSON.stringify({ payload: `hi` })
 				});
 				expect(res.status).toBe(204);
 			}).expectWebhook().respondDone().run();
@@ -3328,7 +3297,7 @@ function runElectricAgentsConformanceTests(config) {
 		});
 		test(`write to non-entity stream requires no auth`, async () => {
 			const id = Date.now();
-			const streamPath = `/v1/stream/plain-stream-auth-test-${id}`;
+			const streamPath = `/plain-stream-auth-test-${id}`;
 			const createRes = await fetch(`${config.baseUrl}${streamPath}`, {
 				method: `PUT`,
 				headers: { "Content-Type": `text/plain` },
@@ -3425,7 +3394,7 @@ function runCliConformanceTests(config) {
 				const streamRes = await fetch(`${baseUrl}${streams.main}?offset=0000000000000000_0000000000000000`);
 				const events = await streamRes.json();
 				expect(events.length).toBeGreaterThanOrEqual(1);
-				const msgEvent = events.find((e) => e.type === `message_received`);
+				const msgEvent = events.find((e) => e.type === `inbox`);
 				expect(msgEvent).toBeDefined();
 				const payload = msgEvent.value?.payload;
 				expect(payload.text).toBe(`hello world`);
@@ -3517,10 +3486,7 @@ function runMockAgentTests(config) {
 		const res = await fetch(`${baseUrl}${routeControlPlanePath(`${entityUrl}/send`)}`, {
 			method: `POST`,
 			headers: { "content-type": `application/json` },
-			body: JSON.stringify({
-				payload: { text },
-				from: `tester`
-			})
+			body: JSON.stringify({ payload: { text } })
 		});
 		expect(res.ok || res.status === 204, `send should succeed: ${res.status}`).toBe(true);
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electric-ax/agents-server-conformance-tests",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Conformance test suite for Electric Agents server implementations",
   "author": "Durable Stream contributors",
   "license": "Apache-2.0",
@@ -35,7 +35,7 @@
   ],
   "dependencies": {
     "@durable-streams/client": "https://pkg.pr.new/durable-streams/durable-streams/@durable-streams/client@350",
-    "@electric-sql/client": "^1.5.17",
+    "@electric-sql/client": "^1.5.18",
     "fast-check": "^4.6.0",
     "vitest": "^4.1.0"
   },
@@ -43,7 +43,7 @@
     "@mariozechner/pi-agent-core": "^0.70.2",
     "tsdown": "^0.9.0",
     "typescript": "^5.0.0",
-    "@electric-ax/agents-server": "0.4.0"
+    "@electric-ax/agents-server": "0.4.3"
   },
   "engines": {
     "node": ">=18.0.0"