electric-ax 0.1.18 → 0.2.1

package/dist/completions.d.cts

@@ -1,4 +1,4 @@
-import { ElectricCliEnv } from "./index-B2MsxFCW.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-BDO8dHhT.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-Cvo55yZx.cjs

@@ -0,0 +1,28 @@
+"use strict";
+const require_chunk = require('./chunk-BCwAaXi7.cjs');
+const __electric_ax_agents_runtime = require_chunk.__toESM(require("@electric-ax/agents-runtime"));
+
+//#region src/entity-api.ts
+function withLeadingSlash(path) {
+	return path.startsWith(`/`) ? path : `/${path}`;
+}
+function entityApiPath(entityUrl, suffix = ``) {
+	return `/_electric/entities${withLeadingSlash(entityUrl)}${suffix}`;
+}
+function entityApiUrl(baseUrl, entityUrl, suffix = ``) {
+	return (0, __electric_ax_agents_runtime.appendPathToUrl)(baseUrl, entityApiPath(entityUrl, suffix));
+}
+
+//#endregion
+Object.defineProperty(exports, 'entityApiPath', {
+  enumerable: true,
+  get: function () {
+    return entityApiPath;
+  }
+});
+Object.defineProperty(exports, 'entityApiUrl', {
+  enumerable: true,
+  get: function () {
+    return entityApiUrl;
+  }
+});

package/dist/entity-api-DWMhkYbl.js

@@ -0,0 +1,15 @@
+import { appendPathToUrl } from "@electric-ax/agents-runtime";
+
+//#region src/entity-api.ts
+function withLeadingSlash(path) {
+	return path.startsWith(`/`) ? path : `/${path}`;
+}
+function entityApiPath(entityUrl, suffix = ``) {
+	return `/_electric/entities${withLeadingSlash(entityUrl)}${suffix}`;
+}
+function entityApiUrl(baseUrl, entityUrl, suffix = ``) {
+	return appendPathToUrl(baseUrl, entityApiPath(entityUrl, suffix));
+}
+
+//#endregion
+export { entityApiPath, entityApiUrl };

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

@@ -6,8 +6,9 @@ declare function createEntityStreamDB(opts: {
   baseUrl: string;
   entityUrl: string;
   initialOffset?: string;
+  headers?: Record<string, string>;
 }): Promise<{
   db: EntityStreamDB;
   close: () => void;
 }>; //#endregion
-export { EntityStreamDB$1 as EntityStreamDB, createEntityStreamDB as createEntityStreamDB$1 };
+export { EntityStreamDB$1 as EntityStreamDB, createEntityStreamDB };

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

@@ -6,8 +6,9 @@ declare function createEntityStreamDB(opts: {
   baseUrl: string;
   entityUrl: string;
   initialOffset?: string;
+  headers?: Record<string, string>;
 }): Promise<{
   db: EntityStreamDB;
   close: () => void;
 }>; //#endregion
-export { EntityStreamDB$1 as EntityStreamDB, createEntityStreamDB };
+export { EntityStreamDB$1 as EntityStreamDB, createEntityStreamDB as createEntityStreamDB$1 };

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

@@ -1,26 +1,32 @@
+import { entityApiUrl } from "./entity-api-DWMhkYbl.js";
 import { createStreamDB } from "@durable-streams/state";
-import { entityStateSchema } from "@electric-ax/agents-runtime";
+import { appendPathToUrl, entityStateSchema } from "@electric-ax/agents-runtime";
 
 //#region src/entity-stream-db.ts
 function getMainStreamPath(entityUrl, entity) {
 	return entity.streams?.main ?? `${entityUrl}/main`;
 }
 async function createEntityStreamDB(opts) {
-	const { baseUrl, entityUrl, initialOffset } = opts;
+	const { baseUrl, entityUrl, initialOffset, headers: serverHeaders } = opts;
 	console.log(`[createEntityStreamDB] Creating entity stream DB for ${baseUrl}${entityUrl}`);
+	const requestHeaders = {
+		"content-type": `application/json`,
+		...serverHeaders
+	};
 	let res;
 	try {
-		res = await fetch(`${baseUrl}${entityUrl}`, { headers: { "content-type": `application/json` } });
+		res = await fetch(entityApiUrl(baseUrl, entityUrl), { headers: requestHeaders });
 	} catch (err) {
 		throw new Error(`Could not connect to the Electric Agents server at ${baseUrl} — is it running?\n  ${err instanceof Error ? err.message : String(err)}`);
 	}
 	if (!res.ok) throw new Error(`Failed to fetch entity at ${entityUrl}: ${res.statusText}`);
 	const entity = await res.json();
 	const streamPath = getMainStreamPath(entityUrl, entity);
-	const streamUrl = `${baseUrl}${streamPath}`;
+	const streamUrl = appendPathToUrl(baseUrl, streamPath);
 	const db = createStreamDB({
 		streamOptions: {
 			url: streamUrl,
+			headers: requestHeaders,
 			contentType: `application/json`,
 			...initialOffset ? { offset: initialOffset } : {}
 		},

package/dist/{entity-stream-db-Djo-7a11.cjs → entity-stream-db-CIv6uC2d.cjs}

@@ -1,5 +1,6 @@
 "use strict";
 const require_chunk = require('./chunk-BCwAaXi7.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"));
 
@@ -8,21 +9,26 @@ function getMainStreamPath(entityUrl, entity) {
 	return entity.streams?.main ?? `${entityUrl}/main`;
 }
 async function createEntityStreamDB(opts) {
-	const { baseUrl, entityUrl, initialOffset } = opts;
+	const { baseUrl, entityUrl, initialOffset, headers: serverHeaders } = opts;
 	console.log(`[createEntityStreamDB] Creating entity stream DB for ${baseUrl}${entityUrl}`);
+	const requestHeaders = {
+		"content-type": `application/json`,
+		...serverHeaders
+	};
 	let res;
 	try {
-		res = await fetch(`${baseUrl}${entityUrl}`, { headers: { "content-type": `application/json` } });
+		res = await fetch(require_entity_api.entityApiUrl(baseUrl, entityUrl), { headers: requestHeaders });
 	} catch (err) {
 		throw new Error(`Could not connect to the Electric Agents server at ${baseUrl} — is it running?\n  ${err instanceof Error ? err.message : String(err)}`);
 	}
 	if (!res.ok) throw new Error(`Failed to fetch entity at ${entityUrl}: ${res.statusText}`);
 	const entity = await res.json();
 	const streamPath = getMainStreamPath(entityUrl, entity);
-	const streamUrl = `${baseUrl}${streamPath}`;
+	const streamUrl = (0, __electric_ax_agents_runtime.appendPathToUrl)(baseUrl, streamPath);
 	const db = (0, __durable_streams_state.createStreamDB)({
 		streamOptions: {
 			url: streamUrl,
+			headers: requestHeaders,
 			contentType: `application/json`,
 			...initialOffset ? { offset: initialOffset } : {}
 		},

package/dist/entity-stream-db.cjs

@@ -1,3 +1,4 @@
-const require_entity_stream_db = require('./entity-stream-db-Djo-7a11.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-C2C3t_hD.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-BRwzIuHl.js";
+import { EntityStreamDB, createEntityStreamDB$1 as createEntityStreamDB } from "./entity-stream-db-Bl6AT5hR.js";
 export { EntityStreamDB, createEntityStreamDB };

package/dist/entity-stream-db.js

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

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

@@ -19,22 +19,22 @@ interface StoppedDevEnvironment {
   removedVolumes: boolean;
 }
 interface StartedBuiltinAgentsEnvironment {
-  port: number;
+  runnerId: string;
   url: string;
-  registeredBaseUrl: string;
   agentServerUrl: string;
 }
 interface WaitForServerOptions {
   fetchImpl?: typeof globalThis.fetch;
+  headers?: Record<string, string>;
   timeoutMs?: number;
   intervalMs?: number;
 }
-declare function resolveBuiltinAgentsPort(env?: NodeJS.ProcessEnv, fileEnv?: Record<string, string>): number;
-declare function resolveBuiltinAgentsHost(env?: NodeJS.ProcessEnv, fileEnv?: Record<string, string>): string;
 declare function resolveElectricAgentsPort(env?: NodeJS.ProcessEnv, fileEnv?: Record<string, string>): number;
 declare function getStartedEnvironmentMessage(started: StartedDevEnvironment): string;
 declare function getStoppedEnvironmentMessage(stopped: StoppedDevEnvironment): string;
 declare function getStartedBuiltinAgentsMessage(started: StartedBuiltinAgentsEnvironment): string;
+declare function resolvePullWakeRunnerId(env?: NodeJS.ProcessEnv, fileEnv?: Record<string, string>): string;
+declare function resolvePullWakeOwnerId(env?: NodeJS.ProcessEnv, fileEnv?: Record<string, string>): string;
 declare function resolveComposeProjectName(_cwd?: string, env?: NodeJS.ProcessEnv): string;
 declare function waitForElectricAgentsServer(baseUrl: string, options?: WaitForServerOptions): Promise<void>;
 declare function startElectricAgentsDevEnvironment(_options?: StartCommandOptions, env?: NodeJS.ProcessEnv, cwd?: string): Promise<StartedDevEnvironment>;
@@ -52,6 +52,7 @@ declare const DEFAULT_ELECTRIC_AGENTS_URL = "http://localhost:4437";
 interface ElectricCliEnv {
   electricAgentsUrl: string;
   electricAgentsIdentity: string;
+  electricAgentsHeaders?: Record<string, string>;
 }
 interface SpawnCommandOptions {
   args?: string;
@@ -124,4 +125,4 @@ declare function createElectricProgram({
 declare function run(argv?: Array<string>): Promise<void>;
 
 //#endregion
-export { DEFAULT_ELECTRIC_AGENTS_URL, ElectricCliEnv, ElectricCliHandlers, ObserveCommandOptions, PsCommandOptions, SendCommandOptions, SpawnCommandOptions, StartBuiltinCommandOptions, StartCommandOptions, StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StopCommandOptions, StoppedDevEnvironment, createElectricCliHandlers, createElectricProgram, formatQuickstartBackendStartedMessage, getElectricCliEnv, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveBuiltinAgentsHost, resolveBuiltinAgentsPort, resolveCommandPrefix, resolveComposeProjectName, resolveElectricAgentsPort, run, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer };
+export { DEFAULT_ELECTRIC_AGENTS_URL, ElectricCliEnv, ElectricCliHandlers, ObserveCommandOptions, PsCommandOptions, SendCommandOptions, SpawnCommandOptions, StartBuiltinCommandOptions, StartCommandOptions, StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StopCommandOptions, StoppedDevEnvironment, createElectricCliHandlers, createElectricProgram, formatQuickstartBackendStartedMessage, getElectricCliEnv, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveCommandPrefix, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerId, resolvePullWakeRunnerId, run, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer };

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

@@ -19,22 +19,22 @@ interface StoppedDevEnvironment {
   removedVolumes: boolean;
 }
 interface StartedBuiltinAgentsEnvironment {
-  port: number;
+  runnerId: string;
   url: string;
-  registeredBaseUrl: string;
   agentServerUrl: string;
 }
 interface WaitForServerOptions {
   fetchImpl?: typeof globalThis.fetch;
+  headers?: Record<string, string>;
   timeoutMs?: number;
   intervalMs?: number;
 }
-declare function resolveBuiltinAgentsPort(env?: NodeJS.ProcessEnv, fileEnv?: Record<string, string>): number;
-declare function resolveBuiltinAgentsHost(env?: NodeJS.ProcessEnv, fileEnv?: Record<string, string>): string;
 declare function resolveElectricAgentsPort(env?: NodeJS.ProcessEnv, fileEnv?: Record<string, string>): number;
 declare function getStartedEnvironmentMessage(started: StartedDevEnvironment): string;
 declare function getStoppedEnvironmentMessage(stopped: StoppedDevEnvironment): string;
 declare function getStartedBuiltinAgentsMessage(started: StartedBuiltinAgentsEnvironment): string;
+declare function resolvePullWakeRunnerId(env?: NodeJS.ProcessEnv, fileEnv?: Record<string, string>): string;
+declare function resolvePullWakeOwnerId(env?: NodeJS.ProcessEnv, fileEnv?: Record<string, string>): string;
 declare function resolveComposeProjectName(_cwd?: string, env?: NodeJS.ProcessEnv): string;
 declare function waitForElectricAgentsServer(baseUrl: string, options?: WaitForServerOptions): Promise<void>;
 declare function startElectricAgentsDevEnvironment(_options?: StartCommandOptions, env?: NodeJS.ProcessEnv, cwd?: string): Promise<StartedDevEnvironment>;
@@ -52,6 +52,7 @@ declare const DEFAULT_ELECTRIC_AGENTS_URL = "http://localhost:4437";
 interface ElectricCliEnv {
   electricAgentsUrl: string;
   electricAgentsIdentity: string;
+  electricAgentsHeaders?: Record<string, string>;
 }
 interface SpawnCommandOptions {
   args?: string;
@@ -124,4 +125,4 @@ declare function createElectricProgram({
 declare function run(argv?: Array<string>): Promise<void>;
 
 //#endregion
-export { DEFAULT_ELECTRIC_AGENTS_URL, ElectricCliEnv, ElectricCliHandlers, ObserveCommandOptions, PsCommandOptions, SendCommandOptions, SpawnCommandOptions, StartBuiltinCommandOptions, StartCommandOptions, StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StopCommandOptions, StoppedDevEnvironment, createElectricCliHandlers, createElectricProgram, formatQuickstartBackendStartedMessage, getElectricCliEnv, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveBuiltinAgentsHost, resolveBuiltinAgentsPort, resolveCommandPrefix, resolveComposeProjectName, resolveElectricAgentsPort, run, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer };
+export { DEFAULT_ELECTRIC_AGENTS_URL, ElectricCliEnv, ElectricCliHandlers, ObserveCommandOptions, PsCommandOptions, SendCommandOptions, SpawnCommandOptions, StartBuiltinCommandOptions, StartCommandOptions, StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StopCommandOptions, StoppedDevEnvironment, createElectricCliHandlers, createElectricProgram, formatQuickstartBackendStartedMessage, getElectricCliEnv, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveCommandPrefix, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerId, resolvePullWakeRunnerId, run, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer };

package/dist/index.cjs

@@ -2,7 +2,9 @@
 "use strict";
 const require_chunk = require('./chunk-BCwAaXi7.cjs');
 const require_completions = require('./completions-Bj4D5DRa.cjs');
-const require_env = require('./env-BXUgom_C.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"));
 const node_os = require_chunk.__toESM(require("node:os"));
 const node_path = require_chunk.__toESM(require("node:path"));
@@ -140,10 +142,30 @@ var CliError = class extends Error {};
 function getDefaultElectricAgentsIdentity() {
 	return `${(0, node_os.userInfo)().username}@${(0, node_os.hostname)()}`;
 }
+function parseElectricAgentsHeaders(raw) {
+	const trimmed = raw?.trim();
+	if (!trimmed) return void 0;
+	let parsed;
+	try {
+		parsed = JSON.parse(trimmed);
+	} catch {
+		fail(`Invalid ELECTRIC_AGENTS_SERVER_HEADERS: expected JSON`);
+	}
+	if (!parsed || typeof parsed !== `object` || Array.isArray(parsed)) fail(`Invalid ELECTRIC_AGENTS_SERVER_HEADERS: expected a JSON object`);
+	const headers = new Headers();
+	for (const [name, value] of Object.entries(parsed)) {
+		if (typeof value !== `string`) fail(`Invalid ELECTRIC_AGENTS_SERVER_HEADERS: header "${name}" must be a string`);
+		headers.set(name, value);
+	}
+	const normalized = Object.fromEntries(headers.entries());
+	return Object.keys(normalized).length > 0 ? normalized : void 0;
+}
 function getElectricCliEnv(env = process.env) {
+	const explicitIdentity = env.ELECTRIC_AGENTS_IDENTITY?.trim();
 	return {
 		electricAgentsUrl: env.ELECTRIC_AGENTS_URL || DEFAULT_ELECTRIC_AGENTS_URL,
-		electricAgentsIdentity: env.ELECTRIC_AGENTS_IDENTITY || getDefaultElectricAgentsIdentity()
+		electricAgentsIdentity: explicitIdentity || getDefaultElectricAgentsIdentity(),
+		electricAgentsHeaders: parseElectricAgentsHeaders(env.ELECTRIC_AGENTS_SERVER_HEADERS)
 	};
 }
 function getErrorMessage(error) {
@@ -270,10 +292,11 @@ function resolveCommandPrefix(argv, env = process.env) {
 }
 async function electricAgentsFetch(env, path, opts = {}) {
 	try {
-		return await fetch(`${env.electricAgentsUrl}${path}`, {
+		return await fetch((0, __electric_ax_agents_runtime.appendPathToUrl)(env.electricAgentsUrl, path), {
 			...opts,
 			headers: {
 				"content-type": `application/json`,
+				...env.electricAgentsHeaders,
 				...opts.headers
 			}
 		});
@@ -348,7 +371,7 @@ async function spawnEntity(env, urlPath, options) {
 	} catch (error) {
 		fail(`--args must be valid JSON: ${getErrorMessage(error)}`);
 	}
-	const res = await electricAgentsFetch(env, urlPath, {
+	const res = await electricAgentsFetch(env, require_entity_api.entityApiPath(urlPath), {
 		method: `PUT`,
 		body: JSON.stringify({ args: spawnArgs })
 	});
@@ -365,7 +388,7 @@ async function sendMessage(env, url, message, options) {
 		payload
 	};
 	if (options.type) body.type = options.type;
-	const res = await electricAgentsFetch(env, `${url}/send`, {
+	const res = await electricAgentsFetch(env, require_entity_api.entityApiPath(url, `/send`), {
 		method: `POST`,
 		body: JSON.stringify(body)
 	});
@@ -382,11 +405,12 @@ async function observeEntity(env, url, options) {
 		entityUrl: url,
 		baseUrl: env.electricAgentsUrl,
 		identity: env.electricAgentsIdentity,
+		headers: env.electricAgentsHeaders,
 		initialOffset: options.from
 	});
 }
 async function inspectEntity(env, url) {
-	const res = await electricAgentsFetch(env, url);
+	const res = await electricAgentsFetch(env, require_entity_api.entityApiPath(url));
 	const data = await parseJsonResponse(res);
 	if (!res.ok) failFromResponse(data, res);
 	console.log(JSON.stringify(data, null, 2));
@@ -411,7 +435,7 @@ async function listEntities(env, options) {
 	}
 }
 async function killEntity(env, url) {
-	const res = await electricAgentsFetch(env, url, { method: `DELETE` });
+	const res = await electricAgentsFetch(env, require_entity_api.entityApiPath(url), { method: `DELETE` });
 	if (!res.ok) {
 		const data = await parseJsonResponse(res);
 		failFromResponse(data, res);

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-B2MsxFCW.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-BDO8dHhT.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,8 @@
 #!/usr/bin/env node
 import { installCompletions, setupCompletions } from "./completions-B-Lf28Wy.js";
-import { resolveAnthropicApiKey$1 as resolveAnthropicApiKey } from "./env-LZtIfFz1.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";
 import { hostname, userInfo } from "node:os";
 import { basename, resolve } from "node:path";
@@ -138,10 +140,30 @@ var CliError = class extends Error {};
 function getDefaultElectricAgentsIdentity() {
 	return `${userInfo().username}@${hostname()}`;
 }
+function parseElectricAgentsHeaders(raw) {
+	const trimmed = raw?.trim();
+	if (!trimmed) return void 0;
+	let parsed;
+	try {
+		parsed = JSON.parse(trimmed);
+	} catch {
+		fail(`Invalid ELECTRIC_AGENTS_SERVER_HEADERS: expected JSON`);
+	}
+	if (!parsed || typeof parsed !== `object` || Array.isArray(parsed)) fail(`Invalid ELECTRIC_AGENTS_SERVER_HEADERS: expected a JSON object`);
+	const headers = new Headers();
+	for (const [name, value] of Object.entries(parsed)) {
+		if (typeof value !== `string`) fail(`Invalid ELECTRIC_AGENTS_SERVER_HEADERS: header "${name}" must be a string`);
+		headers.set(name, value);
+	}
+	const normalized = Object.fromEntries(headers.entries());
+	return Object.keys(normalized).length > 0 ? normalized : void 0;
+}
 function getElectricCliEnv(env = process.env) {
+	const explicitIdentity = env.ELECTRIC_AGENTS_IDENTITY?.trim();
 	return {
 		electricAgentsUrl: env.ELECTRIC_AGENTS_URL || DEFAULT_ELECTRIC_AGENTS_URL,
-		electricAgentsIdentity: env.ELECTRIC_AGENTS_IDENTITY || getDefaultElectricAgentsIdentity()
+		electricAgentsIdentity: explicitIdentity || getDefaultElectricAgentsIdentity(),
+		electricAgentsHeaders: parseElectricAgentsHeaders(env.ELECTRIC_AGENTS_SERVER_HEADERS)
 	};
 }
 function getErrorMessage(error) {
@@ -268,10 +290,11 @@ function resolveCommandPrefix(argv, env = process.env) {
 }
 async function electricAgentsFetch(env, path$1, opts = {}) {
 	try {
-		return await fetch(`${env.electricAgentsUrl}${path$1}`, {
+		return await fetch(appendPathToUrl(env.electricAgentsUrl, path$1), {
 			...opts,
 			headers: {
 				"content-type": `application/json`,
+				...env.electricAgentsHeaders,
 				...opts.headers
 			}
 		});
@@ -346,7 +369,7 @@ async function spawnEntity(env, urlPath, options) {
 	} catch (error) {
 		fail(`--args must be valid JSON: ${getErrorMessage(error)}`);
 	}
-	const res = await electricAgentsFetch(env, urlPath, {
+	const res = await electricAgentsFetch(env, entityApiPath(urlPath), {
 		method: `PUT`,
 		body: JSON.stringify({ args: spawnArgs })
 	});
@@ -363,7 +386,7 @@ async function sendMessage(env, url, message, options) {
 		payload
 	};
 	if (options.type) body.type = options.type;
-	const res = await electricAgentsFetch(env, `${url}/send`, {
+	const res = await electricAgentsFetch(env, entityApiPath(url, `/send`), {
 		method: `POST`,
 		body: JSON.stringify(body)
 	});
@@ -380,11 +403,12 @@ async function observeEntity(env, url, options) {
 		entityUrl: url,
 		baseUrl: env.electricAgentsUrl,
 		identity: env.electricAgentsIdentity,
+		headers: env.electricAgentsHeaders,
 		initialOffset: options.from
 	});
 }
 async function inspectEntity(env, url) {
-	const res = await electricAgentsFetch(env, url);
+	const res = await electricAgentsFetch(env, entityApiPath(url));
 	const data = await parseJsonResponse(res);
 	if (!res.ok) failFromResponse(data, res);
 	console.log(JSON.stringify(data, null, 2));
@@ -409,7 +433,7 @@ async function listEntities(env, options) {
 	}
 }
 async function killEntity(env, url) {
-	const res = await electricAgentsFetch(env, url, { method: `DELETE` });
+	const res = await electricAgentsFetch(env, entityApiPath(url), { method: `DELETE` });
 	if (!res.ok) {
 		const data = await parseJsonResponse(res);
 		failFromResponse(data, res);

package/dist/observe-ui.cjs

@@ -1,6 +1,7 @@
 "use strict";
 const require_chunk = require('./chunk-BCwAaXi7.cjs');
-const require_entity_stream_db = require('./entity-stream-db-Djo-7a11.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"));
@@ -118,7 +119,7 @@ function ToolResultView({ result }) {
 		}) : null]
 	});
 }
-function MessageInput({ db, baseUrl, entityUrl, identity, 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)({
@@ -131,9 +132,12 @@ function MessageInput({ db, baseUrl, entityUrl, identity, disabled }) {
 			});
 		},
 		mutationFn: async ({ text }) => {
-			const res = await fetch(`${baseUrl}${entityUrl}/send`, {
+			const res = await fetch(require_entity_api.entityApiUrl(baseUrl, entityUrl, `/send`), {
 				method: `POST`,
-				headers: { "content-type": `application/json` },
+				headers: {
+					"content-type": `application/json`,
+					...headers
+				},
 				body: JSON.stringify({
 					from: identity,
 					payload: { text }
@@ -157,7 +161,8 @@ function MessageInput({ db, baseUrl, entityUrl, identity, disabled }) {
 		db,
 		baseUrl,
 		entityUrl,
-		identity
+		identity,
+		headers
 	]);
 	(0, ink.useInput)((input, key) => {
 		if (disabled) return;
@@ -256,7 +261,7 @@ function WakeView({ section }) {
 		})]
 	});
 }
-function ObserveView({ db, entityUrl, baseUrl, identity }) {
+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] ?? {
@@ -329,12 +334,13 @@ function ObserveView({ db, entityUrl, baseUrl, identity }) {
 				baseUrl,
 				entityUrl,
 				identity,
+				headers,
 				disabled: closed
 			})
 		]
 	});
 }
-function ObserveApp({ entityUrl, baseUrl, identity, 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);
@@ -343,7 +349,8 @@ function ObserveApp({ entityUrl, baseUrl, identity, initialOffset }) {
 		require_entity_stream_db.createEntityStreamDB({
 			baseUrl,
 			entityUrl,
-			initialOffset
+			initialOffset,
+			headers
 		}).then((result) => {
 			if (cancelled) {
 				result.close();
@@ -361,7 +368,8 @@ function ObserveApp({ entityUrl, baseUrl, identity, initialOffset }) {
 	}, [
 		baseUrl,
 		entityUrl,
-		initialOffset
+		initialOffset,
+		headers
 	]);
 	if (error) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ink.Box, {
 		flexDirection: "column",
@@ -378,15 +386,17 @@ function ObserveApp({ entityUrl, baseUrl, identity, initialOffset }) {
 		db,
 		entityUrl,
 		baseUrl,
-		identity
+		identity,
+		headers
 	});
 }
 function renderObserve(opts) {
-	const { entityUrl, baseUrl, identity, initialOffset } = opts;
+	const { entityUrl, baseUrl, identity, headers, initialOffset } = opts;
 	const app = (0, ink.render)(/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ObserveApp, {
 		entityUrl,
 		baseUrl,
 		identity,
+		headers,
 		initialOffset
 	}));
 	process.on(`SIGINT`, () => {

package/dist/observe-ui.d.cts

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

package/dist/observe-ui.d.ts

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

package/dist/observe-ui.js

@@ -1,4 +1,5 @@
-import { createEntityStreamDB } from "./entity-stream-db-CGP2xVeJ.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";
@@ -116,7 +117,7 @@ function ToolResultView({ result }) {
 		}) : null]
 	});
 }
-function MessageInput({ db, baseUrl, entityUrl, identity, disabled }) {
+function MessageInput({ db, baseUrl, entityUrl, identity, headers, disabled }) {
 	const [value, setValue] = useState(``);
 	const [error, setError] = useState(null);
 	const sendAction = useMemo(() => createOptimisticAction({
@@ -129,9 +130,12 @@ function MessageInput({ db, baseUrl, entityUrl, identity, disabled }) {
 			});
 		},
 		mutationFn: async ({ text }) => {
-			const res = await fetch(`${baseUrl}${entityUrl}/send`, {
+			const res = await fetch(entityApiUrl(baseUrl, entityUrl, `/send`), {
 				method: `POST`,
-				headers: { "content-type": `application/json` },
+				headers: {
+					"content-type": `application/json`,
+					...headers
+				},
 				body: JSON.stringify({
 					from: identity,
 					payload: { text }
@@ -155,7 +159,8 @@ function MessageInput({ db, baseUrl, entityUrl, identity, disabled }) {
 		db,
 		baseUrl,
 		entityUrl,
-		identity
+		identity,
+		headers
 	]);
 	useInput((input, key) => {
 		if (disabled) return;
@@ -254,7 +259,7 @@ function WakeView({ section }) {
 		})]
 	});
 }
-function ObserveView({ db, entityUrl, baseUrl, identity }) {
+function ObserveView({ db, entityUrl, baseUrl, identity, headers }) {
 	const timelineQuery = useMemo(() => createEntityIncludesQuery(db), [db]);
 	const { data: timelineRows = [] } = useLiveQuery(timelineQuery, [timelineQuery]);
 	const timelineData = normalizeEntityTimelineData(timelineRows[0] ?? {
@@ -327,12 +332,13 @@ function ObserveView({ db, entityUrl, baseUrl, identity }) {
 				baseUrl,
 				entityUrl,
 				identity,
+				headers,
 				disabled: closed
 			})
 		]
 	});
 }
-function ObserveApp({ entityUrl, baseUrl, identity, initialOffset }) {
+function ObserveApp({ entityUrl, baseUrl, identity, headers, initialOffset }) {
 	const [db, setDb] = useState(null);
 	const [error, setError] = useState(null);
 	const closeRef = useRef(null);
@@ -341,7 +347,8 @@ function ObserveApp({ entityUrl, baseUrl, identity, initialOffset }) {
 		createEntityStreamDB({
 			baseUrl,
 			entityUrl,
-			initialOffset
+			initialOffset,
+			headers
 		}).then((result) => {
 			if (cancelled) {
 				result.close();
@@ -359,7 +366,8 @@ function ObserveApp({ entityUrl, baseUrl, identity, initialOffset }) {
 	}, [
 		baseUrl,
 		entityUrl,
-		initialOffset
+		initialOffset,
+		headers
 	]);
 	if (error) return /* @__PURE__ */ jsx(Box, {
 		flexDirection: "column",
@@ -376,15 +384,17 @@ function ObserveApp({ entityUrl, baseUrl, identity, initialOffset }) {
 		db,
 		entityUrl,
 		baseUrl,
-		identity
+		identity,
+		headers
 	});
 }
 function renderObserve(opts) {
-	const { entityUrl, baseUrl, identity, initialOffset } = opts;
+	const { entityUrl, baseUrl, identity, headers, initialOffset } = opts;
 	const app = render(/* @__PURE__ */ jsx(ObserveApp, {
 		entityUrl,
 		baseUrl,
 		identity,
+		headers,
 		initialOffset
 	}));
 	process.on(`SIGINT`, () => {

package/dist/start.cjs

@@ -1,6 +1,7 @@
 "use strict";
 const require_chunk = require('./chunk-BCwAaXi7.cjs');
-const require_env = require('./env-BXUgom_C.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 node_child_process = require_chunk.__toESM(require("node:child_process"));
 const __electric_ax_agents = require_chunk.__toESM(require("@electric-ax/agents"));
@@ -19,19 +20,10 @@ const ELECTRIC_AGENTS_SERVER_IMAGE_TAG = `latest`;
 //#endregion
 //#region src/start.ts
 const DEFAULT_ELECTRIC_AGENTS_PORT = 4437;
-const DEFAULT_BUILTIN_AGENTS_PORT = 4448;
-const DEFAULT_BUILTIN_AGENTS_HOST = `0.0.0.0`;
 const DEFAULT_COMPOSE_PROJECT_NAME = `electric-agents`;
+const DEFAULT_PULL_WAKE_RUNNER_ID = `builtin-agents`;
+const DEFAULT_PULL_WAKE_OWNER_ID = `builtin-agents`;
 const DOCKER_COMPOSE_FILE = (0, node_url.fileURLToPath)(new URL(`../docker-compose.full.yml`, require("url").pathToFileURL(__filename).href));
-function resolveBuiltinAgentsPort(env = process.env, fileEnv = require_env.readDotEnvFile()) {
-	const raw = env.ELECTRIC_AGENTS_BUILTIN_PORT?.trim() || fileEnv.ELECTRIC_AGENTS_BUILTIN_PORT?.trim();
-	const parsed = raw ? Number(raw) : DEFAULT_BUILTIN_AGENTS_PORT;
-	if (!Number.isInteger(parsed) || parsed <= 0) throw new Error(`ELECTRIC_AGENTS_BUILTIN_PORT must be a positive integer`);
-	return parsed;
-}
-function resolveBuiltinAgentsHost(env = process.env, fileEnv = require_env.readDotEnvFile()) {
-	return env.ELECTRIC_AGENTS_BUILTIN_HOST?.trim() || fileEnv.ELECTRIC_AGENTS_BUILTIN_HOST?.trim() || DEFAULT_BUILTIN_AGENTS_HOST;
-}
 function resolveElectricAgentsPort(env = process.env, fileEnv = require_env.readDotEnvFile()) {
 	const raw = env.ELECTRIC_AGENTS_PORT?.trim() || fileEnv.ELECTRIC_AGENTS_PORT?.trim();
 	const parsed = raw ? Number(raw) : DEFAULT_ELECTRIC_AGENTS_PORT;
@@ -54,12 +46,61 @@ function getStoppedEnvironmentMessage(stopped) {
 }
 function getStartedBuiltinAgentsMessage(started) {
 	return [
-		`Builtin Horton server is up.`,
-		`Webhook server: ${started.url}`,
+		`Builtin agents pull-wake runner is up.`,
+		`Runner: ${started.runnerId}`,
+		`Runtime: ${started.url}`,
 		`Registers with: ${started.agentServerUrl}`,
 		`Press Ctrl-C to stop.`
 	].join(`\n`);
 }
+function readConfigValue(env, fileEnv, names) {
+	for (const name of names) {
+		const value = env[name]?.trim() || fileEnv[name]?.trim();
+		if (value) return value;
+	}
+	return void 0;
+}
+function runnerIdFromIdentity(identity) {
+	if (!identity) return DEFAULT_PULL_WAKE_RUNNER_ID;
+	const slug = identity.toLowerCase().replace(/[^a-z0-9._-]+/g, `-`).replace(/^-+|-+$/g, ``);
+	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_AGENTS_IDENTITY`]));
+}
+function resolvePullWakeOwnerId(env = process.env, fileEnv = require_env.readDotEnvFile()) {
+	return readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_IDENTITY`]) ?? DEFAULT_PULL_WAKE_OWNER_ID;
+}
+function parseAdditionalServerHeaders(env, fileEnv) {
+	const raw = readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_SERVER_HEADERS`]);
+	if (!raw) return void 0;
+	let parsed;
+	try {
+		parsed = JSON.parse(raw);
+	} catch {
+		throw new Error(`Invalid ELECTRIC_AGENTS_SERVER_HEADERS: expected JSON`);
+	}
+	if (!parsed || typeof parsed !== `object` || Array.isArray(parsed)) throw new Error(`Invalid ELECTRIC_AGENTS_SERVER_HEADERS: expected a JSON object`);
+	const headers = new Headers();
+	for (const [name, value] of Object.entries(parsed)) {
+		if (typeof value !== `string`) throw new Error(`Invalid ELECTRIC_AGENTS_SERVER_HEADERS: header "${name}" must be a string`);
+		headers.set(name, value);
+	}
+	const normalized = Object.fromEntries(headers.entries());
+	return Object.keys(normalized).length > 0 ? normalized : void 0;
+}
+function mergeHeaders(...sources) {
+	const headers = new Headers();
+	for (const source of sources) {
+		if (!source) continue;
+		new Headers(source).forEach((value, key) => headers.set(key, value));
+	}
+	const merged = Object.fromEntries(headers.entries());
+	return Object.keys(merged).length > 0 ? merged : void 0;
+}
+function hasHeader(headers, name) {
+	return headers ? new Headers(headers).has(name) : false;
+}
 function resolveComposeProjectName(_cwd = process.cwd(), env = process.env) {
 	const explicit = env.ELECTRIC_AGENTS_COMPOSE_PROJECT?.trim();
 	if (explicit) return explicit;
@@ -94,11 +135,14 @@ async function waitForElectricAgentsServer(baseUrl, options = {}) {
 	const timeoutMs = options.timeoutMs ?? 6e4;
 	const intervalMs = options.intervalMs ?? 1e3;
 	const deadline = Date.now() + timeoutMs;
-	const healthUrl = `${baseUrl.replace(/\/$/, ``)}/_electric/health`;
+	const healthUrl = (0, __electric_ax_agents_runtime.appendPathToUrl)(baseUrl, `/_electric/health`);
 	let lastError = null;
 	while (Date.now() < deadline) {
 		try {
-			const response = await fetchImpl(healthUrl, { signal: AbortSignal.timeout(5e3) });
+			const response = await fetchImpl(healthUrl, {
+				headers: options.headers,
+				signal: AbortSignal.timeout(5e3)
+			});
 			if (response.ok) return;
 			lastError = `healthcheck returned ${response.status}`;
 		} catch (error) {
@@ -181,23 +225,29 @@ async function startBuiltinAgentsServer(options, params = {}) {
 	const cwd = params.cwd ?? process.cwd();
 	const fileEnv = require_env.readDotEnvFile(cwd);
 	const anthropicApiKey = require_env.resolveAnthropicApiKey(options, env, fileEnv);
-	const host = resolveBuiltinAgentsHost(env, fileEnv);
-	const port = resolveBuiltinAgentsPort(env, fileEnv);
+	const runnerId = resolvePullWakeRunnerId(env, fileEnv);
+	const ownerUserId = resolvePullWakeOwnerId(env, fileEnv);
+	const serverHeaders = mergeHeaders(parseAdditionalServerHeaders(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);
+	await waitForElectricAgentsServer(agentServerUrl, { headers: serverHeaders });
 	const server = new __electric_ax_agents.BuiltinAgentsServer({
 		agentServerUrl,
-		host,
-		port,
 		workingDirectory: cwd,
-		loadProjectMcpConfig: true
+		loadProjectMcpConfig: true,
+		pullWake: {
+			runnerId,
+			ownerUserId,
+			registerRunner: true,
+			headers: serverHeaders,
+			claimHeaders: serverHeaders,
+			claimTokenHeader: hasHeader(serverHeaders, `authorization`) ? `electric-claim-token` : void 0
+		}
 	});
-	await server.start();
+	const url = await server.start();
 	const started = {
-		port,
-		url: server.url,
-		registeredBaseUrl: server.registeredBaseUrl,
+		runnerId,
+		url,
 		agentServerUrl
 	};
 	if (params.printStartedMessage ?? true) console.log(getStartedBuiltinAgentsMessage(started));
@@ -211,10 +261,10 @@ exports.getStartedEnvironmentMessage = getStartedEnvironmentMessage
 exports.getStoppedEnvironmentMessage = getStoppedEnvironmentMessage
 exports.readDotEnvFile = require_env.readDotEnvFile
 exports.resolveAnthropicApiKey = require_env.resolveAnthropicApiKey
-exports.resolveBuiltinAgentsHost = resolveBuiltinAgentsHost
-exports.resolveBuiltinAgentsPort = resolveBuiltinAgentsPort
 exports.resolveComposeProjectName = resolveComposeProjectName
 exports.resolveElectricAgentsPort = resolveElectricAgentsPort
+exports.resolvePullWakeOwnerId = resolvePullWakeOwnerId
+exports.resolvePullWakeRunnerId = resolvePullWakeRunnerId
 exports.startBuiltinAgentsServer = startBuiltinAgentsServer
 exports.startElectricAgentsDevEnvironment = startElectricAgentsDevEnvironment
 exports.stopElectricAgentsDevEnvironment = stopElectricAgentsDevEnvironment

package/dist/start.d.cts

@@ -1,2 +1,2 @@
-import { StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StoppedDevEnvironment, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveBuiltinAgentsHost, resolveBuiltinAgentsPort, resolveComposeProjectName, resolveElectricAgentsPort, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer } from "./index-B2MsxFCW.cjs";
-export { StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StoppedDevEnvironment, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveBuiltinAgentsHost, resolveBuiltinAgentsPort, resolveComposeProjectName, resolveElectricAgentsPort, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer };
+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, resolveBuiltinAgentsHost, resolveBuiltinAgentsPort, resolveComposeProjectName, resolveElectricAgentsPort, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer } from "./index-BDO8dHhT.js";
-export { StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StoppedDevEnvironment, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveBuiltinAgentsHost, resolveBuiltinAgentsPort, resolveComposeProjectName, resolveElectricAgentsPort, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer };
+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,4 +1,5 @@
-import { readDotEnvFile$1 as readDotEnvFile, resolveAnthropicApiKey$1 as resolveAnthropicApiKey } from "./env-LZtIfFz1.js";
+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 { spawn } from "node:child_process";
 import { BuiltinAgentsServer } from "@electric-ax/agents";
@@ -17,19 +18,10 @@ const ELECTRIC_AGENTS_SERVER_IMAGE_TAG = `latest`;
 //#endregion
 //#region src/start.ts
 const DEFAULT_ELECTRIC_AGENTS_PORT = 4437;
-const DEFAULT_BUILTIN_AGENTS_PORT = 4448;
-const DEFAULT_BUILTIN_AGENTS_HOST = `0.0.0.0`;
 const DEFAULT_COMPOSE_PROJECT_NAME = `electric-agents`;
+const DEFAULT_PULL_WAKE_RUNNER_ID = `builtin-agents`;
+const DEFAULT_PULL_WAKE_OWNER_ID = `builtin-agents`;
 const DOCKER_COMPOSE_FILE = fileURLToPath(new URL(`../docker-compose.full.yml`, import.meta.url));
-function resolveBuiltinAgentsPort(env = process.env, fileEnv = readDotEnvFile()) {
-	const raw = env.ELECTRIC_AGENTS_BUILTIN_PORT?.trim() || fileEnv.ELECTRIC_AGENTS_BUILTIN_PORT?.trim();
-	const parsed = raw ? Number(raw) : DEFAULT_BUILTIN_AGENTS_PORT;
-	if (!Number.isInteger(parsed) || parsed <= 0) throw new Error(`ELECTRIC_AGENTS_BUILTIN_PORT must be a positive integer`);
-	return parsed;
-}
-function resolveBuiltinAgentsHost(env = process.env, fileEnv = readDotEnvFile()) {
-	return env.ELECTRIC_AGENTS_BUILTIN_HOST?.trim() || fileEnv.ELECTRIC_AGENTS_BUILTIN_HOST?.trim() || DEFAULT_BUILTIN_AGENTS_HOST;
-}
 function resolveElectricAgentsPort(env = process.env, fileEnv = readDotEnvFile()) {
 	const raw = env.ELECTRIC_AGENTS_PORT?.trim() || fileEnv.ELECTRIC_AGENTS_PORT?.trim();
 	const parsed = raw ? Number(raw) : DEFAULT_ELECTRIC_AGENTS_PORT;
@@ -52,12 +44,61 @@ function getStoppedEnvironmentMessage(stopped) {
 }
 function getStartedBuiltinAgentsMessage(started) {
 	return [
-		`Builtin Horton server is up.`,
-		`Webhook server: ${started.url}`,
+		`Builtin agents pull-wake runner is up.`,
+		`Runner: ${started.runnerId}`,
+		`Runtime: ${started.url}`,
 		`Registers with: ${started.agentServerUrl}`,
 		`Press Ctrl-C to stop.`
 	].join(`\n`);
 }
+function readConfigValue(env, fileEnv, names) {
+	for (const name of names) {
+		const value = env[name]?.trim() || fileEnv[name]?.trim();
+		if (value) return value;
+	}
+	return void 0;
+}
+function runnerIdFromIdentity(identity) {
+	if (!identity) return DEFAULT_PULL_WAKE_RUNNER_ID;
+	const slug = identity.toLowerCase().replace(/[^a-z0-9._-]+/g, `-`).replace(/^-+|-+$/g, ``);
+	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_AGENTS_IDENTITY`]));
+}
+function resolvePullWakeOwnerId(env = process.env, fileEnv = readDotEnvFile()) {
+	return readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_IDENTITY`]) ?? DEFAULT_PULL_WAKE_OWNER_ID;
+}
+function parseAdditionalServerHeaders(env, fileEnv) {
+	const raw = readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_SERVER_HEADERS`]);
+	if (!raw) return void 0;
+	let parsed;
+	try {
+		parsed = JSON.parse(raw);
+	} catch {
+		throw new Error(`Invalid ELECTRIC_AGENTS_SERVER_HEADERS: expected JSON`);
+	}
+	if (!parsed || typeof parsed !== `object` || Array.isArray(parsed)) throw new Error(`Invalid ELECTRIC_AGENTS_SERVER_HEADERS: expected a JSON object`);
+	const headers = new Headers();
+	for (const [name, value] of Object.entries(parsed)) {
+		if (typeof value !== `string`) throw new Error(`Invalid ELECTRIC_AGENTS_SERVER_HEADERS: header "${name}" must be a string`);
+		headers.set(name, value);
+	}
+	const normalized = Object.fromEntries(headers.entries());
+	return Object.keys(normalized).length > 0 ? normalized : void 0;
+}
+function mergeHeaders(...sources) {
+	const headers = new Headers();
+	for (const source of sources) {
+		if (!source) continue;
+		new Headers(source).forEach((value, key) => headers.set(key, value));
+	}
+	const merged = Object.fromEntries(headers.entries());
+	return Object.keys(merged).length > 0 ? merged : void 0;
+}
+function hasHeader(headers, name) {
+	return headers ? new Headers(headers).has(name) : false;
+}
 function resolveComposeProjectName(_cwd = process.cwd(), env = process.env) {
 	const explicit = env.ELECTRIC_AGENTS_COMPOSE_PROJECT?.trim();
 	if (explicit) return explicit;
@@ -92,11 +133,14 @@ async function waitForElectricAgentsServer(baseUrl, options = {}) {
 	const timeoutMs = options.timeoutMs ?? 6e4;
 	const intervalMs = options.intervalMs ?? 1e3;
 	const deadline = Date.now() + timeoutMs;
-	const healthUrl = `${baseUrl.replace(/\/$/, ``)}/_electric/health`;
+	const healthUrl = appendPathToUrl(baseUrl, `/_electric/health`);
 	let lastError = null;
 	while (Date.now() < deadline) {
 		try {
-			const response = await fetchImpl(healthUrl, { signal: AbortSignal.timeout(5e3) });
+			const response = await fetchImpl(healthUrl, {
+				headers: options.headers,
+				signal: AbortSignal.timeout(5e3)
+			});
 			if (response.ok) return;
 			lastError = `healthcheck returned ${response.status}`;
 		} catch (error) {
@@ -179,23 +223,29 @@ async function startBuiltinAgentsServer(options, params = {}) {
 	const cwd = params.cwd ?? process.cwd();
 	const fileEnv = readDotEnvFile(cwd);
 	const anthropicApiKey = resolveAnthropicApiKey(options, env, fileEnv);
-	const host = resolveBuiltinAgentsHost(env, fileEnv);
-	const port = resolveBuiltinAgentsPort(env, fileEnv);
+	const runnerId = resolvePullWakeRunnerId(env, fileEnv);
+	const ownerUserId = resolvePullWakeOwnerId(env, fileEnv);
+	const serverHeaders = mergeHeaders(parseAdditionalServerHeaders(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);
+	await waitForElectricAgentsServer(agentServerUrl, { headers: serverHeaders });
 	const server = new BuiltinAgentsServer({
 		agentServerUrl,
-		host,
-		port,
 		workingDirectory: cwd,
-		loadProjectMcpConfig: true
+		loadProjectMcpConfig: true,
+		pullWake: {
+			runnerId,
+			ownerUserId,
+			registerRunner: true,
+			headers: serverHeaders,
+			claimHeaders: serverHeaders,
+			claimTokenHeader: hasHeader(serverHeaders, `authorization`) ? `electric-claim-token` : void 0
+		}
 	});
-	await server.start();
+	const url = await server.start();
 	const started = {
-		port,
-		url: server.url,
-		registeredBaseUrl: server.registeredBaseUrl,
+		runnerId,
+		url,
 		agentServerUrl
 	};
 	if (params.printStartedMessage ?? true) console.log(getStartedBuiltinAgentsMessage(started));
@@ -204,4 +254,4 @@ async function startBuiltinAgentsServer(options, params = {}) {
 }
 
 //#endregion
-export { getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveBuiltinAgentsHost, resolveBuiltinAgentsPort, resolveComposeProjectName, resolveElectricAgentsPort, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer };
+export { getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerId, resolvePullWakeRunnerId, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer };

package/docker-compose.full.yml

@@ -38,7 +38,7 @@ services:
 
   electric-agents:
     image: electricax/agents-server:${ELECTRIC_AGENTS_SERVER_IMAGE_TAG:-latest}
-    pull_policy: always
+    pull_policy: ${ELECTRIC_AGENTS_SERVER_PULL_POLICY:-missing}
     restart: unless-stopped
     extra_hosts:
       - 'host.docker.internal:host-gateway'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electric-ax",
-  "version": "0.1.18",
+  "version": "0.2.1",
   "description": "CLI for Electric Agents",
   "author": "ElectricSQL team and contributors",
   "license": "Apache-2.0",
@@ -37,8 +37,8 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@durable-streams/client": "npm:@electric-ax/durable-streams-client-beta@^0.3.0",
-    "@durable-streams/state": "npm:@electric-ax/durable-streams-state-beta@^0.3.0",
+    "@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",
     "@tanstack/db": "^0.6.4",
     "@tanstack/react-db": "^0.1.82",
@@ -46,8 +46,8 @@
     "ink": "^6.8.0",
     "omelette": "^0.4.17",
     "react": "^19.2.0",
-    "@electric-ax/agents": "0.3.0",
-    "@electric-ax/agents-runtime": "0.1.3"
+    "@electric-ax/agents": "0.4.1",
+    "@electric-ax/agents-runtime": "0.2.1"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^4.1.0",