electric-ax 0.2.21 → 0.2.23

package/dist/observe-ui.js

@@ -1,9 +1,8 @@
-import { createEntityStreamDB, entityApiUrl } from "./entity-stream-db-UBN2gowE.js";
-import { buildSections, createEntityIncludesQuery, normalizeEntityTimelineData } from "@electric-ax/agents-runtime";
-import { createOptimisticAction } from "@durable-streams/state/db";
+import { createEntityStreamDB, entityApiUrl } from "./entity-stream-db-thqr5ONI.js";
+import { createEntityTimelineQuery, createPendingTimelineOrder } from "@electric-ax/agents-runtime";
 import React, { useEffect, useMemo, useRef, useState } from "react";
 import { Box, Newline, Text, render, useInput } from "ink";
-import { useLiveQuery } from "@tanstack/react-db";
+import { createOptimisticAction, useLiveQuery } from "@tanstack/react-db";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 
 //#region src/observe-ui.tsx
@@ -23,6 +22,159 @@ function formatTime(iso) {
 function truncate(s, max) {
 	return s.length > max ? s.slice(0, max - 3) + `...` : s;
 }
+function createMessageSendBody(text, opts) {
+	return {
+		...opts?.key ? { key: opts.key } : {},
+		payload: { text }
+	};
+}
+const OPTIMISTIC_INBOX_ORDER_START = Number.MAX_SAFE_INTEGER - 1e6;
+const SEND_TXID_TIMEOUT_MS = 1e4;
+let optimisticInboxOrderIndex = OPTIMISTIC_INBOX_ORDER_START;
+function nextOptimisticInboxOrderIndex() {
+	optimisticInboxOrderIndex += 1;
+	if (optimisticInboxOrderIndex >= Number.MAX_SAFE_INTEGER) optimisticInboxOrderIndex = OPTIMISTIC_INBOX_ORDER_START;
+	return optimisticInboxOrderIndex;
+}
+function createOptimisticInboxKey(pendingOrderIndex) {
+	return `optimistic-${Date.now()}-${pendingOrderIndex}`;
+}
+async function readSendTxid(res) {
+	const data = await res.json().catch(() => null);
+	const txid = data?.txid;
+	if (typeof txid === `string` || typeof txid === `number`) return String(txid);
+	throw new Error(`Send response did not include txid`);
+}
+function GutterLine({ prefix = `│ `, color, dimColor, children }) {
+	return /* @__PURE__ */ jsxs(Box, {
+		width: "100%",
+		children: [/* @__PURE__ */ jsx(Text, {
+			color,
+			dimColor,
+			children: prefix
+		}), /* @__PURE__ */ jsx(Box, {
+			flexGrow: 1,
+			flexShrink: 1,
+			children: /* @__PURE__ */ jsx(Text, {
+				color,
+				dimColor,
+				wrap: "wrap",
+				children
+			})
+		})]
+	});
+}
+function payloadText(payload) {
+	if (typeof payload === `string`) return payload;
+	if (typeof payload === `object` && payload !== null) {
+		const record = payload;
+		return typeof record.text === `string` ? record.text : JSON.stringify(payload);
+	}
+	return String(payload ?? ``);
+}
+function resultText(result) {
+	if (result === void 0) return void 0;
+	return typeof result === `string` ? result : JSON.stringify(result);
+}
+function isPlainObject(value) {
+	return typeof value === `object` && value !== null && !Array.isArray(value);
+}
+function timelineRowsToDisplayRows(rows) {
+	let userMessageCount = 0;
+	return rows.flatMap((row) => {
+		if (row.inbox) {
+			const section = {
+				kind: `user_message`,
+				from: row.inbox.from,
+				text: payloadText(row.inbox.payload),
+				timestamp: Date.parse(row.inbox.timestamp || ``) || Date.now(),
+				isInitial: userMessageCount === 0
+			};
+			userMessageCount++;
+			return [{
+				kind: `section`,
+				key: row.$key,
+				section
+			}];
+		}
+		if (row.wake) {
+			const timestamp = Date.parse(row.wake.payload.timestamp);
+			return [{
+				kind: `section`,
+				key: row.$key,
+				section: {
+					kind: `wake`,
+					payload: row.wake.payload,
+					timestamp: Number.isFinite(timestamp) ? timestamp : Date.now()
+				}
+			}];
+		}
+		if (row.run) return [{
+			kind: `run`,
+			key: row.$key,
+			run: row.run
+		}];
+		if (row.error) return [{
+			kind: `section`,
+			key: row.$key,
+			section: {
+				kind: `agent_response`,
+				items: [],
+				error: row.error.error_code ? `${row.error.error_code}: ${row.error.message}` : row.error.message
+			}
+		}];
+		return [];
+	});
+}
+function textContent(item) {
+	return typeof item?.content === `string` ? item.content : ``;
+}
+function compareTimelineOrderValues(left, right) {
+	if (typeof left === `number` && typeof right === `number`) return left - right;
+	return String(left).localeCompare(String(right));
+}
+function runItemKind(item) {
+	return item.text ? `text` : `toolCall`;
+}
+function runItemKey(item) {
+	return item.text?.key ?? item.toolCall?.key ?? ``;
+}
+function compareRunItems(left, right) {
+	const orderCompare = compareTimelineOrderValues(left.text?.order ?? left.toolCall?.order ?? `~`, right.text?.order ?? right.toolCall?.order ?? `~`);
+	if (orderCompare !== 0) return orderCompare;
+	const kindCompare = runItemKind(left).localeCompare(runItemKind(right));
+	if (kindCompare !== 0) return kindCompare;
+	return runItemKey(left).localeCompare(runItemKey(right));
+}
+function runItemsToContentItems(items) {
+	const contentItems = [];
+	for (const item of items) {
+		if (item.text) {
+			const content = textContent(item.text);
+			if (content.trim().length > 0) contentItems.push({
+				kind: `text`,
+				text: content
+			});
+			continue;
+		}
+		if (!item.toolCall) continue;
+		contentItems.push({
+			kind: `tool_call`,
+			toolCallId: item.toolCall.tool_call_id ?? item.toolCall.key,
+			toolName: item.toolCall.tool_name,
+			args: isPlainObject(item.toolCall.args) ? item.toolCall.args : {},
+			status: item.toolCall.status,
+			result: resultText(item.toolCall.result),
+			error: item.toolCall.error,
+			isError: item.toolCall.status === `failed`
+		});
+	}
+	return contentItems;
+}
+function runErrorsText(errors) {
+	const messages = errors.map((error) => error.error_code ? `${error.error_code}: ${error.message}` : error.message).filter(Boolean);
+	return messages.length > 0 ? messages.join(`; `) : void 0;
+}
 function UserMessageView({ msg }) {
 	const time = formatTime(msg.timestamp);
 	const payload = msg.payload;
@@ -42,9 +194,9 @@ function UserMessageView({ msg }) {
 		}), time ? /* @__PURE__ */ jsx(Text, {
 			dimColor: true,
 			children: `  ${time}`
-		}) : null] }), text.split(`\n`).map((line, i) => /* @__PURE__ */ jsx(Text, {
+		}) : null] }), text.split(`\n`).map((line, i) => /* @__PURE__ */ jsx(GutterLine, {
 			color: "white",
-			children: `│ ${line}`
+			children: line
 		}, i))]
 	});
 }
@@ -58,9 +210,9 @@ function AgentTextView({ text, accumulatedText, label }) {
 			bold: true,
 			color: "green",
 			children: `┌ ${label ?? `assistant`}`
-		}) }), lines.map((line, i) => /* @__PURE__ */ jsx(Text, {
+		}) }), lines.map((line, i) => /* @__PURE__ */ jsx(GutterLine, {
 			color: "white",
-			children: `│ ${line}${i === lines.length - 1 ? cursor : ``}`
+			children: `${line}${i === lines.length - 1 ? cursor : ``}`
 		}, i))]
 	});
 }
@@ -107,9 +259,10 @@ function ToolResultView({ result }) {
 	const remaining = lines.length - maxLines;
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
-		children: [shown.map((line, i) => /* @__PURE__ */ jsx(Text, {
+		children: [shown.map((line, i) => /* @__PURE__ */ jsx(GutterLine, {
+			prefix: "    │ ",
 			dimColor: true,
-			children: `    │ ${truncate(line, 100)}`
+			children: truncate(line, 100)
 		}, i)), remaining > 0 ? /* @__PURE__ */ jsx(Text, {
 			dimColor: true,
 			children: `    │ ... ${remaining} more lines`
@@ -120,25 +273,28 @@ function MessageInput({ db, baseUrl, entityUrl, identity, headers, disabled }) {
 	const [value, setValue] = useState(``);
 	const [error, setError] = useState(null);
 	const sendAction = useMemo(() => createOptimisticAction({
-		onMutate: ({ text }) => {
+		onMutate: ({ text, key, pendingOrderIndex }) => {
+			const now = new Date().toISOString();
 			db.collections.inbox.insert({
-				key: `optimistic-${Date.now()}`,
+				key,
+				_timeline_order: createPendingTimelineOrder(pendingOrderIndex),
 				from: identity,
+				from_principal: identity,
 				payload: { text },
-				timestamp: new Date().toISOString()
+				timestamp: now,
+				mode: `immediate`,
+				status: `processed`,
+				processed_at: now
 			});
 		},
-		mutationFn: async ({ text }) => {
+		mutationFn: async ({ text, key }) => {
 			const res = await fetch(entityApiUrl(baseUrl, entityUrl, `/send`), {
 				method: `POST`,
 				headers: {
 					"content-type": `application/json`,
 					...headers
 				},
-				body: JSON.stringify({
-					from: identity,
-					payload: { text }
-				})
+				body: JSON.stringify(createMessageSendBody(text, { key }))
 			});
 			if (!res.ok) {
 				const body = await res.text().catch(() => ``);
@@ -153,6 +309,7 @@ function MessageInput({ db, baseUrl, entityUrl, identity, headers, disabled }) {
 				}
 				throw new Error(message);
 			}
+			await db.utils.awaitTxId(await readSendTxid(res), SEND_TXID_TIMEOUT_MS);
 		}
 	}), [
 		db,
@@ -166,7 +323,12 @@ function MessageInput({ db, baseUrl, entityUrl, identity, headers, disabled }) {
 		if (key.return) {
 			if (value.trim()) {
 				setError(null);
-				const tx = sendAction({ text: value.trim() });
+				const pendingOrderIndex = nextOptimisticInboxOrderIndex();
+				const tx = sendAction({
+					text: value.trim(),
+					key: createOptimisticInboxKey(pendingOrderIndex),
+					pendingOrderIndex
+				});
 				setValue(``);
 				tx.isPersisted.promise.catch((err) => {
 					setError(err.message);
@@ -204,6 +366,7 @@ function MessageInput({ db, baseUrl, entityUrl, identity, headers, disabled }) {
 function AgentResponseView({ section, label, isStreaming }) {
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
+		width: "100%",
 		children: [
 			section.items.map((item, i) => {
 				if (item.kind === `text`) return /* @__PURE__ */ jsx(AgentTextView, {
@@ -233,6 +396,31 @@ function AgentResponseView({ section, label, isStreaming }) {
 		]
 	});
 }
+function AgentRunView({ run, label, isStreaming }) {
+	const { data: items = [] } = useLiveQuery((q) => run.items ? q.from({ item: run.items }) : void 0, [run.items]);
+	const { data: errors = [] } = useLiveQuery((q) => run.errors ? q.from({ error: run.errors }) : void 0, [run.errors]);
+	const sortedItems = useMemo(() => [...items].sort(compareRunItems), [items]);
+	const runErrors = useMemo(() => runErrorsText(errors), [errors]);
+	const finishReason = run.status === `failed` && run.finish_reason ? `finish_reason=${run.finish_reason}` : void 0;
+	const section = useMemo(() => ({
+		kind: `agent_response`,
+		items: runItemsToContentItems(sortedItems),
+		...run.status === `completed` && { done: true },
+		...runErrors || finishReason ? { error: runErrors || finishReason } : {},
+		...run.tokens && { tokens: run.tokens }
+	}), [
+		finishReason,
+		run.status,
+		run.tokens,
+		runErrors,
+		sortedItems
+	]);
+	return /* @__PURE__ */ jsx(AgentResponseView, {
+		section,
+		label,
+		isStreaming
+	});
+}
 function wakeReason(section) {
 	const { payload } = section;
 	if (payload.timeout) return `timeout`;
@@ -265,64 +453,59 @@ function ObserveExitHotkey({ onExit }) {
 	return null;
 }
 function ObserveView({ db, entityUrl, baseUrl, identity, headers }) {
-	const timelineQuery = useMemo(() => createEntityIncludesQuery(db), [db]);
+	const timelineQuery = useMemo(() => createEntityTimelineQuery(db), [db]);
 	const { data: timelineRows = [] } = useLiveQuery(timelineQuery, [timelineQuery]);
-	const timelineData = normalizeEntityTimelineData(timelineRows[0] ?? {
-		runs: [],
-		inbox: [],
-		wakes: [],
-		signals: [],
-		contextInserted: [],
-		contextRemoved: [],
-		entities: []
-	});
-	const typedRuns = timelineData.runs;
-	const typedInbox = timelineData.inbox;
-	const typedWakes = timelineData.wakes;
-	const timeline = useMemo(() => buildSections(typedRuns, typedInbox, typedWakes), [
-		typedRuns,
-		typedInbox,
-		typedWakes
-	]);
-	const { data: stopped = [] } = useLiveQuery((q) => q.from({ entityStopped: db.collections.entityStopped }), [db]);
-	const closed = stopped.length > 0;
+	const displayRows = useMemo(() => timelineRowsToDisplayRows(timelineRows), [timelineRows]);
+	const { data: entityStoppedRows = [] } = useLiveQuery((q) => q.from({ stopped: db.collections.entityStopped }), [db.collections.entityStopped]);
+	const closed = entityStoppedRows.length > 0;
 	const lastAgentIndex = useMemo(() => {
-		for (let i = timeline.length - 1; i >= 0; i--) if (timeline[i].kind === `agent_response`) return i;
+		for (let i = displayRows.length - 1; i >= 0; i--) {
+			const row = displayRows[i];
+			if (row.kind === `run` || row.kind === `section` && row.section.kind === `agent_response`) return i;
+		}
 		return -1;
-	}, [timeline]);
+	}, [displayRows]);
 	return /* @__PURE__ */ jsxs(Box, {
 		flexDirection: "column",
 		children: [
 			/* @__PURE__ */ jsx(Box, {
 				marginBottom: 1,
+				width: "100%",
 				children: /* @__PURE__ */ jsx(Text, {
 					dimColor: true,
 					children: `Observing ${entityUrl}${closed ? `` : ` (Ctrl+C to stop)`}`
 				})
 			}),
 			/* @__PURE__ */ jsxs(Box, {
+				width: "100%",
 				borderStyle: "single",
 				borderColor: "gray",
 				flexDirection: "column",
 				paddingX: 1,
 				children: [
-					timeline.length === 0 ? /* @__PURE__ */ jsx(Text, {
+					displayRows.length === 0 ? /* @__PURE__ */ jsx(Text, {
 						dimColor: true,
 						children: "Waiting for events..."
 					}) : null,
-					timeline.map((section, i) => {
+					displayRows.map((row, i) => {
+						if (row.kind === `run`) return /* @__PURE__ */ jsx(AgentRunView, {
+							run: row.run,
+							label: entityUrl,
+							isStreaming: !closed && i === lastAgentIndex && row.run.status !== `completed`
+						}, row.key);
+						const { section } = row;
 						if (section.kind === `user_message`) return /* @__PURE__ */ jsx(UserMessageView, { msg: {
 							key: `timeline-${i}`,
 							from: section.from ?? `user`,
 							payload: { text: section.text },
 							timestamp: new Date(section.timestamp).toISOString()
-						} }, `msg-${i}`);
-						if (section.kind === `wake`) return /* @__PURE__ */ jsx(WakeView, { section }, `wake-${i}`);
+						} }, row.key);
+						if (section.kind === `wake`) return /* @__PURE__ */ jsx(WakeView, { section }, row.key);
 						return /* @__PURE__ */ jsx(AgentResponseView, {
 							section,
 							label: entityUrl,
 							isStreaming: !closed && i === lastAgentIndex && !section.done
-						}, `agent-${i}`);
+						}, row.key);
 					}),
 					closed ? /* @__PURE__ */ jsx(Box, {
 						marginTop: 1,
@@ -420,4 +603,4 @@ function renderObserve(opts) {
 }
 
 //#endregion
-export { AgentTextView, MessageInput, ObserveExitHotkey, ToolCallView, ToolResultView, UserMessageView, formatTime, renderObserve, truncate };
+export { AgentTextView, MessageInput, ObserveExitHotkey, ObserveView, ToolCallView, ToolResultView, UserMessageView, compareRunItems, createMessageSendBody, formatTime, renderObserve, runItemKey, runItemKind, runItemsToContentItems, truncate };

package/dist/start.cjs

@@ -1,7 +1,8 @@
 "use strict";
 const require_chunk = require('./chunk-BCwAaXi7.cjs');
-const require_version = require('./version-BU1gpSFU.cjs');
+const require_version = require('./version-Dp_ZxaMK.cjs');
 const __electric_ax_agents_runtime = require_chunk.__toESM(require("@electric-ax/agents-runtime"));
+const node_os = require_chunk.__toESM(require("node:os"));
 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"));
@@ -11,8 +12,13 @@ const __electric_ax_agents = require_chunk.__toESM(require("@electric-ax/agents"
 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_PRINCIPAL = `/principal/system%3Abuiltin-agents`;
 const PRINCIPAL_URL_PREFIX = `/principal/`;
+const PRINCIPAL_KEY_PREFIXES = new Set([
+	`user`,
+	`agent`,
+	`service`,
+	`system`
+]);
 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_version.readDotEnvFile()) {
 	const raw = env.ELECTRIC_AGENTS_PORT?.trim() || fileEnv.ELECTRIC_AGENTS_PORT?.trim();
@@ -58,6 +64,14 @@ function runnerIdFromIdentity(identity) {
 function principalUrlFromConfig(value) {
 	return value.startsWith(PRINCIPAL_URL_PREFIX) ? value : `${PRINCIPAL_URL_PREFIX}${encodeURIComponent(value)}`;
 }
+function principalKeyFromIdentity(identity) {
+	const colon = identity.indexOf(`:`);
+	if (colon > 0 && PRINCIPAL_KEY_PREFIXES.has(identity.slice(0, colon))) return identity;
+	return `user:${identity}`;
+}
+function defaultPullWakeOwnerPrincipal() {
+	return principalUrlFromConfig(principalKeyFromIdentity(`${(0, node_os.userInfo)().username}@${(0, node_os.hostname)()}`));
+}
 function resolvePullWakeRunnerId(env = process.env, fileEnv = require_version.readDotEnvFile()) {
 	return readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_PULL_WAKE_RUNNER_ID`, `PULL_WAKE_RUNNER_ID`]) ?? runnerIdFromIdentity(readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_IDENTITY`]));
 }
@@ -65,8 +79,8 @@ function resolvePullWakeOwnerPrincipal(env = process.env, fileEnv = require_vers
 	const principal = readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_PRINCIPAL`]);
 	if (principal) return principalUrlFromConfig(principal);
 	const identity = readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_IDENTITY`]);
-	if (identity) return principalUrlFromConfig(identity);
-	return DEFAULT_PULL_WAKE_OWNER_PRINCIPAL;
+	if (identity) return principalUrlFromConfig(principalKeyFromIdentity(identity));
+	return defaultPullWakeOwnerPrincipal();
 }
 function parseAdditionalServerHeaders(env, fileEnv) {
 	const raw = readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_SERVER_HEADERS`]);
@@ -89,6 +103,9 @@ function parseAdditionalServerHeaders(env, fileEnv) {
 function resolveServerHeaders(env, fileEnv) {
 	return (0, __electric_ax_agents_server_headers.mergeElectricPrincipalHeader)(parseAdditionalServerHeaders(env, fileEnv), readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_PRINCIPAL`]));
 }
+function resolveBuiltinServerHeaders(env, fileEnv, ownerPrincipal) {
+	return mergeHeaders(resolveServerHeaders(env, fileEnv), (0, __electric_ax_agents_server_headers.mergeElectricPrincipalHeader)(void 0, ownerPrincipal));
+}
 function mergeHeaders(...sources) {
 	const headers = new Headers();
 	for (const source of sources) {
@@ -227,7 +244,7 @@ async function startBuiltinAgentsServer(options, params = {}) {
 	const anthropicApiKey = require_version.resolveAnthropicApiKey(options, env, fileEnv);
 	const runnerId = resolvePullWakeRunnerId(env, fileEnv);
 	const ownerPrincipal = resolvePullWakeOwnerPrincipal(env, fileEnv);
-	const serverHeaders = mergeHeaders(resolveServerHeaders(env, fileEnv));
+	const serverHeaders = resolveBuiltinServerHeaders(env, fileEnv, ownerPrincipal);
 	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 });
@@ -235,6 +252,7 @@ async function startBuiltinAgentsServer(options, params = {}) {
 		agentServerUrl,
 		workingDirectory: cwd,
 		loadProjectMcpConfig: true,
+		durableStreamsFetchCache: false,
 		pullWake: {
 			runnerId,
 			ownerPrincipal,
@@ -261,6 +279,7 @@ exports.getStartedEnvironmentMessage = getStartedEnvironmentMessage
 exports.getStoppedEnvironmentMessage = getStoppedEnvironmentMessage
 exports.readDotEnvFile = require_version.readDotEnvFile
 exports.resolveAnthropicApiKey = require_version.resolveAnthropicApiKey
+exports.resolveBuiltinServerHeaders = resolveBuiltinServerHeaders
 exports.resolveComposeProjectName = resolveComposeProjectName
 exports.resolveElectricAgentsPort = resolveElectricAgentsPort
 exports.resolvePullWakeOwnerPrincipal = resolvePullWakeOwnerPrincipal

package/dist/start.d.cts

@@ -1,2 +1,2 @@
-import { StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StoppedDevEnvironment, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerPrincipal, resolvePullWakeRunnerId, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer } from "./index-_AHIJdEA.cjs";
-export { StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StoppedDevEnvironment, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerPrincipal, resolvePullWakeRunnerId, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer };
+import { StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StoppedDevEnvironment, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveBuiltinServerHeaders, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerPrincipal, resolvePullWakeRunnerId, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer } from "./index-BGw1zeGA.cjs";
+export { StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StoppedDevEnvironment, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveBuiltinServerHeaders, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerPrincipal, 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, resolvePullWakeOwnerPrincipal, resolvePullWakeRunnerId, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer } from "./index-CQN8S3b9.js";
-export { StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StoppedDevEnvironment, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerPrincipal, resolvePullWakeRunnerId, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer };
+import { StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StoppedDevEnvironment, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveBuiltinServerHeaders, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerPrincipal, resolvePullWakeRunnerId, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer } from "./index-gzb1Ju8x.js";
+export { StartedBuiltinAgentsEnvironment, StartedDevEnvironment, StoppedDevEnvironment, getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveBuiltinServerHeaders, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerPrincipal, resolvePullWakeRunnerId, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer };

package/dist/start.js

@@ -1,5 +1,6 @@
-import { ELECTRIC_AGENTS_SERVER_IMAGE_TAG, ELECTRIC_IMAGE_TAG, readDotEnvFile$1 as readDotEnvFile, resolveAnthropicApiKey$1 as resolveAnthropicApiKey } from "./version-BXm4o7Lz.js";
+import { ELECTRIC_AGENTS_SERVER_IMAGE_TAG, ELECTRIC_IMAGE_TAG, readDotEnvFile$1 as readDotEnvFile, resolveAnthropicApiKey$1 as resolveAnthropicApiKey } from "./version-D62IOgCl.js";
 import { appendPathToUrl } from "@electric-ax/agents-runtime";
+import { hostname, userInfo } from "node:os";
 import { fileURLToPath } from "node:url";
 import { mergeElectricPrincipalHeader } from "@electric-ax/agents/server-headers";
 import { spawn } from "node:child_process";
@@ -9,8 +10,13 @@ import { BuiltinAgentsServer } from "@electric-ax/agents";
 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_PRINCIPAL = `/principal/system%3Abuiltin-agents`;
 const PRINCIPAL_URL_PREFIX = `/principal/`;
+const PRINCIPAL_KEY_PREFIXES = new Set([
+	`user`,
+	`agent`,
+	`service`,
+	`system`
+]);
 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();
@@ -56,6 +62,14 @@ function runnerIdFromIdentity(identity) {
 function principalUrlFromConfig(value) {
 	return value.startsWith(PRINCIPAL_URL_PREFIX) ? value : `${PRINCIPAL_URL_PREFIX}${encodeURIComponent(value)}`;
 }
+function principalKeyFromIdentity(identity) {
+	const colon = identity.indexOf(`:`);
+	if (colon > 0 && PRINCIPAL_KEY_PREFIXES.has(identity.slice(0, colon))) return identity;
+	return `user:${identity}`;
+}
+function defaultPullWakeOwnerPrincipal() {
+	return principalUrlFromConfig(principalKeyFromIdentity(`${userInfo().username}@${hostname()}`));
+}
 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`]));
 }
@@ -63,8 +77,8 @@ function resolvePullWakeOwnerPrincipal(env = process.env, fileEnv = readDotEnvFi
 	const principal = readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_PRINCIPAL`]);
 	if (principal) return principalUrlFromConfig(principal);
 	const identity = readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_IDENTITY`]);
-	if (identity) return principalUrlFromConfig(identity);
-	return DEFAULT_PULL_WAKE_OWNER_PRINCIPAL;
+	if (identity) return principalUrlFromConfig(principalKeyFromIdentity(identity));
+	return defaultPullWakeOwnerPrincipal();
 }
 function parseAdditionalServerHeaders(env, fileEnv) {
 	const raw = readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_SERVER_HEADERS`]);
@@ -87,6 +101,9 @@ function parseAdditionalServerHeaders(env, fileEnv) {
 function resolveServerHeaders(env, fileEnv) {
 	return mergeElectricPrincipalHeader(parseAdditionalServerHeaders(env, fileEnv), readConfigValue(env, fileEnv, [`ELECTRIC_AGENTS_PRINCIPAL`]));
 }
+function resolveBuiltinServerHeaders(env, fileEnv, ownerPrincipal) {
+	return mergeHeaders(resolveServerHeaders(env, fileEnv), mergeElectricPrincipalHeader(void 0, ownerPrincipal));
+}
 function mergeHeaders(...sources) {
 	const headers = new Headers();
 	for (const source of sources) {
@@ -225,7 +242,7 @@ async function startBuiltinAgentsServer(options, params = {}) {
 	const anthropicApiKey = resolveAnthropicApiKey(options, env, fileEnv);
 	const runnerId = resolvePullWakeRunnerId(env, fileEnv);
 	const ownerPrincipal = resolvePullWakeOwnerPrincipal(env, fileEnv);
-	const serverHeaders = mergeHeaders(resolveServerHeaders(env, fileEnv));
+	const serverHeaders = resolveBuiltinServerHeaders(env, fileEnv, ownerPrincipal);
 	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 });
@@ -233,6 +250,7 @@ async function startBuiltinAgentsServer(options, params = {}) {
 		agentServerUrl,
 		workingDirectory: cwd,
 		loadProjectMcpConfig: true,
+		durableStreamsFetchCache: false,
 		pullWake: {
 			runnerId,
 			ownerPrincipal,
@@ -254,4 +272,4 @@ async function startBuiltinAgentsServer(options, params = {}) {
 }
 
 //#endregion
-export { getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerPrincipal, resolvePullWakeRunnerId, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer };
+export { getStartedBuiltinAgentsMessage, getStartedEnvironmentMessage, getStoppedEnvironmentMessage, readDotEnvFile, resolveAnthropicApiKey, resolveBuiltinServerHeaders, resolveComposeProjectName, resolveElectricAgentsPort, resolvePullWakeOwnerPrincipal, resolvePullWakeRunnerId, startBuiltinAgentsServer, startElectricAgentsDevEnvironment, stopElectricAgentsDevEnvironment, waitForElectricAgentsServer };

package/dist/{version-BXm4o7Lz.js → version-D62IOgCl.js}

@@ -40,13 +40,15 @@ function resolveAnthropicApiKey(options, env = process.env, fileEnv = readDotEnv
 * Default Docker image tags used by the CLI when launching
 * the dev environment via docker compose.
 *
-* For release builds these remain "latest".
+* For release builds the agents-server image is pinned to the matching
+* @electric-ax/agents-server version by the tsdown build.
 * The canary CI overwrites them to "canary" before building.
 */
-const injectedCliVersion = `0.2.21`;
+const injectedCliVersion = `0.2.23`;
+const injectedAgentsServerImageTag = `0.6.3`;
 const ELECTRIC_AX_CLI_VERSION = injectedCliVersion.startsWith(`__ELECTRIC_AX_`) ? `0.0.0` : injectedCliVersion;
 const ELECTRIC_IMAGE_TAG = `latest`;
-const ELECTRIC_AGENTS_SERVER_IMAGE_TAG = `latest`;
+const ELECTRIC_AGENTS_SERVER_IMAGE_TAG = injectedAgentsServerImageTag.startsWith(`__ELECTRIC_`) ? `latest` : injectedAgentsServerImageTag;
 
 //#endregion
 export { ELECTRIC_AGENTS_SERVER_IMAGE_TAG, ELECTRIC_AX_CLI_VERSION, ELECTRIC_IMAGE_TAG, readDotEnvFile as readDotEnvFile$1, resolveAnthropicApiKey as resolveAnthropicApiKey$1 };

package/dist/{version-BU1gpSFU.cjs → version-Dp_ZxaMK.cjs}

@@ -42,13 +42,15 @@ function resolveAnthropicApiKey(options, env = process.env, fileEnv = readDotEnv
 * Default Docker image tags used by the CLI when launching
 * the dev environment via docker compose.
 *
-* For release builds these remain "latest".
+* For release builds the agents-server image is pinned to the matching
+* @electric-ax/agents-server version by the tsdown build.
 * The canary CI overwrites them to "canary" before building.
 */
-const injectedCliVersion = `0.2.21`;
+const injectedCliVersion = `0.2.23`;
+const injectedAgentsServerImageTag = `0.6.3`;
 const ELECTRIC_AX_CLI_VERSION = injectedCliVersion.startsWith(`__ELECTRIC_AX_`) ? `0.0.0` : injectedCliVersion;
 const ELECTRIC_IMAGE_TAG = `latest`;
-const ELECTRIC_AGENTS_SERVER_IMAGE_TAG = `latest`;
+const ELECTRIC_AGENTS_SERVER_IMAGE_TAG = injectedAgentsServerImageTag.startsWith(`__ELECTRIC_`) ? `latest` : injectedAgentsServerImageTag;
 
 //#endregion
 Object.defineProperty(exports, 'ELECTRIC_AGENTS_SERVER_IMAGE_TAG', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electric-ax",
-  "version": "0.2.21",
+  "version": "0.2.23",
   "description": "CLI for Electric Agents",
   "author": "ElectricSQL team and contributors",
   "license": "Apache-2.0",
@@ -39,15 +39,15 @@
   "dependencies": {
     "@durable-streams/client": "^0.2.6",
     "@durable-streams/state": "^0.3.1",
-    "@electric-sql/client": "^1.5.21",
-    "@tanstack/db": "^0.6.4",
+    "@electric-sql/client": "^1.5.22",
+    "@tanstack/db": "^0.6.6",
     "@tanstack/react-db": "^0.1.85",
     "commander": "^13.1.0",
     "ink": "^6.8.0",
     "omelette": "^0.4.17",
     "react": "^19.2.0",
-    "@electric-ax/agents": "0.6.1",
-    "@electric-ax/agents-runtime": "0.6.1"
+    "@electric-ax/agents": "0.6.3",
+    "@electric-ax/agents-runtime": "0.6.3"
   },
   "devDependencies": {
     "@vitest/coverage-v8": "^4.1.0",
@@ -57,7 +57,7 @@
     "ink-testing-library": "^4.0.0",
     "tsdown": "^0.9.0",
     "tsx": "^4.19.2",
-    "typescript": "^5.7.2",
+    "typescript": "^5.9.3",
     "vitest": "^4.1.0"
   },
   "files": [