@electric-ax/agents 0.4.13 → 0.4.14

package/dist/entrypoint.js

@@ -4,7 +4,7 @@ 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, getMoonshotModel, 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";
@@ -989,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`,
@@ -1068,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));
@@ -1197,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);
 }
@@ -1256,8 +1273,10 @@ 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);
@@ -1271,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`);
@@ -1280,15 +1299,16 @@ 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)}`);
 			}
@@ -1315,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,
 			sources: {
-				skills_catalog: {
-					content: () => skillsRegistry.renderCatalog(2e3),
-					max: 2e3,
-					cache: `stable`
-				},
+				...loadedSkills.sources,
 				conversation: {
 					content: () => ctx.timelineMessages(),
 					cache: `volatile`
@@ -1408,6 +1420,7 @@ function registerHorton(registry, options) {
 			subject_value: `user`,
 			permission: `manage`
 		}],
+		slashCommands: buildSkillSlashCommands(skillsRegistry),
 		handler: assistantHandler
 	});
 	return [`horton`];

package/dist/index.cjs

@@ -1002,6 +1002,8 @@ function modelInputSchemaDefs(catalog) {
 const HORTON_MODEL = `claude-sonnet-4-6`;
 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`,
@@ -1081,6 +1083,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));
@@ -1210,8 +1223,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);
 }
@@ -1269,8 +1286,10 @@ 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 = (0, __electric_ax_agents_runtime.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);
@@ -1284,7 +1303,7 @@ function createAssistantHandler(options) {
 				modelCatalog,
 				logPrefix: `[horton ${ctx.entityUrl}]`
 			}),
-			...skillsRegistry && skillsRegistry.catalog.size > 0 ? (0, __electric_ax_agents_runtime.createSkillTools)(skillsRegistry, ctx) : [],
+			...loadedSkills.tools,
 			...__electric_ax_agents_mcp.mcp.tools()
 		];
 		const hasEventSourceTools = tools.some((tool) => getToolName(tool) === `list_event_sources`);
@@ -1293,15 +1312,16 @@ 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)}`);
 			}
@@ -1328,21 +1348,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,
 			sources: {
-				skills_catalog: {
-					content: () => skillsRegistry.renderCatalog(2e3),
-					max: 2e3,
-					cache: `stable`
-				},
+				...loadedSkills.sources,
 				conversation: {
 					content: () => ctx.timelineMessages(),
 					cache: `volatile`
@@ -1421,6 +1433,7 @@ function registerHorton(registry, options) {
 			subject_value: `user`,
 			permission: `manage`
 		}],
+		slashCommands: (0, __electric_ax_agents_runtime.buildSkillSlashCommands)(skillsRegistry),
 		handler: assistantHandler
 	});
 	return [`horton`];

package/dist/index.js

@@ -1,7 +1,7 @@
 import { mergeElectricPrincipalHeader } from "./server-headers-KD5yHFYT.js";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import { MOONSHOT_API_BASE_URL, MOONSHOT_PROVIDER, appendPathToUrl, completeWithLowCostModel, createEntityRegistry, createPullWakeRunner, createRuntimeHandler, createSkillTools, createSkillsRegistry, db, detectAvailableProviders, getMoonshotApiKey, getMoonshotModel, 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, braveSearchTool as braveSearchTool$1, createBashTool, createEditTool, createEventSourceTools, createFetchUrlTool, createReadFileTool, createSendTool, createWriteTool } from "@electric-ax/agents-runtime/tools";
 import { chooseDefaultSandbox, isE2BAvailable, remoteSandbox } from "@electric-ax/agents-runtime/sandbox";
 import fsSync from "node:fs";
@@ -978,6 +978,8 @@ function modelInputSchemaDefs(catalog) {
 const HORTON_MODEL = `claude-sonnet-4-6`;
 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`,
@@ -1057,6 +1059,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));
@@ -1186,8 +1199,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);
 }
@@ -1245,8 +1262,10 @@ 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);
@@ -1260,7 +1279,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`);
@@ -1269,15 +1288,16 @@ 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)}`);
 			}
@@ -1304,21 +1324,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,
 			sources: {
-				skills_catalog: {
-					content: () => skillsRegistry.renderCatalog(2e3),
-					max: 2e3,
-					cache: `stable`
-				},
+				...loadedSkills.sources,
 				conversation: {
 					content: () => ctx.timelineMessages(),
 					cache: `volatile`
@@ -1397,6 +1409,7 @@ function registerHorton(registry, options) {
 			subject_value: `user`,
 			permission: `manage`
 		}],
+		slashCommands: buildSkillSlashCommands(skillsRegistry),
 		handler: assistantHandler
 	});
 	return [`horton`];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electric-ax/agents",
-  "version": "0.4.13",
+  "version": "0.4.14",
   "description": "Built-in Electric Agents runtimes such as Horton and worker",
   "repository": {
     "type": "git",
@@ -50,7 +50,7 @@
     "undici": "^7.24.7",
     "zod": "^4.3.6",
     "@electric-ax/agents-mcp": "0.2.2",
-    "@electric-ax/agents-runtime": "0.3.9"
+    "@electric-ax/agents-runtime": "0.3.10"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",