electric-ax 0.1.17 → 0.2.0

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,11 @@ 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 DEFAULT_PULL_WAKE_OWNER_NAME = `Built-in 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 +45,73 @@ 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_ASSERTED_AUTH_EMAIL`, `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
+	};
+}
+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 +146,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) {
@@ -110,6 +167,7 @@ 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`,
@@ -121,7 +179,10 @@ 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_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
 	});
 	const uiUrl = `http://localhost:${port}`;
 	await waitForElectricAgentsServer(uiUrl);
@@ -179,22 +240,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 assertedAuth = buildAssertedAuthHeaders(env, fileEnv);
+	const serverHeaders = mergeHeaders(assertedAuth.headers, 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
+		workingDirectory: cwd,
+		loadProjectMcpConfig: true,
+		pullWake: {
+			runnerId,
+			ownerUserId: assertedAuth.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));
@@ -203,4 +271,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'
@@ -59,6 +59,9 @@ 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.1.17",
+  "version": "0.2.0",
   "description": "CLI for Electric Agents",
   "author": "ElectricSQL team and contributors",
   "license": "Apache-2.0",
@@ -37,17 +37,17 @@
     "./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",
-    "@electric-sql/client": "^1.5.16",
+    "@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",
     "commander": "^13.1.0",
     "ink": "^6.8.0",
     "omelette": "^0.4.17",
     "react": "^19.2.0",
-    "@electric-ax/agents": "0.2.4",
-    "@electric-ax/agents-runtime": "0.1.2"
+    "@electric-ax/agents": "0.4.0",
+    "@electric-ax/agents-runtime": "0.2.0"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^4.1.0",