electric-ax 0.2.0 → 0.2.2

package/dist/completions.d.cts

@@ -1,4 +1,4 @@
-import { ElectricCliEnv } from "./index-BQ4JyfkG.cjs";
+import { ElectricCliEnv } from "./index-cwCTPq6Y.cjs";
 
 //#region src/completions.d.ts
 declare function fetchEntityTypeNames(env: ElectricCliEnv): Promise<Array<string>>;

package/dist/completions.d.ts

@@ -1,4 +1,4 @@
-import { ElectricCliEnv } from "./index-D6TZ88Yg.js";
+import { ElectricCliEnv } from "./index-BSHO_Rei.js";
 
 //#region src/completions.d.ts
 declare function fetchEntityTypeNames(env: ElectricCliEnv): Promise<Array<string>>;

package/dist/{entity-api-ClpnLxWJ.cjs → entity-api-Cvo55yZx.cjs}

@@ -12,18 +12,8 @@ function entityApiPath(entityUrl, suffix = ``) {
 function entityApiUrl(baseUrl, entityUrl, suffix = ``) {
 	return (0, __electric_ax_agents_runtime.appendPathToUrl)(baseUrl, entityApiPath(entityUrl, suffix));
 }
-function assertedIdentityHeaders(identity) {
-	const trimmed = identity?.trim();
-	return trimmed ? { "x-electric-asserted-email": trimmed } : {};
-}
 
 //#endregion
-Object.defineProperty(exports, 'assertedIdentityHeaders', {
-  enumerable: true,
-  get: function () {
-    return assertedIdentityHeaders;
-  }
-});
 Object.defineProperty(exports, 'entityApiPath', {
   enumerable: true,
   get: function () {

package/dist/{entity-api-Dh28Mz7H.js → entity-api-DWMhkYbl.js}

@@ -10,10 +10,6 @@ function entityApiPath(entityUrl, suffix = ``) {
 function entityApiUrl(baseUrl, entityUrl, suffix = ``) {
 	return appendPathToUrl(baseUrl, entityApiPath(entityUrl, suffix));
 }
-function assertedIdentityHeaders(identity) {
-	const trimmed = identity?.trim();
-	return trimmed ? { "x-electric-asserted-email": trimmed } : {};
-}
 
 //#endregion
-export { assertedIdentityHeaders, entityApiPath, entityApiUrl };
+export { entityApiPath, entityApiUrl };

package/dist/{entity-stream-db-CmDwc49J.d.cts → entity-stream-db-BV4N31MR.d.cts}

@@ -6,8 +6,6 @@ declare function createEntityStreamDB(opts: {
   baseUrl: string;
   entityUrl: string;
   initialOffset?: string;
-  assertedAuthEmail?: string;
-  assertedAuthName?: string;
   headers?: Record<string, string>;
 }): Promise<{
   db: EntityStreamDB;

package/dist/{entity-stream-db-DgzxI6C_.d.ts → entity-stream-db-Bl6AT5hR.d.ts}

@@ -6,8 +6,6 @@ declare function createEntityStreamDB(opts: {
   baseUrl: string;
   entityUrl: string;
   initialOffset?: string;
-  assertedAuthEmail?: string;
-  assertedAuthName?: string;
   headers?: Record<string, string>;
 }): Promise<{
   db: EntityStreamDB;

package/dist/{entity-stream-db-Czz3S8YF.js → entity-stream-db-CDOlZYc2.js}

@@ -1,4 +1,4 @@
-import { assertedIdentityHeaders, entityApiUrl } from "./entity-api-Dh28Mz7H.js";
+import { entityApiUrl } from "./entity-api-DWMhkYbl.js";
 import { createStreamDB } from "@durable-streams/state";
 import { appendPathToUrl, entityStateSchema } from "@electric-ax/agents-runtime";
 
@@ -7,12 +7,10 @@ function getMainStreamPath(entityUrl, entity) {
 	return entity.streams?.main ?? `${entityUrl}/main`;
 }
 async function createEntityStreamDB(opts) {
-	const { baseUrl, entityUrl, initialOffset, assertedAuthEmail, assertedAuthName, headers: serverHeaders } = opts;
+	const { baseUrl, entityUrl, initialOffset, headers: serverHeaders } = opts;
 	console.log(`[createEntityStreamDB] Creating entity stream DB for ${baseUrl}${entityUrl}`);
 	const requestHeaders = {
 		"content-type": `application/json`,
-		...assertedIdentityHeaders(assertedAuthEmail),
-		...assertedAuthName ? { "x-electric-asserted-name": assertedAuthName } : {},
 		...serverHeaders
 	};
 	let res;

package/dist/{entity-stream-db-BLbPedyR.cjs → entity-stream-db-CIv6uC2d.cjs}

@@ -1,6 +1,6 @@
 "use strict";
 const require_chunk = require('./chunk-BCwAaXi7.cjs');
-const require_entity_api = require('./entity-api-ClpnLxWJ.cjs');
+const require_entity_api = require('./entity-api-Cvo55yZx.cjs');
 const __durable_streams_state = require_chunk.__toESM(require("@durable-streams/state"));
 const __electric_ax_agents_runtime = require_chunk.__toESM(require("@electric-ax/agents-runtime"));
 
@@ -9,12 +9,10 @@ function getMainStreamPath(entityUrl, entity) {
 	return entity.streams?.main ?? `${entityUrl}/main`;
 }
 async function createEntityStreamDB(opts) {
-	const { baseUrl, entityUrl, initialOffset, assertedAuthEmail, assertedAuthName, headers: serverHeaders } = opts;
+	const { baseUrl, entityUrl, initialOffset, headers: serverHeaders } = opts;
 	console.log(`[createEntityStreamDB] Creating entity stream DB for ${baseUrl}${entityUrl}`);
 	const requestHeaders = {
 		"content-type": `application/json`,
-		...require_entity_api.assertedIdentityHeaders(assertedAuthEmail),
-		...assertedAuthName ? { "x-electric-asserted-name": assertedAuthName } : {},
 		...serverHeaders
 	};
 	let res;

package/dist/entity-stream-db.cjs

@@ -1,4 +1,4 @@
-require('./entity-api-ClpnLxWJ.cjs');
-const require_entity_stream_db = require('./entity-stream-db-BLbPedyR.cjs');
+require('./entity-api-Cvo55yZx.cjs');
+const require_entity_stream_db = require('./entity-stream-db-CIv6uC2d.cjs');
 
 exports.createEntityStreamDB = require_entity_stream_db.createEntityStreamDB

package/dist/entity-stream-db.d.cts

@@ -1,2 +1,2 @@
-import { EntityStreamDB, createEntityStreamDB } from "./entity-stream-db-CmDwc49J.cjs";
+import { EntityStreamDB, createEntityStreamDB } from "./entity-stream-db-BV4N31MR.cjs";
 export { EntityStreamDB, createEntityStreamDB };

package/dist/entity-stream-db.d.ts

@@ -1,2 +1,2 @@
-import { EntityStreamDB, createEntityStreamDB$1 as createEntityStreamDB } from "./entity-stream-db-DgzxI6C_.js";
+import { EntityStreamDB, createEntityStreamDB$1 as createEntityStreamDB } from "./entity-stream-db-Bl6AT5hR.js";
 export { EntityStreamDB, createEntityStreamDB };

package/dist/entity-stream-db.js

@@ -1,4 +1,4 @@
-import "./entity-api-Dh28Mz7H.js";
-import { createEntityStreamDB } from "./entity-stream-db-Czz3S8YF.js";
+import "./entity-api-DWMhkYbl.js";
+import { createEntityStreamDB } from "./entity-stream-db-CDOlZYc2.js";
 
 export { createEntityStreamDB };

package/dist/{index-BQ4JyfkG.d.cts → index-BSHO_Rei.d.ts}

@@ -52,8 +52,6 @@ declare const DEFAULT_ELECTRIC_AGENTS_URL = "http://localhost:4437";
 interface ElectricCliEnv {
   electricAgentsUrl: string;
   electricAgentsIdentity: string;
-  electricAssertedAuthEmail?: string;
-  electricAssertedAuthName?: string;
   electricAgentsHeaders?: Record<string, string>;
 }
 interface SpawnCommandOptions {

package/dist/{index-D6TZ88Yg.d.ts → index-cwCTPq6Y.d.cts}

@@ -52,8 +52,6 @@ declare const DEFAULT_ELECTRIC_AGENTS_URL = "http://localhost:4437";
 interface ElectricCliEnv {
   electricAgentsUrl: string;
   electricAgentsIdentity: string;
-  electricAssertedAuthEmail?: string;
-  electricAssertedAuthName?: string;
   electricAgentsHeaders?: Record<string, string>;
 }
 interface SpawnCommandOptions {

package/dist/index.cjs

@@ -2,7 +2,7 @@
 "use strict";
 const require_chunk = require('./chunk-BCwAaXi7.cjs');
 const require_completions = require('./completions-Bj4D5DRa.cjs');
-const require_entity_api = require('./entity-api-ClpnLxWJ.cjs');
+const require_entity_api = require('./entity-api-Cvo55yZx.cjs');
 const require_env = require('./env-CFKgT8o2.cjs');
 const __electric_ax_agents_runtime = require_chunk.__toESM(require("@electric-ax/agents-runtime"));
 const node_fs = require_chunk.__toESM(require("node:fs"));
@@ -11,6 +11,7 @@ const node_path = require_chunk.__toESM(require("node:path"));
 const node_url = require_chunk.__toESM(require("node:url"));
 const commander = require_chunk.__toESM(require("commander"));
 const node_readline_promises = require_chunk.__toESM(require("node:readline/promises"));
+const __electric_ax_agents_server_headers = require_chunk.__toESM(require("@electric-ax/agents/server-headers"));
 
 //#region src/prompt-api-key.ts
 const FRIENDLY_INTRO = `\n${[
@@ -162,19 +163,20 @@ function parseElectricAgentsHeaders(raw) {
 }
 function getElectricCliEnv(env = process.env) {
 	const explicitIdentity = env.ELECTRIC_AGENTS_IDENTITY?.trim();
+	const headers = parseElectricAgentsHeaders(env.ELECTRIC_AGENTS_SERVER_HEADERS);
 	return {
 		electricAgentsUrl: env.ELECTRIC_AGENTS_URL || DEFAULT_ELECTRIC_AGENTS_URL,
 		electricAgentsIdentity: explicitIdentity || getDefaultElectricAgentsIdentity(),
-		electricAssertedAuthEmail: env.ELECTRIC_ASSERTED_AUTH_EMAIL?.trim() || explicitIdentity || void 0,
-		electricAssertedAuthName: env.ELECTRIC_ASSERTED_AUTH_NAME?.trim(),
-		electricAgentsHeaders: parseElectricAgentsHeaders(env.ELECTRIC_AGENTS_SERVER_HEADERS)
+		electricAgentsHeaders: (0, __electric_ax_agents_server_headers.mergeElectricPrincipalHeader)(headers, env.ELECTRIC_AGENTS_PRINCIPAL)
 	};
 }
 function getErrorMessage(error) {
-	return error instanceof Error ? error.message : String(error);
+	if (error instanceof Error) return error.message || error.name || `Unknown error`;
+	const message = String(error);
+	return message || `Unknown error`;
 }
 function fail(message) {
-	throw new CliError(message);
+	throw new CliError(message || `Unknown error`);
 }
 function relativeTime(epochMs) {
 	const seconds = Math.floor((Date.now() - epochMs) / 1e3);
@@ -298,8 +300,6 @@ async function electricAgentsFetch(env, path, opts = {}) {
 			...opts,
 			headers: {
 				"content-type": `application/json`,
-				...require_entity_api.assertedIdentityHeaders(env.electricAssertedAuthEmail),
-				...env.electricAssertedAuthName ? { "x-electric-asserted-name": env.electricAssertedAuthName } : {},
 				...env.electricAgentsHeaders,
 				...opts.headers
 			}
@@ -314,17 +314,36 @@ async function parseJsonResponse(res) {
 		return JSON.parse(text);
 	} catch (error) {
 		if (!(error instanceof SyntaxError)) throw error;
-		return { error: { message: text || res.statusText } };
+		return { error: { message: text || fallbackResponseMessage(res) } };
 	}
 }
+function fallbackResponseMessage(res) {
+	const status = res.status ? `HTTP ${res.status}` : `HTTP error`;
+	return res.statusText ? `${status}: ${res.statusText}` : status;
+}
+function stringMessage(value) {
+	if (typeof value !== `string`) return void 0;
+	const trimmed = value.trim();
+	if (trimmed.length === 0) return void 0;
+	return trimmed;
+}
+function errorMessageFromValue(value) {
+	const direct = stringMessage(value);
+	if (direct) return direct;
+	if (!value || typeof value !== `object` || Array.isArray(value)) return void 0;
+	const record = value;
+	return errorMessageFromValue(record.message) ?? errorMessageFromValue(record.error) ?? errorMessageFromValue(record.reason) ?? errorMessageFromValue(record.detail);
+}
+function responseErrorMessage(data, res) {
+	return errorMessageFromValue(data) ?? fallbackResponseMessage(res);
+}
 function failFromResponse(data, res) {
-	const err = data.error;
-	fail(String(err?.message ?? res.statusText));
+	fail(responseErrorMessage(data, res));
 }
 async function fetchEntityTypes(env) {
 	const res = await electricAgentsFetch(env, `/_electric/entity-types`);
-	const data = await res.json();
-	if (!res.ok) fail(typeof data === `object` && data !== null ? String(data.error?.message ?? res.statusText) : res.statusText);
+	const data = await parseJsonResponse(res);
+	if (!res.ok) failFromResponse(data, res);
 	if (!Array.isArray(data)) fail(`Unexpected response from server when listing entity types`);
 	return data;
 }
@@ -349,8 +368,8 @@ async function fetchEntities(env, options = {}) {
 	if (options.parent) searchParams.set(`parent`, options.parent);
 	const suffix = searchParams.size > 0 ? `?${searchParams.toString()}` : ``;
 	const res = await electricAgentsFetch(env, `/_electric/entities${suffix}`);
-	const data = await res.json();
-	if (!res.ok) fail(typeof data === `object` && data !== null ? String(data.error?.message ?? res.statusText) : res.statusText);
+	const data = await parseJsonResponse(res);
+	if (!res.ok) failFromResponse(data, res);
 	if (!Array.isArray(data)) fail(`Unexpected response from server when listing entities`);
 	return data;
 }
@@ -409,8 +428,6 @@ async function observeEntity(env, url, options) {
 		entityUrl: url,
 		baseUrl: env.electricAgentsUrl,
 		identity: env.electricAgentsIdentity,
-		assertedAuthEmail: env.electricAssertedAuthEmail,
-		assertedAuthName: env.electricAssertedAuthName,
 		headers: env.electricAgentsHeaders,
 		initialOffset: options.from
 	});
@@ -531,6 +548,8 @@ function getHelpText(commandName) {
 Environment:
   ELECTRIC_AGENTS_URL        Base URL of the server (default: ${DEFAULT_ELECTRIC_AGENTS_URL})
   ELECTRIC_AGENTS_IDENTITY   Sender identity for messages (default: ${getDefaultElectricAgentsIdentity()})
+  ELECTRIC_AGENTS_PRINCIPAL  Optional principal key sent as the Electric-Principal header
+  ELECTRIC_AGENTS_SERVER_HEADERS  Optional JSON object of additional server headers
   ANTHROPIC_API_KEY          Required for '${agentsCommand} start-builtin' and '${agentsCommand} quickstart'
 
 Examples:

package/dist/index.d.cts

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-import { DEFAULT_ELECTRIC_AGENTS_URL, ElectricCliEnv, ElectricCliHandlers, ObserveCommandOptions, PsCommandOptions, SendCommandOptions, SpawnCommandOptions, StartBuiltinCommandOptions, StartCommandOptions, StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StopCommandOptions, StoppedDevEnvironment, createElectricCliHandlers, createElectricProgram, formatQuickstartBackendStartedMessage, getElectricCliEnv, resolveCommandPrefix, run } from "./index-BQ4JyfkG.cjs";
+import { DEFAULT_ELECTRIC_AGENTS_URL, ElectricCliEnv, ElectricCliHandlers, ObserveCommandOptions, PsCommandOptions, SendCommandOptions, SpawnCommandOptions, StartBuiltinCommandOptions, StartCommandOptions, StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StopCommandOptions, StoppedDevEnvironment, createElectricCliHandlers, createElectricProgram, formatQuickstartBackendStartedMessage, getElectricCliEnv, resolveCommandPrefix, run } from "./index-cwCTPq6Y.cjs";
 export { DEFAULT_ELECTRIC_AGENTS_URL, ElectricCliEnv, ElectricCliHandlers, ObserveCommandOptions, PsCommandOptions, SendCommandOptions, SpawnCommandOptions, StartBuiltinCommandOptions, StartCommandOptions, StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StopCommandOptions, StoppedDevEnvironment, createElectricCliHandlers, createElectricProgram, formatQuickstartBackendStartedMessage, getElectricCliEnv, resolveCommandPrefix, run };

package/dist/index.d.ts

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-import { DEFAULT_ELECTRIC_AGENTS_URL, ElectricCliEnv, ElectricCliHandlers, ObserveCommandOptions, PsCommandOptions, SendCommandOptions, SpawnCommandOptions, StartBuiltinCommandOptions, StartCommandOptions, StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StopCommandOptions, StoppedDevEnvironment, createElectricCliHandlers, createElectricProgram, formatQuickstartBackendStartedMessage, getElectricCliEnv, resolveCommandPrefix, run } from "./index-D6TZ88Yg.js";
+import { DEFAULT_ELECTRIC_AGENTS_URL, ElectricCliEnv, ElectricCliHandlers, ObserveCommandOptions, PsCommandOptions, SendCommandOptions, SpawnCommandOptions, StartBuiltinCommandOptions, StartCommandOptions, StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StopCommandOptions, StoppedDevEnvironment, createElectricCliHandlers, createElectricProgram, formatQuickstartBackendStartedMessage, getElectricCliEnv, resolveCommandPrefix, run } from "./index-BSHO_Rei.js";
 export { DEFAULT_ELECTRIC_AGENTS_URL, ElectricCliEnv, ElectricCliHandlers, ObserveCommandOptions, PsCommandOptions, SendCommandOptions, SpawnCommandOptions, StartBuiltinCommandOptions, StartCommandOptions, StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StopCommandOptions, StoppedDevEnvironment, createElectricCliHandlers, createElectricProgram, formatQuickstartBackendStartedMessage, getElectricCliEnv, resolveCommandPrefix, run };

package/dist/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { installCompletions, setupCompletions } from "./completions-B-Lf28Wy.js";
-import { assertedIdentityHeaders, entityApiPath } from "./entity-api-Dh28Mz7H.js";
+import { entityApiPath } from "./entity-api-DWMhkYbl.js";
 import { resolveAnthropicApiKey$1 as resolveAnthropicApiKey } from "./env-DIhTv987.js";
 import { appendPathToUrl } from "@electric-ax/agents-runtime";
 import { existsSync, readFileSync, realpathSync, writeFileSync } from "node:fs";
@@ -9,6 +9,7 @@ import { basename, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { Command } from "commander";
 import { createInterface } from "node:readline/promises";
+import { mergeElectricPrincipalHeader } from "@electric-ax/agents/server-headers";
 
 //#region src/prompt-api-key.ts
 const FRIENDLY_INTRO = `\n${[
@@ -160,19 +161,20 @@ function parseElectricAgentsHeaders(raw) {
 }
 function getElectricCliEnv(env = process.env) {
 	const explicitIdentity = env.ELECTRIC_AGENTS_IDENTITY?.trim();
+	const headers = parseElectricAgentsHeaders(env.ELECTRIC_AGENTS_SERVER_HEADERS);
 	return {
 		electricAgentsUrl: env.ELECTRIC_AGENTS_URL || DEFAULT_ELECTRIC_AGENTS_URL,
 		electricAgentsIdentity: explicitIdentity || getDefaultElectricAgentsIdentity(),
-		electricAssertedAuthEmail: env.ELECTRIC_ASSERTED_AUTH_EMAIL?.trim() || explicitIdentity || void 0,
-		electricAssertedAuthName: env.ELECTRIC_ASSERTED_AUTH_NAME?.trim(),
-		electricAgentsHeaders: parseElectricAgentsHeaders(env.ELECTRIC_AGENTS_SERVER_HEADERS)
+		electricAgentsHeaders: mergeElectricPrincipalHeader(headers, env.ELECTRIC_AGENTS_PRINCIPAL)
 	};
 }
 function getErrorMessage(error) {
-	return error instanceof Error ? error.message : String(error);
+	if (error instanceof Error) return error.message || error.name || `Unknown error`;
+	const message = String(error);
+	return message || `Unknown error`;
 }
 function fail(message) {
-	throw new CliError(message);
+	throw new CliError(message || `Unknown error`);
 }
 function relativeTime(epochMs) {
 	const seconds = Math.floor((Date.now() - epochMs) / 1e3);
@@ -296,8 +298,6 @@ async function electricAgentsFetch(env, path$1, opts = {}) {
 			...opts,
 			headers: {
 				"content-type": `application/json`,
-				...assertedIdentityHeaders(env.electricAssertedAuthEmail),
-				...env.electricAssertedAuthName ? { "x-electric-asserted-name": env.electricAssertedAuthName } : {},
 				...env.electricAgentsHeaders,
 				...opts.headers
 			}
@@ -312,17 +312,36 @@ async function parseJsonResponse(res) {
 		return JSON.parse(text);
 	} catch (error) {
 		if (!(error instanceof SyntaxError)) throw error;
-		return { error: { message: text || res.statusText } };
+		return { error: { message: text || fallbackResponseMessage(res) } };
 	}
 }
+function fallbackResponseMessage(res) {
+	const status = res.status ? `HTTP ${res.status}` : `HTTP error`;
+	return res.statusText ? `${status}: ${res.statusText}` : status;
+}
+function stringMessage(value) {
+	if (typeof value !== `string`) return void 0;
+	const trimmed = value.trim();
+	if (trimmed.length === 0) return void 0;
+	return trimmed;
+}
+function errorMessageFromValue(value) {
+	const direct = stringMessage(value);
+	if (direct) return direct;
+	if (!value || typeof value !== `object` || Array.isArray(value)) return void 0;
+	const record = value;
+	return errorMessageFromValue(record.message) ?? errorMessageFromValue(record.error) ?? errorMessageFromValue(record.reason) ?? errorMessageFromValue(record.detail);
+}
+function responseErrorMessage(data, res) {
+	return errorMessageFromValue(data) ?? fallbackResponseMessage(res);
+}
 function failFromResponse(data, res) {
-	const err = data.error;
-	fail(String(err?.message ?? res.statusText));
+	fail(responseErrorMessage(data, res));
 }
 async function fetchEntityTypes(env) {
 	const res = await electricAgentsFetch(env, `/_electric/entity-types`);
-	const data = await res.json();
-	if (!res.ok) fail(typeof data === `object` && data !== null ? String(data.error?.message ?? res.statusText) : res.statusText);
+	const data = await parseJsonResponse(res);
+	if (!res.ok) failFromResponse(data, res);
 	if (!Array.isArray(data)) fail(`Unexpected response from server when listing entity types`);
 	return data;
 }
@@ -347,8 +366,8 @@ async function fetchEntities(env, options = {}) {
 	if (options.parent) searchParams.set(`parent`, options.parent);
 	const suffix = searchParams.size > 0 ? `?${searchParams.toString()}` : ``;
 	const res = await electricAgentsFetch(env, `/_electric/entities${suffix}`);
-	const data = await res.json();
-	if (!res.ok) fail(typeof data === `object` && data !== null ? String(data.error?.message ?? res.statusText) : res.statusText);
+	const data = await parseJsonResponse(res);
+	if (!res.ok) failFromResponse(data, res);
 	if (!Array.isArray(data)) fail(`Unexpected response from server when listing entities`);
 	return data;
 }
@@ -407,8 +426,6 @@ async function observeEntity(env, url, options) {
 		entityUrl: url,
 		baseUrl: env.electricAgentsUrl,
 		identity: env.electricAgentsIdentity,
-		assertedAuthEmail: env.electricAssertedAuthEmail,
-		assertedAuthName: env.electricAssertedAuthName,
 		headers: env.electricAgentsHeaders,
 		initialOffset: options.from
 	});
@@ -529,6 +546,8 @@ function getHelpText(commandName) {
 Environment:
   ELECTRIC_AGENTS_URL        Base URL of the server (default: ${DEFAULT_ELECTRIC_AGENTS_URL})
   ELECTRIC_AGENTS_IDENTITY   Sender identity for messages (default: ${getDefaultElectricAgentsIdentity()})
+  ELECTRIC_AGENTS_PRINCIPAL  Optional principal key sent as the Electric-Principal header
+  ELECTRIC_AGENTS_SERVER_HEADERS  Optional JSON object of additional server headers
   ANTHROPIC_API_KEY          Required for '${agentsCommand} start-builtin' and '${agentsCommand} quickstart'
 
 Examples:

package/dist/observe-ui.cjs

@@ -1,7 +1,7 @@
 "use strict";
 const require_chunk = require('./chunk-BCwAaXi7.cjs');
-const require_entity_api = require('./entity-api-ClpnLxWJ.cjs');
-const require_entity_stream_db = require('./entity-stream-db-BLbPedyR.cjs');
+const require_entity_api = require('./entity-api-Cvo55yZx.cjs');
+const require_entity_stream_db = require('./entity-stream-db-CIv6uC2d.cjs');
 const __durable_streams_state = require_chunk.__toESM(require("@durable-streams/state"));
 const __electric_ax_agents_runtime = require_chunk.__toESM(require("@electric-ax/agents-runtime"));
 const react = require_chunk.__toESM(require("react"));
@@ -119,7 +119,7 @@ function ToolResultView({ result }) {
 		}) : null]
 	});
 }
-function MessageInput({ db, baseUrl, entityUrl, identity, assertedAuthEmail, assertedAuthName, headers, disabled }) {
+function MessageInput({ db, baseUrl, entityUrl, identity, headers, disabled }) {
 	const [value, setValue] = (0, react.useState)(``);
 	const [error, setError] = (0, react.useState)(null);
 	const sendAction = (0, react.useMemo)(() => (0, __durable_streams_state.createOptimisticAction)({
@@ -136,8 +136,6 @@ function MessageInput({ db, baseUrl, entityUrl, identity, assertedAuthEmail, ass
 				method: `POST`,
 				headers: {
 					"content-type": `application/json`,
-					...require_entity_api.assertedIdentityHeaders(assertedAuthEmail),
-					...assertedAuthName ? { "x-electric-asserted-name": assertedAuthName } : {},
 					...headers
 				},
 				body: JSON.stringify({
@@ -164,8 +162,6 @@ function MessageInput({ db, baseUrl, entityUrl, identity, assertedAuthEmail, ass
 		baseUrl,
 		entityUrl,
 		identity,
-		assertedAuthEmail,
-		assertedAuthName,
 		headers
 	]);
 	(0, ink.useInput)((input, key) => {
@@ -265,7 +261,7 @@ function WakeView({ section }) {
 		})]
 	});
 }
-function ObserveView({ db, entityUrl, baseUrl, identity, assertedAuthEmail, assertedAuthName, headers }) {
+function ObserveView({ db, entityUrl, baseUrl, identity, headers }) {
 	const timelineQuery = (0, react.useMemo)(() => (0, __electric_ax_agents_runtime.createEntityIncludesQuery)(db), [db]);
 	const { data: timelineRows = [] } = (0, __tanstack_react_db.useLiveQuery)(timelineQuery, [timelineQuery]);
 	const timelineData = (0, __electric_ax_agents_runtime.normalizeEntityTimelineData)(timelineRows[0] ?? {
@@ -338,15 +334,13 @@ function ObserveView({ db, entityUrl, baseUrl, identity, assertedAuthEmail, asse
 				baseUrl,
 				entityUrl,
 				identity,
-				assertedAuthEmail,
-				assertedAuthName,
 				headers,
 				disabled: closed
 			})
 		]
 	});
 }
-function ObserveApp({ entityUrl, baseUrl, identity, assertedAuthEmail, assertedAuthName, headers, initialOffset }) {
+function ObserveApp({ entityUrl, baseUrl, identity, headers, initialOffset }) {
 	const [db, setDb] = (0, react.useState)(null);
 	const [error, setError] = (0, react.useState)(null);
 	const closeRef = (0, react.useRef)(null);
@@ -356,8 +350,6 @@ function ObserveApp({ entityUrl, baseUrl, identity, assertedAuthEmail, assertedA
 			baseUrl,
 			entityUrl,
 			initialOffset,
-			assertedAuthEmail,
-			assertedAuthName,
 			headers
 		}).then((result) => {
 			if (cancelled) {
@@ -377,8 +369,6 @@ function ObserveApp({ entityUrl, baseUrl, identity, assertedAuthEmail, assertedA
 		baseUrl,
 		entityUrl,
 		initialOffset,
-		assertedAuthEmail,
-		assertedAuthName,
 		headers
 	]);
 	if (error) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ink.Box, {
@@ -397,19 +387,15 @@ function ObserveApp({ entityUrl, baseUrl, identity, assertedAuthEmail, assertedA
 		entityUrl,
 		baseUrl,
 		identity,
-		assertedAuthEmail,
-		assertedAuthName,
 		headers
 	});
 }
 function renderObserve(opts) {
-	const { entityUrl, baseUrl, identity, assertedAuthEmail, assertedAuthName, headers, initialOffset } = opts;
+	const { entityUrl, baseUrl, identity, headers, initialOffset } = opts;
 	const app = (0, ink.render)(/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ObserveApp, {
 		entityUrl,
 		baseUrl,
 		identity,
-		assertedAuthEmail,
-		assertedAuthName,
 		headers,
 		initialOffset
 	}));

package/dist/observe-ui.d.cts

@@ -1,4 +1,4 @@
-import { EntityStreamDB } from "./entity-stream-db-CmDwc49J.cjs";
+import { EntityStreamDB } from "./entity-stream-db-BV4N31MR.cjs";
 import { EntityTimelineContentItem, MessageReceived } from "@electric-ax/agents-runtime";
 import React from "react";
 
@@ -40,8 +40,6 @@ declare function MessageInput({
   baseUrl,
   entityUrl,
   identity,
-  assertedAuthEmail,
-  assertedAuthName,
   headers,
   disabled
 }: {
@@ -49,8 +47,6 @@ declare function MessageInput({
   baseUrl: string;
   entityUrl: string;
   identity: string;
-  assertedAuthEmail?: string;
-  assertedAuthName?: string;
   headers?: Record<string, string>;
   disabled: boolean;
 }): React.ReactElement;
@@ -58,8 +54,6 @@ declare function renderObserve(opts: {
   entityUrl: string;
   baseUrl: string;
   identity: string;
-  assertedAuthEmail?: string;
-  assertedAuthName?: string;
   headers?: Record<string, string>;
   initialOffset?: string;
 }): void;

package/dist/observe-ui.d.ts

@@ -1,4 +1,4 @@
-import { EntityStreamDB } from "./entity-stream-db-DgzxI6C_.js";
+import { EntityStreamDB } from "./entity-stream-db-Bl6AT5hR.js";
 import { EntityTimelineContentItem, MessageReceived } from "@electric-ax/agents-runtime";
 import React from "react";
 
@@ -40,8 +40,6 @@ declare function MessageInput({
   baseUrl,
   entityUrl,
   identity,
-  assertedAuthEmail,
-  assertedAuthName,
   headers,
   disabled
 }: {
@@ -49,8 +47,6 @@ declare function MessageInput({
   baseUrl: string;
   entityUrl: string;
   identity: string;
-  assertedAuthEmail?: string;
-  assertedAuthName?: string;
   headers?: Record<string, string>;
   disabled: boolean;
 }): React.ReactElement;
@@ -58,8 +54,6 @@ declare function renderObserve(opts: {
   entityUrl: string;
   baseUrl: string;
   identity: string;
-  assertedAuthEmail?: string;
-  assertedAuthName?: string;
   headers?: Record<string, string>;
   initialOffset?: string;
 }): void;

package/dist/observe-ui.js

@@ -1,5 +1,5 @@
-import { assertedIdentityHeaders, entityApiUrl } from "./entity-api-Dh28Mz7H.js";
-import { createEntityStreamDB } from "./entity-stream-db-Czz3S8YF.js";
+import { entityApiUrl } from "./entity-api-DWMhkYbl.js";
+import { createEntityStreamDB } from "./entity-stream-db-CDOlZYc2.js";
 import { createOptimisticAction } from "@durable-streams/state";
 import { buildSections, createEntityIncludesQuery, normalizeEntityTimelineData } from "@electric-ax/agents-runtime";
 import React, { useEffect, useMemo, useRef, useState } from "react";
@@ -117,7 +117,7 @@ function ToolResultView({ result }) {
 		}) : null]
 	});
 }
-function MessageInput({ db, baseUrl, entityUrl, identity, assertedAuthEmail, assertedAuthName, headers, disabled }) {
+function MessageInput({ db, baseUrl, entityUrl, identity, headers, disabled }) {
 	const [value, setValue] = useState(``);
 	const [error, setError] = useState(null);
 	const sendAction = useMemo(() => createOptimisticAction({
@@ -134,8 +134,6 @@ function MessageInput({ db, baseUrl, entityUrl, identity, assertedAuthEmail, ass
 				method: `POST`,
 				headers: {
 					"content-type": `application/json`,
-					...assertedIdentityHeaders(assertedAuthEmail),
-					...assertedAuthName ? { "x-electric-asserted-name": assertedAuthName } : {},
 					...headers
 				},
 				body: JSON.stringify({
@@ -162,8 +160,6 @@ function MessageInput({ db, baseUrl, entityUrl, identity, assertedAuthEmail, ass
 		baseUrl,
 		entityUrl,
 		identity,
-		assertedAuthEmail,
-		assertedAuthName,
 		headers
 	]);
 	useInput((input, key) => {
@@ -263,7 +259,7 @@ function WakeView({ section }) {
 		})]
 	});
 }
-function ObserveView({ db, entityUrl, baseUrl, identity, assertedAuthEmail, assertedAuthName, headers }) {
+function ObserveView({ db, entityUrl, baseUrl, identity, headers }) {
 	const timelineQuery = useMemo(() => createEntityIncludesQuery(db), [db]);
 	const { data: timelineRows = [] } = useLiveQuery(timelineQuery, [timelineQuery]);
 	const timelineData = normalizeEntityTimelineData(timelineRows[0] ?? {
@@ -336,15 +332,13 @@ function ObserveView({ db, entityUrl, baseUrl, identity, assertedAuthEmail, asse
 				baseUrl,
 				entityUrl,
 				identity,
-				assertedAuthEmail,
-				assertedAuthName,
 				headers,
 				disabled: closed
 			})
 		]
 	});
 }
-function ObserveApp({ entityUrl, baseUrl, identity, assertedAuthEmail, assertedAuthName, headers, initialOffset }) {
+function ObserveApp({ entityUrl, baseUrl, identity, headers, initialOffset }) {
 	const [db, setDb] = useState(null);
 	const [error, setError] = useState(null);
 	const closeRef = useRef(null);
@@ -354,8 +348,6 @@ function ObserveApp({ entityUrl, baseUrl, identity, assertedAuthEmail, assertedA
 			baseUrl,
 			entityUrl,
 			initialOffset,
-			assertedAuthEmail,
-			assertedAuthName,
 			headers
 		}).then((result) => {
 			if (cancelled) {
@@ -375,8 +367,6 @@ function ObserveApp({ entityUrl, baseUrl, identity, assertedAuthEmail, assertedA
 		baseUrl,
 		entityUrl,
 		initialOffset,
-		assertedAuthEmail,
-		assertedAuthName,
 		headers
 	]);
 	if (error) return /* @__PURE__ */ jsx(Box, {
@@ -395,19 +385,15 @@ function ObserveApp({ entityUrl, baseUrl, identity, assertedAuthEmail, assertedA
 		entityUrl,
 		baseUrl,
 		identity,
-		assertedAuthEmail,
-		assertedAuthName,
 		headers
 	});
 }
 function renderObserve(opts) {
-	const { entityUrl, baseUrl, identity, assertedAuthEmail, assertedAuthName, headers, initialOffset } = opts;
+	const { entityUrl, baseUrl, identity, headers, initialOffset } = opts;
 	const app = render(/* @__PURE__ */ jsx(ObserveApp, {
 		entityUrl,
 		baseUrl,
 		identity,
-		assertedAuthEmail,
-		assertedAuthName,
 		headers,
 		initialOffset
 	}));

package/dist/start.cjs

@@ -3,6 +3,7 @@ const require_chunk = require('./chunk-BCwAaXi7.cjs');
 const require_env = require('./env-CFKgT8o2.cjs');
 const __electric_ax_agents_runtime = require_chunk.__toESM(require("@electric-ax/agents-runtime"));
 const node_url = require_chunk.__toESM(require("node:url"));
+const __electric_ax_agents_server_headers = require_chunk.__toESM(require("@electric-ax/agents/server-headers"));
 const node_child_process = require_chunk.__toESM(require("node:child_process"));
 const __electric_ax_agents = require_chunk.__toESM(require("@electric-ax/agents"));
 
@@ -23,7 +24,6 @@ const DEFAULT_ELECTRIC_AGENTS_PORT = 4437;
 const DEFAULT_COMPOSE_PROJECT_NAME = `electric-agents`;
 const DEFAULT_PULL_WAKE_RUNNER_ID = `builtin-agents`;
 const DEFAULT_PULL_WAKE_OWNER_ID = `builtin-agents`;
-const DEFAULT_PULL_WAKE_OWNER_NAME = `Built-in agents`;
 const DOCKER_COMPOSE_FILE = (0, node_url.fileURLToPath)(new URL(`../docker-compose.full.yml`, require("url").pathToFileURL(__filename).href));
 function resolveElectricAgentsPort(env = process.env, fileEnv = require_env.readDotEnvFile()) {
 	const raw = env.ELECTRIC_AGENTS_PORT?.trim() || fileEnv.ELECTRIC_AGENTS_PORT?.trim();
@@ -67,22 +67,10 @@ function runnerIdFromIdentity(identity) {
 	return slug ? `builtin-${slug}` : DEFAULT_PULL_WAKE_RUNNER_ID;
 }
 function resolvePullWakeRunnerId(env = process.env, fileEnv = require_env.readDotEnvFile()) {
-	return readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_PULL_WAKE_RUNNER_ID`, `PULL_WAKE_RUNNER_ID`]) ?? runnerIdFromIdentity(readConfigValue(env, fileEnv, [`ELECTRIC_ASSERTED_AUTH_EMAIL`, `ELECTRIC_AGENTS_IDENTITY`]));
+	return readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_PULL_WAKE_RUNNER_ID`, `PULL_WAKE_RUNNER_ID`]) ?? runnerIdFromIdentity(readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_IDENTITY`]));
 }
 function resolvePullWakeOwnerId(env = process.env, fileEnv = require_env.readDotEnvFile()) {
-	return readConfigValue(env, fileEnv, [`ELECTRIC_ASSERTED_AUTH_EMAIL`, `ELECTRIC_AGENTS_IDENTITY`]) ?? DEFAULT_PULL_WAKE_OWNER_ID;
-}
-function buildAssertedAuthHeaders(env, fileEnv) {
-	const email = resolvePullWakeOwnerId(env, fileEnv);
-	const name = readConfigValue(env, fileEnv, [`ELECTRIC_ASSERTED_AUTH_NAME`]) ?? DEFAULT_PULL_WAKE_OWNER_NAME;
-	const headers = {};
-	headers[`X-Electric-Asserted-Email`] = email;
-	headers[`X-Electric-Asserted-Name`] = name;
-	return {
-		headers,
-		ownerUserId: email,
-		name
-	};
+	return readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_PRINCIPAL`]) ?? readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_IDENTITY`]) ?? DEFAULT_PULL_WAKE_OWNER_ID;
 }
 function parseAdditionalServerHeaders(env, fileEnv) {
 	const raw = readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_SERVER_HEADERS`]);
@@ -102,6 +90,9 @@ function parseAdditionalServerHeaders(env, fileEnv) {
 	const normalized = Object.fromEntries(headers.entries());
 	return Object.keys(normalized).length > 0 ? normalized : void 0;
 }
+function resolveServerHeaders(env, fileEnv) {
+	return (0, __electric_ax_agents_server_headers.mergeElectricPrincipalHeader)(parseAdditionalServerHeaders(env, fileEnv), readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_PRINCIPAL`]));
+}
 function mergeHeaders(...sources) {
 	const headers = new Headers();
 	for (const source of sources) {
@@ -169,7 +160,6 @@ async function startElectricAgentsDevEnvironment(_options = {}, env = process.en
 	const fileEnv = require_env.readDotEnvFile(cwd);
 	const port = resolveElectricAgentsPort(env, fileEnv);
 	const composeProjectName = resolveComposeProjectName(cwd, env);
-	const assertedAuth = buildAssertedAuthHeaders(env, fileEnv);
 	await runDockerCompose([
 		`compose`,
 		`-f`,
@@ -181,10 +171,7 @@ async function startElectricAgentsDevEnvironment(_options = {}, env = process.en
 		COMPOSE_PROJECT_NAME: composeProjectName,
 		ELECTRIC_AGENTS_PORT: String(port),
 		ELECTRIC_IMAGE_TAG: env.ELECTRIC_IMAGE_TAG ?? ELECTRIC_IMAGE_TAG,
-		ELECTRIC_AGENTS_SERVER_IMAGE_TAG: env.ELECTRIC_AGENTS_SERVER_IMAGE_TAG ?? ELECTRIC_AGENTS_SERVER_IMAGE_TAG,
-		ELECTRIC_AGENTS_DEV_ASSERTED_AUTH: env.ELECTRIC_AGENTS_DEV_ASSERTED_AUTH ?? fileEnv.ELECTRIC_AGENTS_DEV_ASSERTED_AUTH ?? `1`,
-		ELECTRIC_ASSERTED_AUTH_EMAIL: env.ELECTRIC_ASSERTED_AUTH_EMAIL ?? fileEnv.ELECTRIC_ASSERTED_AUTH_EMAIL ?? assertedAuth.ownerUserId,
-		ELECTRIC_ASSERTED_AUTH_NAME: env.ELECTRIC_ASSERTED_AUTH_NAME ?? fileEnv.ELECTRIC_ASSERTED_AUTH_NAME ?? assertedAuth.name
+		ELECTRIC_AGENTS_SERVER_IMAGE_TAG: env.ELECTRIC_AGENTS_SERVER_IMAGE_TAG ?? ELECTRIC_AGENTS_SERVER_IMAGE_TAG
 	});
 	const uiUrl = `http://localhost:${port}`;
 	await waitForElectricAgentsServer(uiUrl);
@@ -243,8 +230,8 @@ async function startBuiltinAgentsServer(options, params = {}) {
 	const fileEnv = require_env.readDotEnvFile(cwd);
 	const anthropicApiKey = require_env.resolveAnthropicApiKey(options, env, fileEnv);
 	const runnerId = resolvePullWakeRunnerId(env, fileEnv);
-	const assertedAuth = buildAssertedAuthHeaders(env, fileEnv);
-	const serverHeaders = mergeHeaders(assertedAuth.headers, parseAdditionalServerHeaders(env, fileEnv));
+	const ownerUserId = resolvePullWakeOwnerId(env, fileEnv);
+	const serverHeaders = mergeHeaders(resolveServerHeaders(env, fileEnv));
 	const agentServerUrl = params.agentServerUrl ?? env.ELECTRIC_AGENTS_URL?.trim() ?? `http://localhost:${resolveElectricAgentsPort(env, fileEnv)}`;
 	process.env.ANTHROPIC_API_KEY = anthropicApiKey;
 	await waitForElectricAgentsServer(agentServerUrl, { headers: serverHeaders });
@@ -254,7 +241,7 @@ async function startBuiltinAgentsServer(options, params = {}) {
 		loadProjectMcpConfig: true,
 		pullWake: {
 			runnerId,
-			ownerUserId: assertedAuth.ownerUserId,
+			ownerUserId,
 			registerRunner: true,
 			headers: serverHeaders,
 			claimHeaders: serverHeaders,

package/dist/start.d.cts

@@ -1,2 +1,2 @@
-import { StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StoppedDevEnvironment, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerId, resolvePullWakeRunnerId, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer } from "./index-BQ4JyfkG.cjs";
+import { StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StoppedDevEnvironment, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerId, resolvePullWakeRunnerId, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer } from "./index-cwCTPq6Y.cjs";
 export { StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StoppedDevEnvironment, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerId, resolvePullWakeRunnerId, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer };

package/dist/start.d.ts

@@ -1,2 +1,2 @@
-import { StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StoppedDevEnvironment, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerId, resolvePullWakeRunnerId, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer } from "./index-D6TZ88Yg.js";
+import { StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StoppedDevEnvironment, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerId, resolvePullWakeRunnerId, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer } from "./index-BSHO_Rei.js";
 export { StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StoppedDevEnvironment, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerId, resolvePullWakeRunnerId, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer };

package/dist/start.js

@@ -1,6 +1,7 @@
 import { readDotEnvFile$1 as readDotEnvFile, resolveAnthropicApiKey$1 as resolveAnthropicApiKey } from "./env-DIhTv987.js";
 import { appendPathToUrl } from "@electric-ax/agents-runtime";
 import { fileURLToPath } from "node:url";
+import { mergeElectricPrincipalHeader } from "@electric-ax/agents/server-headers";
 import { spawn } from "node:child_process";
 import { BuiltinAgentsServer } from "@electric-ax/agents";
 
@@ -21,7 +22,6 @@ const DEFAULT_ELECTRIC_AGENTS_PORT = 4437;
 const DEFAULT_COMPOSE_PROJECT_NAME = `electric-agents`;
 const DEFAULT_PULL_WAKE_RUNNER_ID = `builtin-agents`;
 const DEFAULT_PULL_WAKE_OWNER_ID = `builtin-agents`;
-const DEFAULT_PULL_WAKE_OWNER_NAME = `Built-in agents`;
 const DOCKER_COMPOSE_FILE = fileURLToPath(new URL(`../docker-compose.full.yml`, import.meta.url));
 function resolveElectricAgentsPort(env = process.env, fileEnv = readDotEnvFile()) {
 	const raw = env.ELECTRIC_AGENTS_PORT?.trim() || fileEnv.ELECTRIC_AGENTS_PORT?.trim();
@@ -65,22 +65,10 @@ function runnerIdFromIdentity(identity) {
 	return slug ? `builtin-${slug}` : DEFAULT_PULL_WAKE_RUNNER_ID;
 }
 function resolvePullWakeRunnerId(env = process.env, fileEnv = readDotEnvFile()) {
-	return readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_PULL_WAKE_RUNNER_ID`, `PULL_WAKE_RUNNER_ID`]) ?? runnerIdFromIdentity(readConfigValue(env, fileEnv, [`ELECTRIC_ASSERTED_AUTH_EMAIL`, `ELECTRIC_AGENTS_IDENTITY`]));
+	return readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_PULL_WAKE_RUNNER_ID`, `PULL_WAKE_RUNNER_ID`]) ?? runnerIdFromIdentity(readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_IDENTITY`]));
 }
 function resolvePullWakeOwnerId(env = process.env, fileEnv = readDotEnvFile()) {
-	return readConfigValue(env, fileEnv, [`ELECTRIC_ASSERTED_AUTH_EMAIL`, `ELECTRIC_AGENTS_IDENTITY`]) ?? DEFAULT_PULL_WAKE_OWNER_ID;
-}
-function buildAssertedAuthHeaders(env, fileEnv) {
-	const email = resolvePullWakeOwnerId(env, fileEnv);
-	const name = readConfigValue(env, fileEnv, [`ELECTRIC_ASSERTED_AUTH_NAME`]) ?? DEFAULT_PULL_WAKE_OWNER_NAME;
-	const headers = {};
-	headers[`X-Electric-Asserted-Email`] = email;
-	headers[`X-Electric-Asserted-Name`] = name;
-	return {
-		headers,
-		ownerUserId: email,
-		name
-	};
+	return readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_PRINCIPAL`]) ?? readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_IDENTITY`]) ?? DEFAULT_PULL_WAKE_OWNER_ID;
 }
 function parseAdditionalServerHeaders(env, fileEnv) {
 	const raw = readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_SERVER_HEADERS`]);
@@ -100,6 +88,9 @@ function parseAdditionalServerHeaders(env, fileEnv) {
 	const normalized = Object.fromEntries(headers.entries());
 	return Object.keys(normalized).length > 0 ? normalized : void 0;
 }
+function resolveServerHeaders(env, fileEnv) {
+	return mergeElectricPrincipalHeader(parseAdditionalServerHeaders(env, fileEnv), readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_PRINCIPAL`]));
+}
 function mergeHeaders(...sources) {
 	const headers = new Headers();
 	for (const source of sources) {
@@ -167,7 +158,6 @@ async function startElectricAgentsDevEnvironment(_options = {}, env = process.en
 	const fileEnv = readDotEnvFile(cwd);
 	const port = resolveElectricAgentsPort(env, fileEnv);
 	const composeProjectName = resolveComposeProjectName(cwd, env);
-	const assertedAuth = buildAssertedAuthHeaders(env, fileEnv);
 	await runDockerCompose([
 		`compose`,
 		`-f`,
@@ -179,10 +169,7 @@ async function startElectricAgentsDevEnvironment(_options = {}, env = process.en
 		COMPOSE_PROJECT_NAME: composeProjectName,
 		ELECTRIC_AGENTS_PORT: String(port),
 		ELECTRIC_IMAGE_TAG: env.ELECTRIC_IMAGE_TAG ?? ELECTRIC_IMAGE_TAG,
-		ELECTRIC_AGENTS_SERVER_IMAGE_TAG: env.ELECTRIC_AGENTS_SERVER_IMAGE_TAG ?? ELECTRIC_AGENTS_SERVER_IMAGE_TAG,
-		ELECTRIC_AGENTS_DEV_ASSERTED_AUTH: env.ELECTRIC_AGENTS_DEV_ASSERTED_AUTH ?? fileEnv.ELECTRIC_AGENTS_DEV_ASSERTED_AUTH ?? `1`,
-		ELECTRIC_ASSERTED_AUTH_EMAIL: env.ELECTRIC_ASSERTED_AUTH_EMAIL ?? fileEnv.ELECTRIC_ASSERTED_AUTH_EMAIL ?? assertedAuth.ownerUserId,
-		ELECTRIC_ASSERTED_AUTH_NAME: env.ELECTRIC_ASSERTED_AUTH_NAME ?? fileEnv.ELECTRIC_ASSERTED_AUTH_NAME ?? assertedAuth.name
+		ELECTRIC_AGENTS_SERVER_IMAGE_TAG: env.ELECTRIC_AGENTS_SERVER_IMAGE_TAG ?? ELECTRIC_AGENTS_SERVER_IMAGE_TAG
 	});
 	const uiUrl = `http://localhost:${port}`;
 	await waitForElectricAgentsServer(uiUrl);
@@ -241,8 +228,8 @@ async function startBuiltinAgentsServer(options, params = {}) {
 	const fileEnv = readDotEnvFile(cwd);
 	const anthropicApiKey = resolveAnthropicApiKey(options, env, fileEnv);
 	const runnerId = resolvePullWakeRunnerId(env, fileEnv);
-	const assertedAuth = buildAssertedAuthHeaders(env, fileEnv);
-	const serverHeaders = mergeHeaders(assertedAuth.headers, parseAdditionalServerHeaders(env, fileEnv));
+	const ownerUserId = resolvePullWakeOwnerId(env, fileEnv);
+	const serverHeaders = mergeHeaders(resolveServerHeaders(env, fileEnv));
 	const agentServerUrl = params.agentServerUrl ?? env.ELECTRIC_AGENTS_URL?.trim() ?? `http://localhost:${resolveElectricAgentsPort(env, fileEnv)}`;
 	process.env.ANTHROPIC_API_KEY = anthropicApiKey;
 	await waitForElectricAgentsServer(agentServerUrl, { headers: serverHeaders });
@@ -252,7 +239,7 @@ async function startBuiltinAgentsServer(options, params = {}) {
 		loadProjectMcpConfig: true,
 		pullWake: {
 			runnerId,
-			ownerUserId: assertedAuth.ownerUserId,
+			ownerUserId,
 			registerRunner: true,
 			headers: serverHeaders,
 			claimHeaders: serverHeaders,

package/docker-compose.full.yml

@@ -59,9 +59,6 @@ services:
       ELECTRIC_AGENTS_STREAMS_PORT: ${ELECTRIC_AGENTS_STREAMS_PORT:-0}
       ELECTRIC_AGENTS_ELECTRIC_URL: ${ELECTRIC_AGENTS_ELECTRIC_URL:-http://electric:3000}
       ELECTRIC_AGENTS_REWRITE_LOOPBACK_WEBHOOKS_TO: ${ELECTRIC_AGENTS_REWRITE_LOOPBACK_WEBHOOKS_TO:-host.docker.internal}
-      ELECTRIC_AGENTS_DEV_ASSERTED_AUTH: ${ELECTRIC_AGENTS_DEV_ASSERTED_AUTH:-1}
-      ELECTRIC_ASSERTED_AUTH_EMAIL: ${ELECTRIC_ASSERTED_AUTH_EMAIL:-builtin-agents}
-      ELECTRIC_ASSERTED_AUTH_NAME: ${ELECTRIC_ASSERTED_AUTH_NAME:-Built-in agents}
     ports:
       - '${ELECTRIC_AGENTS_PORT:-4437}:4437'
     volumes:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electric-ax",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "CLI for Electric Agents",
   "author": "ElectricSQL team and contributors",
   "license": "Apache-2.0",
@@ -39,15 +39,15 @@
   "dependencies": {
     "@durable-streams/client": "https://pkg.pr.new/durable-streams/durable-streams/@durable-streams/client@350",
     "@durable-streams/state": "https://pkg.pr.new/durable-streams/durable-streams/@durable-streams/state@350",
-    "@electric-sql/client": "^1.5.17",
+    "@electric-sql/client": "^1.5.18",
     "@tanstack/db": "^0.6.4",
     "@tanstack/react-db": "^0.1.82",
     "commander": "^13.1.0",
     "ink": "^6.8.0",
     "omelette": "^0.4.17",
     "react": "^19.2.0",
-    "@electric-ax/agents": "0.4.0",
-    "@electric-ax/agents-runtime": "0.2.0"
+    "@electric-ax/agents": "0.4.2",
+    "@electric-ax/agents-runtime": "0.2.1"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^4.1.0",