@electric-ax/agents 0.4.12 → 0.4.14

package/dist/entrypoint.js

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 import path from "node:path";
+import { Agent, cacheStores, interceptors, setGlobalDispatcher } from "undici";
 import fs from "node:fs";
 import pino from "pino";
 import { fileURLToPath } from "node:url";
-import { MOONSHOT_API_BASE_URL, MOONSHOT_PROVIDER, appendPathToUrl, completeWithLowCostModel, createEntityRegistry, createPullWakeRunner, createRuntimeHandler, createSkillTools, createSkillsRegistry, db, detectAvailableProviders, getMoonshotApiKey, getMoonshotModels, readCodexAccessToken, registerToolProvider, unregisterToolProvider } from "@electric-ax/agents-runtime";
+import { MOONSHOT_API_BASE_URL, MOONSHOT_PROVIDER, appendPathToUrl, buildSkillSlashCommands, completeWithLowCostModel, createContextSkillLoader, createEntityRegistry, createPullWakeRunner, createRuntimeHandler, createSkillsRegistry, db, detectAvailableProviders, getMoonshotApiKey, getMoonshotModel, getMoonshotModels, readCodexAccessToken, registerToolProvider, unregisterToolProvider } from "@electric-ax/agents-runtime";
 import { braveSearchTool, createBashTool, createEditTool, createEventSourceTools, createFetchUrlTool, createReadFileTool, createSendTool, createWriteTool } from "@electric-ax/agents-runtime/tools";
 import { chooseDefaultSandbox, isE2BAvailable, remoteSandbox } from "@electric-ax/agents-runtime/sandbox";
 import { z } from "zod";
@@ -16,6 +17,18 @@ import { nanoid } from "nanoid";
 import { getModels } from "@mariozechner/pi-ai";
 import { bridgeMcpTool, buildPromptTools, buildResourceTools, createRegistry, keychainPersistence, loadConfig, mcp, watchConfig } from "@electric-ax/agents-mcp";
 
+//#region src/durable-streams-cache.ts
+const MEMORY_CACHE_SIZE_BYTES = 100 * 1024 * 1024;
+function installDurableStreamsFetchCache(options = {}) {
+	if (options === false) return;
+	const store = options.store === `sqlite` || options.sqliteLocation ? new cacheStores.SqliteCacheStore({
+		location: options.sqliteLocation,
+		maxCount: options.maxCount
+	}) : new cacheStores.MemoryCacheStore({ maxSize: MEMORY_CACHE_SIZE_BYTES });
+	setGlobalDispatcher(new Agent().compose(interceptors.cache({ store })));
+}
+
+//#endregion
 //#region src/log.ts
 const LOG_LEVEL = process.env.ELECTRIC_AGENTS_LOG_LEVEL ?? `info`;
 const IS_ELECTRON_MAIN = Boolean(process.versions.electron);
@@ -865,6 +878,15 @@ async function fetchAvailableModelIds(provider) {
 function knownModelsForProvider(provider) {
 	return provider === MOONSHOT_PROVIDER ? getMoonshotModels() : getModels(provider);
 }
+function resolveBuiltinModelContextWindow(modelConfig) {
+	const modelId = String(modelConfig.model);
+	if (modelConfig.provider === MOONSHOT_PROVIDER) return getMoonshotModel(modelId)?.contextWindow ?? null;
+	if (!modelConfig.provider) return null;
+	return knownModelsForProvider(modelConfig.provider).find((model) => model.id === modelId)?.contextWindow ?? null;
+}
+function resolveBuiltinModelSourceBudget(modelConfig) {
+	return resolveBuiltinModelContextWindow(modelConfig) ?? 1e5;
+}
 function choiceForKnownModel(provider, model) {
 	return {
 		provider,
@@ -967,6 +989,8 @@ function modelInputSchemaDefs(catalog) {
 //#region src/agents/horton.ts
 const TITLE_SYSTEM_PROMPT = "You generate concise chat session titles in 3-5 words. Respond with only the title, no quotes, no punctuation, no preamble.";
 const TITLE_USER_PROMPT = (userMessage) => `User request:\n${userMessage}`;
+const TITLE_GENERATION_TIMEOUT_MS = 8e3;
+const HORTON_SKILLS_SLASH_COMMAND_OWNER = `horton:skills`;
 const TITLE_STOP_WORDS = new Set([
 	`a`,
 	`an`,
@@ -1046,6 +1070,17 @@ function createConfiguredTitleCall(catalog, modelConfig, logPrefix) {
 		maxTokens: 64
 	});
 }
+function withTimeout(promise, ms, description) {
+	let timeout;
+	const timeoutPromise = new Promise((_resolve, reject) => {
+		timeout = setTimeout(() => {
+			reject(new Error(`${description} timed out after ${ms}ms`));
+		}, ms);
+	});
+	return Promise.race([promise, timeoutPromise]).finally(() => {
+		if (timeout) clearTimeout(timeout);
+	});
+}
 async function generateTitle(userMessage, llmCall, onFallback) {
 	try {
 		const raw = await llmCall(TITLE_USER_PROMPT(userMessage));
@@ -1175,8 +1210,12 @@ function payloadToTitleText(payload) {
 	if (typeof payload === `string`) return payload;
 	if (payload == null) return ``;
 	if (typeof payload === `object`) {
-		const text = payload.text;
-		return typeof text === `string` ? text : JSON.stringify(payload);
+		const record = payload;
+		const text = record.text;
+		if (typeof text === `string`) return text;
+		const source = record.source;
+		if (typeof source === `string`) return source;
+		return JSON.stringify(payload);
 	}
 	return String(payload);
 }
@@ -1234,10 +1273,13 @@ async function readAgentsMd(sandbox) {
 }
 function createAssistantHandler(options) {
 	const { streamFn, docsSupport, docsSearchTool, skillsRegistry, modelCatalog, docsUrl } = options;
-	const hasSkills = Boolean(skillsRegistry && skillsRegistry.catalog.size > 0);
+	const skillLoader = createContextSkillLoader(skillsRegistry, { slashCommandOwner: HORTON_SKILLS_SLASH_COMMAND_OWNER });
+	const hasSkills = skillLoader.hasSkills;
 	return async function assistantHandler(ctx, wake) {
+		const loadedSkills = await skillLoader.load(ctx);
 		const readSet = new Set();
 		const modelConfig = resolveBuiltinModelConfig(modelCatalog, ctx.args);
+		const sourceBudget = resolveBuiltinModelSourceBudget(modelConfig);
 		const sandboxCwd = ctx.sandbox.workingDirectory;
 		const agentsMd = await readAgentsMd(ctx.sandbox);
 		const tools = [
@@ -1248,7 +1290,7 @@ function createAssistantHandler(options) {
 				modelCatalog,
 				logPrefix: `[horton ${ctx.entityUrl}]`
 			}),
-			...skillsRegistry && skillsRegistry.catalog.size > 0 ? createSkillTools(skillsRegistry, ctx) : [],
+			...loadedSkills.tools,
 			...mcp.tools()
 		];
 		const hasEventSourceTools = tools.some((tool) => getToolName(tool) === `list_event_sources`);
@@ -1257,21 +1299,22 @@ function createAssistantHandler(options) {
 			if (!firstUserMessage) return;
 			let title = null;
 			try {
-				const result = await generateTitle(firstUserMessage, createConfiguredTitleCall(modelCatalog, modelConfig, `[horton ${ctx.entityUrl}]`), (reason) => {
+				const result = await generateTitle(firstUserMessage, (prompt) => withTimeout(createConfiguredTitleCall(modelCatalog, modelConfig, `[horton ${ctx.entityUrl}]`)(prompt), TITLE_GENERATION_TIMEOUT_MS, `title generation`), (reason) => {
 					serverLog.warn(`[horton ${ctx.entityUrl}] title generation fell back to local title: ${reason}`);
 				});
 				if (result.length > 0) title = result;
 			} catch (err) {
 				serverLog.warn(`[horton ${ctx.entityUrl}] title generation failed: ${err instanceof Error ? err.message : String(err)}`);
+				title = buildFallbackTitle(firstUserMessage);
 			}
 			if (title !== null) try {
-				await ctx.setTag(`title`, title);
+				await withTimeout(ctx.setTag(`title`, title), TITLE_GENERATION_TIMEOUT_MS, `set title tag`);
 			} catch (err) {
 				serverLog.warn(`[horton ${ctx.entityUrl}] setTag failed: ${err instanceof Error ? err.message : String(err)}`);
 			}
 		})() : Promise.resolve();
 		if (docsSupport) ctx.useContext({
-			sourceBudget: 1e5,
+			sourceBudget,
 			sources: {
 				docs_toc: {
 					content: () => docsSupport.renderCompressedToc(),
@@ -1292,21 +1335,13 @@ function createAssistantHandler(options) {
 					max: 2e4,
 					cache: `stable`
 				} } : {},
-				...skillsRegistry && skillsRegistry.catalog.size > 0 ? { skills_catalog: {
-					content: () => skillsRegistry.renderCatalog(2e3),
-					max: 2e3,
-					cache: `stable`
-				} } : {}
+				...skillsRegistry && skillsRegistry.catalog.size > 0 ? loadedSkills.sources : {}
 			}
 		});
 		else if (skillsRegistry && skillsRegistry.catalog.size > 0) ctx.useContext({
-			sourceBudget: 1e5,
+			sourceBudget,
 			sources: {
-				skills_catalog: {
-					content: () => skillsRegistry.renderCatalog(2e3),
-					max: 2e3,
-					cache: `stable`
-				},
+				...loadedSkills.sources,
 				conversation: {
 					content: () => ctx.timelineMessages(),
 					cache: `volatile`
@@ -1319,7 +1354,7 @@ function createAssistantHandler(options) {
 			}
 		});
 		else if (agentsMd) ctx.useContext({
-			sourceBudget: 1e5,
+			sourceBudget,
 			sources: {
 				conversation: {
 					content: () => ctx.timelineMessages(),
@@ -1376,6 +1411,16 @@ function registerHorton(registry, options) {
 	registry.define(`horton`, {
 		description: `Friendly capable assistant — chat, code, research, dispatch`,
 		creationSchema: hortonCreationSchema,
+		permissionGrants: [{
+			subject_kind: `principal_kind`,
+			subject_value: `user`,
+			permission: `spawn`
+		}, {
+			subject_kind: `principal_kind`,
+			subject_value: `user`,
+			permission: `manage`
+		}],
+		slashCommands: buildSkillSlashCommands(skillsRegistry),
 		handler: assistantHandler
 	});
 	return [`horton`];
@@ -1417,7 +1462,7 @@ function parseWorkerArgs(value) {
 	if (typeof value.reasoningEffort === `string` && REASONING_EFFORT_VALUES.includes(value.reasoningEffort)) args.reasoningEffort = value.reasoningEffort;
 	return args;
 }
-function buildToolsForWorker(tools, sandbox, ctx, readSet) {
+function buildToolsForWorker(tools, sandbox, ctx, readSet, opts) {
 	const out = [];
 	for (const name of tools) switch (name) {
 		case `bash`:
@@ -1436,7 +1481,10 @@ function buildToolsForWorker(tools, sandbox, ctx, readSet) {
 			out.push(braveSearchTool);
 			break;
 		case `fetch_url`:
-			out.push(createFetchUrlTool(sandbox));
+			out.push(createFetchUrlTool(sandbox, {
+				catalog: opts.modelCatalog,
+				modelConfig: opts.modelConfig
+			}));
 			break;
 		case `spawn_worker`:
 			out.push(createSpawnWorkerTool(ctx));
@@ -1547,11 +1595,23 @@ function registerWorker(registry, options) {
 	const { streamFn, modelCatalog } = options;
 	registry.define(`worker`, {
 		description: `Internal — generic worker spawned by other agents. Configure via spawn args (systemPrompt + tools + optional sharedDb).`,
+		permissionGrants: [{
+			subject_kind: `principal_kind`,
+			subject_value: `user`,
+			permission: `spawn`
+		}, {
+			subject_kind: `principal_kind`,
+			subject_value: `user`,
+			permission: `manage`
+		}],
 		async handler(ctx) {
 			const args = parseWorkerArgs(ctx.args);
 			const readSet = new Set();
-			const builtinTools = buildToolsForWorker(args.tools, ctx.sandbox, ctx, readSet);
 			const modelConfig = resolveBuiltinModelConfig(modelCatalog, args);
+			const builtinTools = buildToolsForWorker(args.tools, ctx.sandbox, ctx, readSet, {
+				modelCatalog,
+				modelConfig
+			});
 			const sharedStateTools = [];
 			if (args.sharedDb) {
 				const shared = await ctx.observe(db(args.sharedDb.id, args.sharedDb.schema));
@@ -1743,6 +1803,8 @@ var BuiltinAgentsServer = class {
 	mcpToolProviderName = null;
 	mcpApplyInFlight = new Set();
 	mcpStopping = false;
+	mcpExtras = [];
+	mcpLastJsonConfig = null;
 	pullWakeRunner = null;
 	options;
 	constructor(options) {
@@ -1752,8 +1814,70 @@ var BuiltinAgentsServer = class {
 	get mcpRegistry() {
 		return this._mcpRegistry;
 	}
+	/**
+	* Replace the in-memory `extras` list and re-apply the merged config
+	* against the last-known workspace `mcp.json` state. Workspace
+	* `mcp.json` still wins on name collision. No-op once `stop()` has
+	* latched `mcpStopping`.
+	*/
+	async setExtraMcpServers(extras) {
+		if (!this._mcpRegistry || this.mcpStopping) return;
+		this.mcpExtras = extras;
+		await this.applyMerged(this.mcpLastJsonConfig);
+	}
+	async wirePersistence(cfg) {
+		const servers = [];
+		for (const s of cfg.servers) if (s.transport === `http` && s.auth?.mode === `authorizationCode`) {
+			const persist = await keychainPersistence({ server: s.name });
+			servers.push({
+				...s,
+				auth: {
+					...s.auth,
+					...persist
+				}
+			});
+		} else servers.push(s);
+		return {
+			...cfg,
+			servers
+		};
+	}
+	mergeMcp(jsonCfg) {
+		const jsonServers = jsonCfg?.servers ?? [];
+		const jsonNames = new Set(jsonServers.map((s) => s.name));
+		const filteredExtras = this.mcpExtras.filter((s) => !jsonNames.has(s.name));
+		return {
+			servers: [...filteredExtras, ...jsonServers],
+			raw: jsonCfg?.raw
+		};
+	}
+	async runApply(jsonCfg) {
+		if (this.mcpStopping) return;
+		const registry = this._mcpRegistry;
+		if (!registry) return;
+		try {
+			const wired = await this.wirePersistence(this.mergeMcp(jsonCfg));
+			if (this.mcpStopping) return;
+			await registry.applyConfig(wired);
+		} catch (e) {
+			serverLog.error(`[mcp] applyConfig:`, e);
+			try {
+				this.options.onConfigError?.(e);
+			} catch (cbErr) {
+				serverLog.error(`[mcp] onConfigError callback failed:`, cbErr);
+			}
+		}
+	}
+	applyMerged(jsonCfg) {
+		this.mcpLastJsonConfig = jsonCfg;
+		const p = this.runApply(jsonCfg);
+		this.mcpApplyInFlight.add(p);
+		p.finally(() => this.mcpApplyInFlight.delete(p));
+		return p;
+	}
 	async start() {
 		if (this.bootstrap || this.pullWakeRunner) throw new Error(`Builtin agents runtime already started`);
+		installDurableStreamsFetchCache(this.options.durableStreamsFetchCache);
 		const pullWake = this.options.pullWake;
 		if (!pullWake?.runnerId) throw new Error(`Builtin agents require a pull-wake runner id`);
 		try {
@@ -1764,76 +1888,28 @@ var BuiltinAgentsServer = class {
 			});
 			this._mcpRegistry = mcpRegistry;
 			const mcpConfigPath = this.options.loadProjectMcpConfig ? path.resolve(this.options.workingDirectory ?? process.cwd(), `mcp.json`) : null;
-			const extras = this.options.extraMcpServers ?? [];
-			const wirePersistence = async (cfg) => {
-				const servers = [];
-				for (const s of cfg.servers) if (s.transport === `http` && s.auth?.mode === `authorizationCode`) {
-					const persist = await keychainPersistence({ server: s.name });
-					servers.push({
-						...s,
-						auth: {
-							...s.auth,
-							...persist
-						}
-					});
-				} else servers.push(s);
-				return {
-					...cfg,
-					servers
-				};
-			};
-			const merge = (jsonCfg) => {
-				const jsonServers = jsonCfg?.servers ?? [];
-				const jsonNames = new Set(jsonServers.map((s) => s.name));
-				const filteredExtras = extras.filter((s) => !jsonNames.has(s.name));
-				return {
-					servers: [...filteredExtras, ...jsonServers],
-					raw: jsonCfg?.raw
-				};
-			};
-			const onConfigError = this.options.onConfigError;
-			const runApply = async (jsonCfg) => {
-				if (this.mcpStopping) return;
-				try {
-					const wired = await wirePersistence(merge(jsonCfg));
-					if (this.mcpStopping) return;
-					await mcpRegistry.applyConfig(wired);
-				} catch (e) {
-					serverLog.error(`[mcp] applyConfig:`, e);
-					try {
-						onConfigError?.(e);
-					} catch (cbErr) {
-						serverLog.error(`[mcp] onConfigError callback failed:`, cbErr);
-					}
-				}
-			};
-			const applyMerged = (jsonCfg) => {
-				const p = runApply(jsonCfg);
-				this.mcpApplyInFlight.add(p);
-				p.finally(() => this.mcpApplyInFlight.delete(p));
-				return p;
-			};
+			this.mcpExtras = this.options.extraMcpServers ?? [];
 			if (mcpConfigPath) {
 				try {
 					const cfg = await loadConfig(mcpConfigPath, process.env);
-					applyMerged(cfg);
+					this.applyMerged(cfg);
 				} catch (err) {
 					if (err.code !== `ENOENT`) throw err;
-					if (extras.length === 0) serverLog.info(`[mcp] no ${mcpConfigPath} — starting with no servers`);
-					else serverLog.info(`[mcp] no ${mcpConfigPath} — starting with ${extras.length} server(s) from extras`);
-					applyMerged(null);
+					if (this.mcpExtras.length === 0) serverLog.info(`[mcp] no ${mcpConfigPath} — starting with no servers`);
+					else serverLog.info(`[mcp] no ${mcpConfigPath} — starting with ${this.mcpExtras.length} server(s) from extras`);
+					this.applyMerged(null);
 				}
 				try {
 					this.mcpWatcherCloser = await watchConfig(mcpConfigPath, {
-						onChange: (cfg) => void applyMerged(cfg),
+						onChange: (cfg) => void this.applyMerged(cfg),
 						onError: (e) => serverLog.error(`[mcp] config error:`, e)
 					});
 				} catch (e) {
 					serverLog.error(`[mcp] config watcher failed to start:`, e);
 				}
 			} else {
-				if (extras.length > 0) serverLog.info(`[mcp] starting with ${extras.length} server(s) from extras`);
-				applyMerged(null);
+				if (this.mcpExtras.length > 0) serverLog.info(`[mcp] starting with ${this.mcpExtras.length} server(s) from extras`);
+				this.applyMerged(null);
 			}
 			this.mcpToolProviderName = `mcp`;
 			registerToolProvider({