@electric-ax/agents 0.4.9 → 0.4.10

package/dist/entrypoint.js

@@ -3,7 +3,7 @@ import path from "node:path";
 import fs from "node:fs";
 import pino from "pino";
 import { fileURLToPath } from "node:url";
-import { appendPathToUrl, completeWithLowCostModel, createEntityRegistry, createPullWakeRunner, createRuntimeHandler, createSkillTools, createSkillsRegistry, db, detectAvailableProviders, readCodexAccessToken, registerToolProvider, unregisterToolProvider } from "@electric-ax/agents-runtime";
+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 { braveSearchTool, createBashTool, createEditTool, createEventSourceTools, createFetchUrlTool, createReadFileTool, createSendTool, createWriteTool, fetchUrlTool } from "@electric-ax/agents-runtime/tools";
 import { z } from "zod";
 import { createHash } from "node:crypto";
@@ -774,6 +774,7 @@ function createSpawnWorkerTool(ctx, modelConfig) {
 
 //#endregion
 //#region src/model-catalog.ts
+const MODEL_INPUTS_SCHEMA_DEF = `electricModelInputs`;
 const REASONING_EFFORT_VALUES = [
 	`auto`,
 	`minimal`,
@@ -785,13 +786,15 @@ const DEFAULT_ANTHROPIC_MODEL = `claude-sonnet-4-6`;
 const DEFAULT_OPENAI_MODEL = `gpt-4.1`;
 const DEFAULT_CODEX_MODEL = `gpt-5.4`;
 const DEFAULT_DEEPSEEK_MODEL = `deepseek-v4-flash`;
+const DEFAULT_MOONSHOT_MODEL = `kimi-k2.6`;
 function modelValue(provider, id) {
 	return `${provider}:${id}`;
 }
-function providerLabel(provider) {
+function builtinModelProviderLabel(provider) {
 	if (provider === `anthropic`) return `Anthropic`;
 	if (provider === `openai-codex`) return `OpenAI Codex`;
 	if (provider === `deepseek`) return `DeepSeek`;
+	if (provider === MOONSHOT_PROVIDER) return `Kimi`;
 	return `OpenAI`;
 }
 function configuredProviders() {
@@ -803,7 +806,8 @@ function mockFallbackCatalog() {
 		id: DEFAULT_ANTHROPIC_MODEL,
 		label: `Anthropic ${DEFAULT_ANTHROPIC_MODEL}`,
 		value: modelValue(`anthropic`, DEFAULT_ANTHROPIC_MODEL),
-		reasoning: true
+		reasoning: true,
+		input: [`text`, `image`]
 	};
 	return {
 		choices: [fallback],
@@ -821,6 +825,9 @@ async function fetchAvailableModelIds(provider) {
 		}) : provider === `deepseek` ? await fetch(`https://api.deepseek.com/v1/models`, {
 			headers: { authorization: `Bearer ${process.env.DEEPSEEK_API_KEY ?? ``}` },
 			signal: AbortSignal.timeout(3e3)
+		}) : provider === MOONSHOT_PROVIDER ? await fetch(`${MOONSHOT_API_BASE_URL}/models`, {
+			headers: { authorization: `Bearer ${getMoonshotApiKey() ?? ``}` },
+			signal: AbortSignal.timeout(3e3)
 		}) : await fetch(`https://api.openai.com/v1/models`, {
 			headers: { authorization: `Bearer ${process.env.OPENAI_API_KEY ?? ``}` },
 			signal: AbortSignal.timeout(3e3)
@@ -834,24 +841,42 @@ async function fetchAvailableModelIds(provider) {
 		return null;
 	}
 }
-async function choicesForProvider(provider) {
-	const knownModels = getModels(provider);
-	if (provider === `openai-codex`) return knownModels.map((model) => ({
+function knownModelsForProvider(provider) {
+	return provider === MOONSHOT_PROVIDER ? getMoonshotModels() : getModels(provider);
+}
+function choiceForKnownModel(provider, model) {
+	return {
 		provider,
 		id: model.id,
-		label: `${providerLabel(provider)} ${model.name}`,
+		label: `${builtinModelProviderLabel(provider)} ${model.name}`,
 		value: modelValue(provider, model.id),
-		reasoning: model.reasoning
-	}));
+		reasoning: model.reasoning,
+		input: model.input
+	};
+}
+function listBuiltinModelChoices(providers) {
+	return providers.flatMap((provider) => knownModelsForProvider(provider).map((model) => choiceForKnownModel(provider, model)));
+}
+async function choicesForProvider(provider) {
+	const knownChoices = listBuiltinModelChoices([provider]);
+	if (provider === `openai-codex`) return knownChoices;
 	const availableIds = await fetchAvailableModelIds(provider);
-	const models = availableIds === null ? knownModels : knownModels.filter((model) => availableIds.has(model.id));
-	return models.map((model) => ({
-		provider,
-		id: model.id,
-		label: `${providerLabel(provider)} ${model.name}`,
-		value: modelValue(provider, model.id),
-		reasoning: model.reasoning
-	}));
+	return availableIds === null ? knownChoices : knownChoices.filter((choice) => availableIds.has(choice.id));
+}
+function enabledModelSet(values) {
+	if (!values) return null;
+	const enabled = new Set();
+	for (const value of values) {
+		const trimmed = value.trim();
+		if (trimmed) enabled.add(trimmed);
+	}
+	return enabled.size > 0 ? enabled : null;
+}
+function filterChoicesByEnabledModels(choices, values) {
+	const enabled = enabledModelSet(values);
+	if (!enabled) return choices;
+	const filtered = choices.filter((choice) => enabled.has(choice.value));
+	return filtered.length > 0 ? filtered : choices;
 }
 function withProviderPayloadDefaults(config, choice, reasoningEffort) {
 	if (choice.provider !== `openai` && choice.provider !== `openai-codex` || !choice.reasoning) return config;
@@ -879,9 +904,10 @@ function parseReasoningEffort(value) {
 async function createBuiltinModelCatalog(options = {}) {
 	const providers = configuredProviders();
 	if (providers.length === 0 && options.allowMockFallback) return mockFallbackCatalog();
-	const choices = (await Promise.all(providers.map((provider) => choicesForProvider(provider)))).flat();
+	const providerChoices = (await Promise.all(providers.map((provider) => choicesForProvider(provider)))).flat();
+	const choices = filterChoicesByEnabledModels(providerChoices, options.enabledModelValues);
 	if (choices.length === 0) return options.allowMockFallback ? mockFallbackCatalog() : null;
-	const defaultChoice = choices.find((choice) => choice.provider === `anthropic` && choice.id === DEFAULT_ANTHROPIC_MODEL) ?? choices.find((choice) => choice.provider === `openai` && choice.id === DEFAULT_OPENAI_MODEL) ?? choices.find((choice) => choice.provider === `openai-codex` && choice.id === DEFAULT_CODEX_MODEL) ?? choices.find((choice) => choice.provider === `deepseek` && choice.id === DEFAULT_DEEPSEEK_MODEL) ?? choices[0];
+	const defaultChoice = choices.find((choice) => choice.provider === `anthropic` && choice.id === DEFAULT_ANTHROPIC_MODEL) ?? choices.find((choice) => choice.provider === `openai` && choice.id === DEFAULT_OPENAI_MODEL) ?? choices.find((choice) => choice.provider === `openai-codex` && choice.id === DEFAULT_CODEX_MODEL) ?? choices.find((choice) => choice.provider === `deepseek` && choice.id === DEFAULT_DEEPSEEK_MODEL) ?? choices.find((choice) => choice.provider === MOONSHOT_PROVIDER && choice.id === DEFAULT_MOONSHOT_MODEL) ?? choices[0];
 	return {
 		choices,
 		defaultChoice
@@ -897,13 +923,24 @@ function resolveBuiltinModelConfig(catalog, args) {
 		provider: choice.provider,
 		model: choice.id,
 		...reasoningEffort && { reasoningEffort },
-		...choice.provider === `openai-codex` && { getApiKey: () => readCodexAccessToken() }
+		...choice.provider === `openai-codex` && { getApiKey: () => readCodexAccessToken() },
+		...choice.provider === MOONSHOT_PROVIDER && { getApiKey: () => getMoonshotApiKey() }
 	};
 	return withProviderPayloadDefaults(config, choice, reasoningEffort);
 }
 function modelChoiceValues(catalog) {
 	return catalog.choices.map((choice) => choice.value);
 }
+function modelInputSchemaDefs(catalog) {
+	return { [MODEL_INPUTS_SCHEMA_DEF]: {
+		type: `object`,
+		properties: Object.fromEntries(catalog.choices.map((choice) => [choice.value, {
+			type: `array`,
+			items: { enum: [`text`, `image`] },
+			default: choice.input
+		}]))
+	} };
+}
 
 //#endregion
 //#region src/agents/horton.ts
@@ -1122,10 +1159,40 @@ function payloadToTitleText(payload) {
 	}
 	return String(payload);
 }
+function attachmentTitleText(attachment) {
+	const mimeType = typeof attachment.mimeType === `string` ? attachment.mimeType : ``;
+	const filename = typeof attachment.filename === `string` && attachment.filename.trim() ? attachment.filename.trim() : typeof attachment.id === `string` ? attachment.id : `attachment`;
+	const kind = mimeType.startsWith(`image/`) ? `image` : `file`;
+	return `Attached ${kind}: ${filename}`;
+}
+function attachmentsForInboxMessage(ctx, inboxKey) {
+	const manifests = ctx.db.collections.manifests?.toArray;
+	if (!Array.isArray(manifests)) return [];
+	return manifests.filter((entry) => {
+		if (!entry || typeof entry !== `object`) return false;
+		const attachment = entry;
+		if (attachment.kind !== `attachment`) return false;
+		if (attachment.role !== `input`) return false;
+		const subject = attachment.subject;
+		return subject !== null && typeof subject === `object` && !Array.isArray(subject) && subject.type === `inbox` && subject.key === inboxKey;
+	});
+}
+function messageTitleText(ctx, message) {
+	const pieces = [];
+	const text = payloadToTitleText(message.payload).trim();
+	if (text) pieces.push(text);
+	const key = typeof message.key === `string` ? message.key : null;
+	const attachments = key ? attachmentsForInboxMessage(ctx, key) : [];
+	for (const attachment of attachments) {
+		const attachmentText = attachmentTitleText(attachment);
+		if (attachmentText) pieces.push(attachmentText);
+	}
+	return pieces.join(`\n`);
+}
 async function extractFirstUserMessage(ctx) {
 	const firstMessage = ctx.db.collections.inbox.toArray.filter((message) => message.from !== `system`).sort((left, right) => messageSeq(left) - messageSeq(right))[0];
 	if (!firstMessage) return null;
-	const text = payloadToTitleText(firstMessage.payload);
+	const text = messageTitleText(ctx, firstMessage);
 	return text.length > 0 ? text : null;
 }
 function messageSeq(message) {
@@ -1165,7 +1232,7 @@ function createAssistantHandler(options) {
 			...mcp.tools()
 		];
 		const hasEventSourceTools = tools.some((tool) => getToolName(tool) === `list_event_sources`);
-		const titlePromise = ctx.firstWake && !ctx.tags.title ? (async () => {
+		const titlePromise = !ctx.tags.title ? (async () => {
 			const firstUserMessage = await extractFirstUserMessage(ctx);
 			if (!firstUserMessage) return;
 			let title = null;
@@ -1286,7 +1353,7 @@ function registerHorton(registry, options) {
 		model: z.enum(modelChoiceValues(modelCatalog)).default(modelCatalog.defaultChoice.value),
 		reasoningEffort: z.enum(REASONING_EFFORT_VALUES).default(`auto`).describe(`Reasoning effort for compatible reasoning models. Auto uses a safe provider default.`),
 		workingDirectory: z.string().optional().describe(`Working directory for file operations. Defaults to the server's configured cwd.`)
-	});
+	}).meta({ $defs: modelInputSchemaDefs(modelCatalog) });
 	registry.define(`horton`, {
 		description: `Friendly capable assistant — chat, code, research, dispatch`,
 		creationSchema: hortonCreationSchema,
@@ -1506,10 +1573,13 @@ function createBuiltinElectricTools(custom) {
 	};
 }
 async function createBuiltinAgentHandler(options) {
-	const { agentServerUrl, serveEndpoint, workingDirectory, streamFn, createElectricTools, publicUrl, runtimeName, baseSkillsDir: baseSkillsDirOverride, serverHeaders, defaultDispatchPolicyForType } = options;
-	const modelCatalog = await createBuiltinModelCatalog({ allowMockFallback: Boolean(streamFn) });
+	const { agentServerUrl, serveEndpoint, workingDirectory, streamFn, enabledModelValues, createElectricTools, publicUrl, runtimeName, baseSkillsDir: baseSkillsDirOverride, serverHeaders, defaultDispatchPolicyForType } = options;
+	const modelCatalog = await createBuiltinModelCatalog({
+		allowMockFallback: Boolean(streamFn),
+		enabledModelValues
+	});
 	if (!modelCatalog) {
-		serverLog.warn(`[builtin-agents] no supported model provider API key found — set ANTHROPIC_API_KEY or OPENAI_API_KEY`);
+		serverLog.warn(`[builtin-agents] no supported model provider API key found — set ANTHROPIC_API_KEY, OPENAI_API_KEY, DEEPSEEK_API_KEY, or MOONSHOT_API_KEY`);
 		return null;
 	}
 	const cwd = workingDirectory ?? process.cwd();
@@ -1703,9 +1773,10 @@ var BuiltinAgentsServer = class {
 				publicUrl,
 				runtimeName: `builtin-agents`,
 				baseSkillsDir: this.options.baseSkillsDir,
+				enabledModelValues: this.options.enabledModelValues,
 				serverHeaders: pullWake.headers
 			});
-			if (!this.bootstrap) throw new Error(`ANTHROPIC_API_KEY or OPENAI_API_KEY must be set before starting builtin agents`);
+			if (!this.bootstrap) throw new Error(`ANTHROPIC_API_KEY, OPENAI_API_KEY, DEEPSEEK_API_KEY, or MOONSHOT_API_KEY must be set before starting builtin agents`);
 			await registerBuiltinAgentTypes(this.bootstrap);
 			const registeredRunner = pullWake.registerRunner ? await this.registerPullWakeRunner(pullWake) : null;
 			this.pullWakeRunner = createPullWakeRunner({

package/dist/index.cjs

@@ -798,6 +798,7 @@ function createSpawnWorkerTool(ctx, modelConfig) {
 
 //#endregion
 //#region src/model-catalog.ts
+const MODEL_INPUTS_SCHEMA_DEF = `electricModelInputs`;
 const REASONING_EFFORT_VALUES = [
 	`auto`,
 	`minimal`,
@@ -809,13 +810,15 @@ const DEFAULT_ANTHROPIC_MODEL = `claude-sonnet-4-6`;
 const DEFAULT_OPENAI_MODEL = `gpt-4.1`;
 const DEFAULT_CODEX_MODEL = `gpt-5.4`;
 const DEFAULT_DEEPSEEK_MODEL = `deepseek-v4-flash`;
+const DEFAULT_MOONSHOT_MODEL = `kimi-k2.6`;
 function modelValue(provider, id) {
 	return `${provider}:${id}`;
 }
-function providerLabel(provider) {
+function builtinModelProviderLabel(provider) {
 	if (provider === `anthropic`) return `Anthropic`;
 	if (provider === `openai-codex`) return `OpenAI Codex`;
 	if (provider === `deepseek`) return `DeepSeek`;
+	if (provider === __electric_ax_agents_runtime.MOONSHOT_PROVIDER) return `Kimi`;
 	return `OpenAI`;
 }
 function configuredProviders() {
@@ -827,7 +830,8 @@ function mockFallbackCatalog() {
 		id: DEFAULT_ANTHROPIC_MODEL,
 		label: `Anthropic ${DEFAULT_ANTHROPIC_MODEL}`,
 		value: modelValue(`anthropic`, DEFAULT_ANTHROPIC_MODEL),
-		reasoning: true
+		reasoning: true,
+		input: [`text`, `image`]
 	};
 	return {
 		choices: [fallback],
@@ -845,6 +849,9 @@ async function fetchAvailableModelIds(provider) {
 		}) : provider === `deepseek` ? await fetch(`https://api.deepseek.com/v1/models`, {
 			headers: { authorization: `Bearer ${process.env.DEEPSEEK_API_KEY ?? ``}` },
 			signal: AbortSignal.timeout(3e3)
+		}) : provider === __electric_ax_agents_runtime.MOONSHOT_PROVIDER ? await fetch(`${__electric_ax_agents_runtime.MOONSHOT_API_BASE_URL}/models`, {
+			headers: { authorization: `Bearer ${(0, __electric_ax_agents_runtime.getMoonshotApiKey)() ?? ``}` },
+			signal: AbortSignal.timeout(3e3)
 		}) : await fetch(`https://api.openai.com/v1/models`, {
 			headers: { authorization: `Bearer ${process.env.OPENAI_API_KEY ?? ``}` },
 			signal: AbortSignal.timeout(3e3)
@@ -858,24 +865,42 @@ async function fetchAvailableModelIds(provider) {
 		return null;
 	}
 }
-async function choicesForProvider(provider) {
-	const knownModels = (0, __mariozechner_pi_ai.getModels)(provider);
-	if (provider === `openai-codex`) return knownModels.map((model) => ({
+function knownModelsForProvider(provider) {
+	return provider === __electric_ax_agents_runtime.MOONSHOT_PROVIDER ? (0, __electric_ax_agents_runtime.getMoonshotModels)() : (0, __mariozechner_pi_ai.getModels)(provider);
+}
+function choiceForKnownModel(provider, model) {
+	return {
 		provider,
 		id: model.id,
-		label: `${providerLabel(provider)} ${model.name}`,
+		label: `${builtinModelProviderLabel(provider)} ${model.name}`,
 		value: modelValue(provider, model.id),
-		reasoning: model.reasoning
-	}));
+		reasoning: model.reasoning,
+		input: model.input
+	};
+}
+function listBuiltinModelChoices(providers) {
+	return providers.flatMap((provider) => knownModelsForProvider(provider).map((model) => choiceForKnownModel(provider, model)));
+}
+async function choicesForProvider(provider) {
+	const knownChoices = listBuiltinModelChoices([provider]);
+	if (provider === `openai-codex`) return knownChoices;
 	const availableIds = await fetchAvailableModelIds(provider);
-	const models = availableIds === null ? knownModels : knownModels.filter((model) => availableIds.has(model.id));
-	return models.map((model) => ({
-		provider,
-		id: model.id,
-		label: `${providerLabel(provider)} ${model.name}`,
-		value: modelValue(provider, model.id),
-		reasoning: model.reasoning
-	}));
+	return availableIds === null ? knownChoices : knownChoices.filter((choice) => availableIds.has(choice.id));
+}
+function enabledModelSet(values) {
+	if (!values) return null;
+	const enabled = new Set();
+	for (const value of values) {
+		const trimmed = value.trim();
+		if (trimmed) enabled.add(trimmed);
+	}
+	return enabled.size > 0 ? enabled : null;
+}
+function filterChoicesByEnabledModels(choices, values) {
+	const enabled = enabledModelSet(values);
+	if (!enabled) return choices;
+	const filtered = choices.filter((choice) => enabled.has(choice.value));
+	return filtered.length > 0 ? filtered : choices;
 }
 function withProviderPayloadDefaults(config, choice, reasoningEffort) {
 	if (choice.provider !== `openai` && choice.provider !== `openai-codex` || !choice.reasoning) return config;
@@ -903,9 +928,10 @@ function parseReasoningEffort(value) {
 async function createBuiltinModelCatalog(options = {}) {
 	const providers = configuredProviders();
 	if (providers.length === 0 && options.allowMockFallback) return mockFallbackCatalog();
-	const choices = (await Promise.all(providers.map((provider) => choicesForProvider(provider)))).flat();
+	const providerChoices = (await Promise.all(providers.map((provider) => choicesForProvider(provider)))).flat();
+	const choices = filterChoicesByEnabledModels(providerChoices, options.enabledModelValues);
 	if (choices.length === 0) return options.allowMockFallback ? mockFallbackCatalog() : null;
-	const defaultChoice = choices.find((choice) => choice.provider === `anthropic` && choice.id === DEFAULT_ANTHROPIC_MODEL) ?? choices.find((choice) => choice.provider === `openai` && choice.id === DEFAULT_OPENAI_MODEL) ?? choices.find((choice) => choice.provider === `openai-codex` && choice.id === DEFAULT_CODEX_MODEL) ?? choices.find((choice) => choice.provider === `deepseek` && choice.id === DEFAULT_DEEPSEEK_MODEL) ?? choices[0];
+	const defaultChoice = choices.find((choice) => choice.provider === `anthropic` && choice.id === DEFAULT_ANTHROPIC_MODEL) ?? choices.find((choice) => choice.provider === `openai` && choice.id === DEFAULT_OPENAI_MODEL) ?? choices.find((choice) => choice.provider === `openai-codex` && choice.id === DEFAULT_CODEX_MODEL) ?? choices.find((choice) => choice.provider === `deepseek` && choice.id === DEFAULT_DEEPSEEK_MODEL) ?? choices.find((choice) => choice.provider === __electric_ax_agents_runtime.MOONSHOT_PROVIDER && choice.id === DEFAULT_MOONSHOT_MODEL) ?? choices[0];
 	return {
 		choices,
 		defaultChoice
@@ -921,13 +947,24 @@ function resolveBuiltinModelConfig(catalog, args) {
 		provider: choice.provider,
 		model: choice.id,
 		...reasoningEffort && { reasoningEffort },
-		...choice.provider === `openai-codex` && { getApiKey: () => (0, __electric_ax_agents_runtime.readCodexAccessToken)() }
+		...choice.provider === `openai-codex` && { getApiKey: () => (0, __electric_ax_agents_runtime.readCodexAccessToken)() },
+		...choice.provider === __electric_ax_agents_runtime.MOONSHOT_PROVIDER && { getApiKey: () => (0, __electric_ax_agents_runtime.getMoonshotApiKey)() }
 	};
 	return withProviderPayloadDefaults(config, choice, reasoningEffort);
 }
 function modelChoiceValues(catalog) {
 	return catalog.choices.map((choice) => choice.value);
 }
+function modelInputSchemaDefs(catalog) {
+	return { [MODEL_INPUTS_SCHEMA_DEF]: {
+		type: `object`,
+		properties: Object.fromEntries(catalog.choices.map((choice) => [choice.value, {
+			type: `array`,
+			items: { enum: [`text`, `image`] },
+			default: choice.input
+		}]))
+	} };
+}
 
 //#endregion
 //#region src/agents/horton.ts
@@ -1147,10 +1184,40 @@ function payloadToTitleText(payload) {
 	}
 	return String(payload);
 }
+function attachmentTitleText(attachment) {
+	const mimeType = typeof attachment.mimeType === `string` ? attachment.mimeType : ``;
+	const filename = typeof attachment.filename === `string` && attachment.filename.trim() ? attachment.filename.trim() : typeof attachment.id === `string` ? attachment.id : `attachment`;
+	const kind = mimeType.startsWith(`image/`) ? `image` : `file`;
+	return `Attached ${kind}: ${filename}`;
+}
+function attachmentsForInboxMessage(ctx, inboxKey) {
+	const manifests = ctx.db.collections.manifests?.toArray;
+	if (!Array.isArray(manifests)) return [];
+	return manifests.filter((entry) => {
+		if (!entry || typeof entry !== `object`) return false;
+		const attachment = entry;
+		if (attachment.kind !== `attachment`) return false;
+		if (attachment.role !== `input`) return false;
+		const subject = attachment.subject;
+		return subject !== null && typeof subject === `object` && !Array.isArray(subject) && subject.type === `inbox` && subject.key === inboxKey;
+	});
+}
+function messageTitleText(ctx, message) {
+	const pieces = [];
+	const text = payloadToTitleText(message.payload).trim();
+	if (text) pieces.push(text);
+	const key = typeof message.key === `string` ? message.key : null;
+	const attachments = key ? attachmentsForInboxMessage(ctx, key) : [];
+	for (const attachment of attachments) {
+		const attachmentText = attachmentTitleText(attachment);
+		if (attachmentText) pieces.push(attachmentText);
+	}
+	return pieces.join(`\n`);
+}
 async function extractFirstUserMessage(ctx) {
 	const firstMessage = ctx.db.collections.inbox.toArray.filter((message) => message.from !== `system`).sort((left, right) => messageSeq(left) - messageSeq(right))[0];
 	if (!firstMessage) return null;
-	const text = payloadToTitleText(firstMessage.payload);
+	const text = messageTitleText(ctx, firstMessage);
 	return text.length > 0 ? text : null;
 }
 function messageSeq(message) {
@@ -1190,7 +1257,7 @@ function createAssistantHandler(options) {
 			...__electric_ax_agents_mcp.mcp.tools()
 		];
 		const hasEventSourceTools = tools.some((tool) => getToolName(tool) === `list_event_sources`);
-		const titlePromise = ctx.firstWake && !ctx.tags.title ? (async () => {
+		const titlePromise = !ctx.tags.title ? (async () => {
 			const firstUserMessage = await extractFirstUserMessage(ctx);
 			if (!firstUserMessage) return;
 			let title = null;
@@ -1311,7 +1378,7 @@ function registerHorton(registry, options) {
 		model: zod.z.enum(modelChoiceValues(modelCatalog)).default(modelCatalog.defaultChoice.value),
 		reasoningEffort: zod.z.enum(REASONING_EFFORT_VALUES).default(`auto`).describe(`Reasoning effort for compatible reasoning models. Auto uses a safe provider default.`),
 		workingDirectory: zod.z.string().optional().describe(`Working directory for file operations. Defaults to the server's configured cwd.`)
-	});
+	}).meta({ $defs: modelInputSchemaDefs(modelCatalog) });
 	registry.define(`horton`, {
 		description: `Friendly capable assistant — chat, code, research, dispatch`,
 		creationSchema: hortonCreationSchema,
@@ -1532,10 +1599,13 @@ function createBuiltinElectricTools(custom) {
 	};
 }
 async function createBuiltinAgentHandler(options) {
-	const { agentServerUrl, serveEndpoint, workingDirectory, streamFn, createElectricTools, publicUrl, runtimeName, baseSkillsDir: baseSkillsDirOverride, serverHeaders, defaultDispatchPolicyForType } = options;
-	const modelCatalog = await createBuiltinModelCatalog({ allowMockFallback: Boolean(streamFn) });
+	const { agentServerUrl, serveEndpoint, workingDirectory, streamFn, enabledModelValues, createElectricTools, publicUrl, runtimeName, baseSkillsDir: baseSkillsDirOverride, serverHeaders, defaultDispatchPolicyForType } = options;
+	const modelCatalog = await createBuiltinModelCatalog({
+		allowMockFallback: Boolean(streamFn),
+		enabledModelValues
+	});
 	if (!modelCatalog) {
-		serverLog.warn(`[builtin-agents] no supported model provider API key found — set ANTHROPIC_API_KEY or OPENAI_API_KEY`);
+		serverLog.warn(`[builtin-agents] no supported model provider API key found — set ANTHROPIC_API_KEY, OPENAI_API_KEY, DEEPSEEK_API_KEY, or MOONSHOT_API_KEY`);
 		return null;
 	}
 	const cwd = workingDirectory ?? process.cwd();
@@ -1739,9 +1809,10 @@ var BuiltinAgentsServer = class {
 				publicUrl,
 				runtimeName: `builtin-agents`,
 				baseSkillsDir: this.options.baseSkillsDir,
+				enabledModelValues: this.options.enabledModelValues,
 				serverHeaders: pullWake.headers
 			});
-			if (!this.bootstrap) throw new Error(`ANTHROPIC_API_KEY or OPENAI_API_KEY must be set before starting builtin agents`);
+			if (!this.bootstrap) throw new Error(`ANTHROPIC_API_KEY, OPENAI_API_KEY, DEEPSEEK_API_KEY, or MOONSHOT_API_KEY must be set before starting builtin agents`);
 			await registerBuiltinAgentTypes(this.bootstrap);
 			const registeredRunner = pullWake.registerRunner ? await this.registerPullWakeRunner(pullWake) : null;
 			this.pullWakeRunner = (0, __electric_ax_agents_runtime.createPullWakeRunner)({
@@ -1913,6 +1984,7 @@ Object.defineProperty(exports, 'braveSearchTool', {
   }
 });
 exports.buildHortonSystemPrompt = buildHortonSystemPrompt
+exports.builtinModelProviderLabel = builtinModelProviderLabel
 exports.createAgentHandler = createAgentHandler
 exports.createBuiltinAgentHandler = createBuiltinAgentHandler
 exports.createBuiltinElectricTools = createBuiltinElectricTools
@@ -1920,6 +1992,7 @@ exports.createHortonDocsSupport = createHortonDocsSupport
 exports.createHortonTools = createHortonTools
 exports.createSpawnWorkerTool = createSpawnWorkerTool
 exports.generateTitle = generateTitle
+exports.listBuiltinModelChoices = listBuiltinModelChoices
 exports.registerAgentTypes = registerAgentTypes
 exports.registerBuiltinAgentTypes = registerBuiltinAgentTypes
 exports.registerHorton = registerHorton

package/dist/index.d.cts

@@ -20,6 +20,7 @@ interface BuiltinAgentHandlerOptions {
   serveEndpoint?: string;
   workingDirectory?: string;
   streamFn?: StreamFn;
+  enabledModelValues?: ReadonlyArray<string> | null;
   publicUrl?: string;
   runtimeName?: string;
   /** Override for the built-in skills directory; required when embedders bundle this package. */
@@ -79,6 +80,8 @@ interface BuiltinAgentsServerOptions {
   loadProjectMcpConfig?: boolean;
   /** Override for the built-in skills directory; required when embedders bundle this package. */
   baseSkillsDir?: string;
+  /** Restrict the model values exposed by built-in agent creation schemas. */
+  enabledModelValues?: ReadonlyArray<string> | null;
   createElectricTools?: NonNullable<ProcessWakeConfig[`createElectricTools`]>;
 }
 declare class BuiltinAgentsServer {
@@ -125,23 +128,31 @@ declare function runBuiltinAgentsEntrypoint({
 //#endregion
 //#region src/model-catalog.d.ts
 type BuiltinModelProvider = AvailableProvider;
+type BuiltinModelInput = `text` | `image`;
 interface BuiltinModelChoice {
   provider: BuiltinModelProvider;
   id: string;
   label: string;
   value: string;
   reasoning: boolean;
+  input: Array<BuiltinModelInput>;
 }
 interface BuiltinModelCatalog {
   choices: Array<BuiltinModelChoice>;
   defaultChoice: BuiltinModelChoice;
 }
+interface BuiltinModelCatalogOptions {
+  allowMockFallback?: boolean;
+  enabledModelValues?: ReadonlyArray<string> | null;
+}
 declare const REASONING_EFFORT_VALUES: readonly ["auto", "minimal", "low", "medium", "high"];
 type BuiltinReasoningEffort = (typeof REASONING_EFFORT_VALUES)[number];
 type ExplicitReasoningEffort = Exclude<BuiltinReasoningEffort, `auto`>;
 type BuiltinAgentModelConfig = Pick<AgentConfig, `model` | `provider` | `onPayload` | `getApiKey`> & {
   reasoningEffort?: ExplicitReasoningEffort;
 };
+declare function builtinModelProviderLabel(provider: BuiltinModelProvider): string;
+declare function listBuiltinModelChoices(providers: ReadonlyArray<BuiltinModelProvider>): Array<BuiltinModelChoice>;
 declare function resolveBuiltinModelConfig(catalog: BuiltinModelCatalog, args: Readonly<Record<string, unknown>>): BuiltinAgentModelConfig;
 
 //#endregion
@@ -203,4 +214,4 @@ declare function createHortonDocsSupport(workingDirectory: string, opts?: {
 }): HortonDocsSupport | null;
 
 //#endregion
-export { AgentHandlerResult, BuiltinAgentHandlerOptions, BuiltinAgentsEntrypointOptions, BuiltinAgentsEntrypointServer, BuiltinAgentsServer, BuiltinAgentsServerOptions, BuiltinElectricToolsFactory, DEFAULT_BUILTIN_AGENT_HANDLER_PATH, HORTON_MODEL, McpConfig, McpListedEntry, McpRegistry, McpServerConfig, RegistrySnapshot, RegistrySubscriber, RunBuiltinAgentsEntrypointOptions, WORKER_TOOL_NAMES, WorkerToolName, braveSearchTool, buildHortonSystemPrompt, createAgentHandler, createBuiltinAgentHandler, createBuiltinElectricTools, createHortonDocsSupport, createHortonTools, createSpawnWorkerTool, generateTitle, registerAgentTypes, registerBuiltinAgentTypes, registerHorton, registerWorker, resolveBuiltinAgentsEntrypointOptions, runBuiltinAgentsEntrypoint };
+export { AgentHandlerResult, BuiltinAgentHandlerOptions, BuiltinAgentsEntrypointOptions, BuiltinAgentsEntrypointServer, BuiltinAgentsServer, BuiltinAgentsServerOptions, BuiltinElectricToolsFactory, BuiltinModelCatalogOptions, BuiltinModelChoice, BuiltinModelProvider, DEFAULT_BUILTIN_AGENT_HANDLER_PATH, HORTON_MODEL, McpConfig, McpListedEntry, McpRegistry, McpServerConfig, RegistrySnapshot, RegistrySubscriber, RunBuiltinAgentsEntrypointOptions, WORKER_TOOL_NAMES, WorkerToolName, braveSearchTool, buildHortonSystemPrompt, builtinModelProviderLabel, createAgentHandler, createBuiltinAgentHandler, createBuiltinElectricTools, createHortonDocsSupport, createHortonTools, createSpawnWorkerTool, generateTitle, listBuiltinModelChoices, registerAgentTypes, registerBuiltinAgentTypes, registerHorton, registerWorker, resolveBuiltinAgentsEntrypointOptions, runBuiltinAgentsEntrypoint };

package/dist/index.d.ts

@@ -20,6 +20,7 @@ interface BuiltinAgentHandlerOptions {
   serveEndpoint?: string;
   workingDirectory?: string;
   streamFn?: StreamFn;
+  enabledModelValues?: ReadonlyArray<string> | null;
   publicUrl?: string;
   runtimeName?: string;
   /** Override for the built-in skills directory; required when embedders bundle this package. */
@@ -79,6 +80,8 @@ interface BuiltinAgentsServerOptions {
   loadProjectMcpConfig?: boolean;
   /** Override for the built-in skills directory; required when embedders bundle this package. */
   baseSkillsDir?: string;
+  /** Restrict the model values exposed by built-in agent creation schemas. */
+  enabledModelValues?: ReadonlyArray<string> | null;
   createElectricTools?: NonNullable<ProcessWakeConfig[`createElectricTools`]>;
 }
 declare class BuiltinAgentsServer {
@@ -125,23 +128,31 @@ declare function runBuiltinAgentsEntrypoint({
 //#endregion
 //#region src/model-catalog.d.ts
 type BuiltinModelProvider = AvailableProvider;
+type BuiltinModelInput = `text` | `image`;
 interface BuiltinModelChoice {
   provider: BuiltinModelProvider;
   id: string;
   label: string;
   value: string;
   reasoning: boolean;
+  input: Array<BuiltinModelInput>;
 }
 interface BuiltinModelCatalog {
   choices: Array<BuiltinModelChoice>;
   defaultChoice: BuiltinModelChoice;
 }
+interface BuiltinModelCatalogOptions {
+  allowMockFallback?: boolean;
+  enabledModelValues?: ReadonlyArray<string> | null;
+}
 declare const REASONING_EFFORT_VALUES: readonly ["auto", "minimal", "low", "medium", "high"];
 type BuiltinReasoningEffort = (typeof REASONING_EFFORT_VALUES)[number];
 type ExplicitReasoningEffort = Exclude<BuiltinReasoningEffort, `auto`>;
 type BuiltinAgentModelConfig = Pick<AgentConfig, `model` | `provider` | `onPayload` | `getApiKey`> & {
   reasoningEffort?: ExplicitReasoningEffort;
 };
+declare function builtinModelProviderLabel(provider: BuiltinModelProvider): string;
+declare function listBuiltinModelChoices(providers: ReadonlyArray<BuiltinModelProvider>): Array<BuiltinModelChoice>;
 declare function resolveBuiltinModelConfig(catalog: BuiltinModelCatalog, args: Readonly<Record<string, unknown>>): BuiltinAgentModelConfig;
 
 //#endregion
@@ -203,4 +214,4 @@ declare function createHortonDocsSupport(workingDirectory: string, opts?: {
 }): HortonDocsSupport | null;
 
 //#endregion
-export { AgentHandlerResult, BuiltinAgentHandlerOptions, BuiltinAgentsEntrypointOptions, BuiltinAgentsEntrypointServer, BuiltinAgentsServer, BuiltinAgentsServerOptions, BuiltinElectricToolsFactory, DEFAULT_BUILTIN_AGENT_HANDLER_PATH, HORTON_MODEL, McpConfig, McpListedEntry, McpRegistry, McpServerConfig, RegistrySnapshot, RegistrySubscriber, RunBuiltinAgentsEntrypointOptions, WORKER_TOOL_NAMES, WorkerToolName, braveSearchTool, buildHortonSystemPrompt, createAgentHandler, createBuiltinAgentHandler, createBuiltinElectricTools, createHortonDocsSupport, createHortonTools, createSpawnWorkerTool, generateTitle, registerAgentTypes, registerBuiltinAgentTypes, registerHorton, registerWorker, resolveBuiltinAgentsEntrypointOptions, runBuiltinAgentsEntrypoint };
+export { AgentHandlerResult, BuiltinAgentHandlerOptions, BuiltinAgentsEntrypointOptions, BuiltinAgentsEntrypointServer, BuiltinAgentsServer, BuiltinAgentsServerOptions, BuiltinElectricToolsFactory, BuiltinModelCatalogOptions, BuiltinModelChoice, BuiltinModelProvider, DEFAULT_BUILTIN_AGENT_HANDLER_PATH, HORTON_MODEL, McpConfig, McpListedEntry, McpRegistry, McpServerConfig, RegistrySnapshot, RegistrySubscriber, RunBuiltinAgentsEntrypointOptions, WORKER_TOOL_NAMES, WorkerToolName, braveSearchTool, buildHortonSystemPrompt, builtinModelProviderLabel, createAgentHandler, createBuiltinAgentHandler, createBuiltinElectricTools, createHortonDocsSupport, createHortonTools, createSpawnWorkerTool, generateTitle, listBuiltinModelChoices, registerAgentTypes, registerBuiltinAgentTypes, registerHorton, registerWorker, resolveBuiltinAgentsEntrypointOptions, runBuiltinAgentsEntrypoint };

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 { appendPathToUrl, completeWithLowCostModel, createEntityRegistry, createPullWakeRunner, createRuntimeHandler, createSkillTools, createSkillsRegistry, db, detectAvailableProviders, readCodexAccessToken, registerToolProvider, unregisterToolProvider } from "@electric-ax/agents-runtime";
+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 { braveSearchTool, braveSearchTool as braveSearchTool$1, createBashTool, createEditTool, createEventSourceTools, createFetchUrlTool, createReadFileTool, createSendTool, createWriteTool, fetchUrlTool } from "@electric-ax/agents-runtime/tools";
 import fs from "node:fs";
 import pino from "pino";
@@ -774,6 +774,7 @@ function createSpawnWorkerTool(ctx, modelConfig) {
 
 //#endregion
 //#region src/model-catalog.ts
+const MODEL_INPUTS_SCHEMA_DEF = `electricModelInputs`;
 const REASONING_EFFORT_VALUES = [
 	`auto`,
 	`minimal`,
@@ -785,13 +786,15 @@ const DEFAULT_ANTHROPIC_MODEL = `claude-sonnet-4-6`;
 const DEFAULT_OPENAI_MODEL = `gpt-4.1`;
 const DEFAULT_CODEX_MODEL = `gpt-5.4`;
 const DEFAULT_DEEPSEEK_MODEL = `deepseek-v4-flash`;
+const DEFAULT_MOONSHOT_MODEL = `kimi-k2.6`;
 function modelValue(provider, id) {
 	return `${provider}:${id}`;
 }
-function providerLabel(provider) {
+function builtinModelProviderLabel(provider) {
 	if (provider === `anthropic`) return `Anthropic`;
 	if (provider === `openai-codex`) return `OpenAI Codex`;
 	if (provider === `deepseek`) return `DeepSeek`;
+	if (provider === MOONSHOT_PROVIDER) return `Kimi`;
 	return `OpenAI`;
 }
 function configuredProviders() {
@@ -803,7 +806,8 @@ function mockFallbackCatalog() {
 		id: DEFAULT_ANTHROPIC_MODEL,
 		label: `Anthropic ${DEFAULT_ANTHROPIC_MODEL}`,
 		value: modelValue(`anthropic`, DEFAULT_ANTHROPIC_MODEL),
-		reasoning: true
+		reasoning: true,
+		input: [`text`, `image`]
 	};
 	return {
 		choices: [fallback],
@@ -821,6 +825,9 @@ async function fetchAvailableModelIds(provider) {
 		}) : provider === `deepseek` ? await fetch(`https://api.deepseek.com/v1/models`, {
 			headers: { authorization: `Bearer ${process.env.DEEPSEEK_API_KEY ?? ``}` },
 			signal: AbortSignal.timeout(3e3)
+		}) : provider === MOONSHOT_PROVIDER ? await fetch(`${MOONSHOT_API_BASE_URL}/models`, {
+			headers: { authorization: `Bearer ${getMoonshotApiKey() ?? ``}` },
+			signal: AbortSignal.timeout(3e3)
 		}) : await fetch(`https://api.openai.com/v1/models`, {
 			headers: { authorization: `Bearer ${process.env.OPENAI_API_KEY ?? ``}` },
 			signal: AbortSignal.timeout(3e3)
@@ -834,24 +841,42 @@ async function fetchAvailableModelIds(provider) {
 		return null;
 	}
 }
-async function choicesForProvider(provider) {
-	const knownModels = getModels(provider);
-	if (provider === `openai-codex`) return knownModels.map((model) => ({
+function knownModelsForProvider(provider) {
+	return provider === MOONSHOT_PROVIDER ? getMoonshotModels() : getModels(provider);
+}
+function choiceForKnownModel(provider, model) {
+	return {
 		provider,
 		id: model.id,
-		label: `${providerLabel(provider)} ${model.name}`,
+		label: `${builtinModelProviderLabel(provider)} ${model.name}`,
 		value: modelValue(provider, model.id),
-		reasoning: model.reasoning
-	}));
+		reasoning: model.reasoning,
+		input: model.input
+	};
+}
+function listBuiltinModelChoices(providers) {
+	return providers.flatMap((provider) => knownModelsForProvider(provider).map((model) => choiceForKnownModel(provider, model)));
+}
+async function choicesForProvider(provider) {
+	const knownChoices = listBuiltinModelChoices([provider]);
+	if (provider === `openai-codex`) return knownChoices;
 	const availableIds = await fetchAvailableModelIds(provider);
-	const models = availableIds === null ? knownModels : knownModels.filter((model) => availableIds.has(model.id));
-	return models.map((model) => ({
-		provider,
-		id: model.id,
-		label: `${providerLabel(provider)} ${model.name}`,
-		value: modelValue(provider, model.id),
-		reasoning: model.reasoning
-	}));
+	return availableIds === null ? knownChoices : knownChoices.filter((choice) => availableIds.has(choice.id));
+}
+function enabledModelSet(values) {
+	if (!values) return null;
+	const enabled = new Set();
+	for (const value of values) {
+		const trimmed = value.trim();
+		if (trimmed) enabled.add(trimmed);
+	}
+	return enabled.size > 0 ? enabled : null;
+}
+function filterChoicesByEnabledModels(choices, values) {
+	const enabled = enabledModelSet(values);
+	if (!enabled) return choices;
+	const filtered = choices.filter((choice) => enabled.has(choice.value));
+	return filtered.length > 0 ? filtered : choices;
 }
 function withProviderPayloadDefaults(config, choice, reasoningEffort) {
 	if (choice.provider !== `openai` && choice.provider !== `openai-codex` || !choice.reasoning) return config;
@@ -879,9 +904,10 @@ function parseReasoningEffort(value) {
 async function createBuiltinModelCatalog(options = {}) {
 	const providers = configuredProviders();
 	if (providers.length === 0 && options.allowMockFallback) return mockFallbackCatalog();
-	const choices = (await Promise.all(providers.map((provider) => choicesForProvider(provider)))).flat();
+	const providerChoices = (await Promise.all(providers.map((provider) => choicesForProvider(provider)))).flat();
+	const choices = filterChoicesByEnabledModels(providerChoices, options.enabledModelValues);
 	if (choices.length === 0) return options.allowMockFallback ? mockFallbackCatalog() : null;
-	const defaultChoice = choices.find((choice) => choice.provider === `anthropic` && choice.id === DEFAULT_ANTHROPIC_MODEL) ?? choices.find((choice) => choice.provider === `openai` && choice.id === DEFAULT_OPENAI_MODEL) ?? choices.find((choice) => choice.provider === `openai-codex` && choice.id === DEFAULT_CODEX_MODEL) ?? choices.find((choice) => choice.provider === `deepseek` && choice.id === DEFAULT_DEEPSEEK_MODEL) ?? choices[0];
+	const defaultChoice = choices.find((choice) => choice.provider === `anthropic` && choice.id === DEFAULT_ANTHROPIC_MODEL) ?? choices.find((choice) => choice.provider === `openai` && choice.id === DEFAULT_OPENAI_MODEL) ?? choices.find((choice) => choice.provider === `openai-codex` && choice.id === DEFAULT_CODEX_MODEL) ?? choices.find((choice) => choice.provider === `deepseek` && choice.id === DEFAULT_DEEPSEEK_MODEL) ?? choices.find((choice) => choice.provider === MOONSHOT_PROVIDER && choice.id === DEFAULT_MOONSHOT_MODEL) ?? choices[0];
 	return {
 		choices,
 		defaultChoice
@@ -897,13 +923,24 @@ function resolveBuiltinModelConfig(catalog, args) {
 		provider: choice.provider,
 		model: choice.id,
 		...reasoningEffort && { reasoningEffort },
-		...choice.provider === `openai-codex` && { getApiKey: () => readCodexAccessToken() }
+		...choice.provider === `openai-codex` && { getApiKey: () => readCodexAccessToken() },
+		...choice.provider === MOONSHOT_PROVIDER && { getApiKey: () => getMoonshotApiKey() }
 	};
 	return withProviderPayloadDefaults(config, choice, reasoningEffort);
 }
 function modelChoiceValues(catalog) {
 	return catalog.choices.map((choice) => choice.value);
 }
+function modelInputSchemaDefs(catalog) {
+	return { [MODEL_INPUTS_SCHEMA_DEF]: {
+		type: `object`,
+		properties: Object.fromEntries(catalog.choices.map((choice) => [choice.value, {
+			type: `array`,
+			items: { enum: [`text`, `image`] },
+			default: choice.input
+		}]))
+	} };
+}
 
 //#endregion
 //#region src/agents/horton.ts
@@ -1123,10 +1160,40 @@ function payloadToTitleText(payload) {
 	}
 	return String(payload);
 }
+function attachmentTitleText(attachment) {
+	const mimeType = typeof attachment.mimeType === `string` ? attachment.mimeType : ``;
+	const filename = typeof attachment.filename === `string` && attachment.filename.trim() ? attachment.filename.trim() : typeof attachment.id === `string` ? attachment.id : `attachment`;
+	const kind = mimeType.startsWith(`image/`) ? `image` : `file`;
+	return `Attached ${kind}: ${filename}`;
+}
+function attachmentsForInboxMessage(ctx, inboxKey) {
+	const manifests = ctx.db.collections.manifests?.toArray;
+	if (!Array.isArray(manifests)) return [];
+	return manifests.filter((entry) => {
+		if (!entry || typeof entry !== `object`) return false;
+		const attachment = entry;
+		if (attachment.kind !== `attachment`) return false;
+		if (attachment.role !== `input`) return false;
+		const subject = attachment.subject;
+		return subject !== null && typeof subject === `object` && !Array.isArray(subject) && subject.type === `inbox` && subject.key === inboxKey;
+	});
+}
+function messageTitleText(ctx, message) {
+	const pieces = [];
+	const text = payloadToTitleText(message.payload).trim();
+	if (text) pieces.push(text);
+	const key = typeof message.key === `string` ? message.key : null;
+	const attachments = key ? attachmentsForInboxMessage(ctx, key) : [];
+	for (const attachment of attachments) {
+		const attachmentText = attachmentTitleText(attachment);
+		if (attachmentText) pieces.push(attachmentText);
+	}
+	return pieces.join(`\n`);
+}
 async function extractFirstUserMessage(ctx) {
 	const firstMessage = ctx.db.collections.inbox.toArray.filter((message) => message.from !== `system`).sort((left, right) => messageSeq(left) - messageSeq(right))[0];
 	if (!firstMessage) return null;
-	const text = payloadToTitleText(firstMessage.payload);
+	const text = messageTitleText(ctx, firstMessage);
 	return text.length > 0 ? text : null;
 }
 function messageSeq(message) {
@@ -1166,7 +1233,7 @@ function createAssistantHandler(options) {
 			...mcp.tools()
 		];
 		const hasEventSourceTools = tools.some((tool) => getToolName(tool) === `list_event_sources`);
-		const titlePromise = ctx.firstWake && !ctx.tags.title ? (async () => {
+		const titlePromise = !ctx.tags.title ? (async () => {
 			const firstUserMessage = await extractFirstUserMessage(ctx);
 			if (!firstUserMessage) return;
 			let title = null;
@@ -1287,7 +1354,7 @@ function registerHorton(registry, options) {
 		model: z.enum(modelChoiceValues(modelCatalog)).default(modelCatalog.defaultChoice.value),
 		reasoningEffort: z.enum(REASONING_EFFORT_VALUES).default(`auto`).describe(`Reasoning effort for compatible reasoning models. Auto uses a safe provider default.`),
 		workingDirectory: z.string().optional().describe(`Working directory for file operations. Defaults to the server's configured cwd.`)
-	});
+	}).meta({ $defs: modelInputSchemaDefs(modelCatalog) });
 	registry.define(`horton`, {
 		description: `Friendly capable assistant — chat, code, research, dispatch`,
 		creationSchema: hortonCreationSchema,
@@ -1508,10 +1575,13 @@ function createBuiltinElectricTools(custom) {
 	};
 }
 async function createBuiltinAgentHandler(options) {
-	const { agentServerUrl, serveEndpoint, workingDirectory, streamFn, createElectricTools, publicUrl, runtimeName, baseSkillsDir: baseSkillsDirOverride, serverHeaders, defaultDispatchPolicyForType } = options;
-	const modelCatalog = await createBuiltinModelCatalog({ allowMockFallback: Boolean(streamFn) });
+	const { agentServerUrl, serveEndpoint, workingDirectory, streamFn, enabledModelValues, createElectricTools, publicUrl, runtimeName, baseSkillsDir: baseSkillsDirOverride, serverHeaders, defaultDispatchPolicyForType } = options;
+	const modelCatalog = await createBuiltinModelCatalog({
+		allowMockFallback: Boolean(streamFn),
+		enabledModelValues
+	});
 	if (!modelCatalog) {
-		serverLog.warn(`[builtin-agents] no supported model provider API key found — set ANTHROPIC_API_KEY or OPENAI_API_KEY`);
+		serverLog.warn(`[builtin-agents] no supported model provider API key found — set ANTHROPIC_API_KEY, OPENAI_API_KEY, DEEPSEEK_API_KEY, or MOONSHOT_API_KEY`);
 		return null;
 	}
 	const cwd = workingDirectory ?? process.cwd();
@@ -1715,9 +1785,10 @@ var BuiltinAgentsServer = class {
 				publicUrl,
 				runtimeName: `builtin-agents`,
 				baseSkillsDir: this.options.baseSkillsDir,
+				enabledModelValues: this.options.enabledModelValues,
 				serverHeaders: pullWake.headers
 			});
-			if (!this.bootstrap) throw new Error(`ANTHROPIC_API_KEY or OPENAI_API_KEY must be set before starting builtin agents`);
+			if (!this.bootstrap) throw new Error(`ANTHROPIC_API_KEY, OPENAI_API_KEY, DEEPSEEK_API_KEY, or MOONSHOT_API_KEY must be set before starting builtin agents`);
 			await registerBuiltinAgentTypes(this.bootstrap);
 			const registeredRunner = pullWake.registerRunner ? await this.registerPullWakeRunner(pullWake) : null;
 			this.pullWakeRunner = createPullWakeRunner({
@@ -1878,4 +1949,4 @@ async function runBuiltinAgentsEntrypoint({ env = process.env, cwd = process.cwd
 }
 
 //#endregion
-export { BuiltinAgentsServer, DEFAULT_BUILTIN_AGENT_HANDLER_PATH, HORTON_MODEL, WORKER_TOOL_NAMES, braveSearchTool, buildHortonSystemPrompt, createAgentHandler, createBuiltinAgentHandler, createBuiltinElectricTools, createHortonDocsSupport, createHortonTools, createSpawnWorkerTool, generateTitle, registerAgentTypes, registerBuiltinAgentTypes, registerHorton, registerWorker, resolveBuiltinAgentsEntrypointOptions, runBuiltinAgentsEntrypoint };
+export { BuiltinAgentsServer, DEFAULT_BUILTIN_AGENT_HANDLER_PATH, HORTON_MODEL, WORKER_TOOL_NAMES, braveSearchTool, buildHortonSystemPrompt, builtinModelProviderLabel, createAgentHandler, createBuiltinAgentHandler, createBuiltinElectricTools, createHortonDocsSupport, createHortonTools, createSpawnWorkerTool, generateTitle, listBuiltinModelChoices, registerAgentTypes, registerBuiltinAgentTypes, registerHorton, registerWorker, resolveBuiltinAgentsEntrypointOptions, runBuiltinAgentsEntrypoint };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electric-ax/agents",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "Built-in Electric Agents runtimes such as Horton and worker",
   "repository": {
     "type": "git",
@@ -38,7 +38,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@durable-streams/state": "https://pkg.pr.new/durable-streams/durable-streams/@durable-streams/state@5d5c217",
+    "@durable-streams/state": "^0.2.9",
     "@mariozechner/pi-agent-core": "^0.70.2",
     "@mariozechner/pi-ai": "^0.70.2",
     "@sinclair/typebox": "^0.34.48",
@@ -49,7 +49,7 @@
     "sqlite-vec": "^0.1.9",
     "zod": "^4.3.6",
     "@electric-ax/agents-mcp": "0.2.2",
-    "@electric-ax/agents-runtime": "0.3.5"
+    "@electric-ax/agents-runtime": "0.3.6"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",