@electric-ax/agents 0.4.3 → 0.4.5

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, db, detectAvailableProviders, readCodexAccessToken, registerToolProvider, unregisterToolProvider } from "@electric-ax/agents-runtime";
+import { appendPathToUrl, completeWithLowCostModel, createEntityRegistry, createPullWakeRunner, createRuntimeHandler, createSkillTools, createSkillsRegistry, db, detectAvailableProviders, readCodexAccessToken, registerToolProvider, unregisterToolProvider } from "@electric-ax/agents-runtime";
 import fs from "node:fs";
 import pino from "pino";
 import { eq, not, queryOnce } from "@durable-streams/state";
@@ -13,7 +13,7 @@ import { Type } from "@sinclair/typebox";
 import { load } from "sqlite-vec";
 import { nanoid } from "nanoid";
 import { getModels } from "@mariozechner/pi-ai";
-import { braveSearchTool, braveSearchTool as braveSearchTool$1, createBashTool, createEditTool, createFetchUrlTool, createReadFileTool, createWriteTool, fetchUrlTool } from "@electric-ax/agents-runtime/tools";
+import { braveSearchTool, braveSearchTool as braveSearchTool$1, createBashTool, createEditTool, createFetchUrlTool, createReadFileTool, createSendTool, createWriteTool, fetchUrlTool } from "@electric-ax/agents-runtime/tools";
 import { bridgeMcpTool, buildPromptTools, buildResourceTools, createRegistry, keychainPersistence, loadConfig, mcp, watchConfig } from "@electric-ax/agents-mcp";
 
 //#region src/log.ts
@@ -692,184 +692,6 @@ function createHortonDocsSupport(workingDirectory, opts = {}) {
 	};
 }
 
-//#endregion
-//#region src/skills/tools.ts
-function skillContextId(name) {
-	return `skill:${name}`;
-}
-function createSkillTools(registry, ctx) {
-	const useSkill = {
-		name: `use_skill`,
-		label: `Use Skill`,
-		description: `Load a skill into your context. Call with a skill name to load it. Pass args if the skill accepts arguments.`,
-		parameters: Type.Object({
-			name: Type.String({ description: `Name of the skill to load` }),
-			args: Type.Optional(Type.String({ description: `Arguments to pass to the skill (space-separated, or quoted for multi-word values)` }))
-		}),
-		execute: async (_toolCallId, params) => {
-			const { name, args } = params;
-			const meta = registry.catalog.get(name);
-			if (!meta) {
-				const available = Array.from(registry.catalog.keys()).join(`, `);
-				return {
-					content: [{
-						type: `text`,
-						text: `Skill "${name}" not found. Available skills: ${available || `none`}`
-					}],
-					details: { loaded: false }
-				};
-			}
-			const contextId = skillContextId(name);
-			if (ctx.getContext(contextId)) return {
-				content: [{
-					type: `text`,
-					text: `Skill "${name}" is already loaded.`
-				}],
-				details: {
-					loaded: false,
-					alreadyLoaded: true
-				}
-			};
-			let content = await registry.readContent(name);
-			if (content === null) return {
-				content: [{
-					type: `text`,
-					text: `Error: could not read skill file for "${name}".`
-				}],
-				details: { loaded: false }
-			};
-			let truncated = false;
-			if (content.length > meta.max) {
-				truncated = true;
-				content = content.slice(0, meta.max);
-			}
-			if (args) content = substituteArgs(content, args, meta.arguments);
-			ctx.insertContext(contextId, {
-				name: `skill_instructions`,
-				attrs: {
-					skill: name,
-					type: `directive`
-				},
-				content
-			});
-			const skillDir = path.join(path.dirname(meta.source), name);
-			const truncNote = truncated ? `\n\nWARNING: Content was truncated from ${meta.charCount.toLocaleString()} to ${meta.max.toLocaleString()} chars. Inform the user.` : ``;
-			const allRefFiles = listRefFiles(skillDir);
-			const mdFiles = allRefFiles.filter((f) => f.endsWith(`.md`));
-			const refContents = [];
-			for (const f of mdFiles) try {
-				const refContent = await fs$1.readFile(path.join(skillDir, f), `utf-8`);
-				const refId = `${skillContextId(name)}:${f}`;
-				ctx.insertContext(refId, {
-					name: `skill_reference`,
-					attrs: {
-						skill: name,
-						file: f
-					},
-					content: refContent
-				});
-				refContents.push(`--- ${f} ---\n${refContent}`);
-			} catch {}
-			const hasRefDir = allRefFiles.length > 0;
-			const dirNote = hasRefDir ? `\nSkill directory: ${skillDir}` : ``;
-			const refSection = refContents.length > 0 ? `\n\n${refContents.join(`\n\n`)}` : ``;
-			const toolResult = `SKILL ACTIVATED: "${name}". The instructions below override your default behavior. Follow them exactly. Do not read any files to find this content — it is all here.\n${dirNote}${truncNote}\n\n${content}${refSection}`;
-			return {
-				content: [{
-					type: `text`,
-					text: toolResult
-				}],
-				details: {
-					loaded: true,
-					truncated,
-					chars: content.length
-				}
-			};
-		}
-	};
-	const removeSkill = {
-		name: `remove_skill`,
-		label: `Remove Skill`,
-		description: `Unload a previously loaded skill from your context.`,
-		parameters: Type.Object({ name: Type.String({ description: `Name of the skill to remove` }) }),
-		execute: async (_toolCallId, params) => {
-			const { name } = params;
-			ctx.removeContext(skillContextId(name));
-			const meta = registry.catalog.get(name);
-			if (meta) {
-				const skillDir = path.join(path.dirname(meta.source), name);
-				for (const f of listRefFiles(skillDir)) ctx.removeContext(`${skillContextId(name)}:${f}`);
-			}
-			return {
-				content: [{
-					type: `text`,
-					text: `Skill "${name}" removed from context.`
-				}],
-				details: { removed: true }
-			};
-		}
-	};
-	return [useSkill, removeSkill];
-}
-function parseArgs(raw) {
-	const args = [];
-	let current = ``;
-	let inQuote = false;
-	let quoteChar = ``;
-	for (const ch of raw) if (inQuote) if (ch === quoteChar) inQuote = false;
-	else current += ch;
-	else if (ch === `"` || ch === `'`) {
-		inQuote = true;
-		quoteChar = ch;
-	} else if (ch === ` ` || ch === `\t`) {
-		if (current.length > 0) {
-			args.push(current);
-			current = ``;
-		}
-	} else current += ch;
-	if (current.length > 0) args.push(current);
-	return args;
-}
-function substituteArgs(content, rawArgs, argNames) {
-	const parsed = parseArgs(rawArgs);
-	let result = content;
-	let matched = false;
-	if (argNames) for (let i = 0; i < argNames.length && i < parsed.length; i++) {
-		const pattern = new RegExp(`\\$${argNames[i]}\\b`, `g`);
-		if (pattern.test(result)) {
-			result = result.replace(pattern, parsed[i]);
-			matched = true;
-		}
-	}
-	for (let i = 0; i < parsed.length; i++) {
-		const pattern = new RegExp(`\\$${i}\\b`, `g`);
-		if (pattern.test(result)) {
-			result = result.replace(pattern, parsed[i]);
-			matched = true;
-		}
-	}
-	if (result.includes(`$ARGUMENTS`)) {
-		result = result.replace(/\$ARGUMENTS/g, rawArgs);
-		matched = true;
-	}
-	if (!matched) result += `\n\nArguments: ${rawArgs}`;
-	return result;
-}
-function listRefFiles(dir, prefix = ``) {
-	try {
-		const results = [];
-		for (const entry of fs.readdirSync(dir)) {
-			const full = path.join(dir, entry);
-			const rel = prefix ? `${prefix}/${entry}` : entry;
-			if (fs.statSync(full).isDirectory()) results.push(...listRefFiles(full, rel));
-			else results.push(rel);
-		}
-		return results;
-	} catch {
-		return [];
-	}
-}
-
 //#endregion
 //#region src/tools/spawn-worker.ts
 const WORKER_TOOL_NAMES = [
@@ -879,7 +701,8 @@ const WORKER_TOOL_NAMES = [
 	`edit`,
 	`web_search`,
 	`fetch_url`,
-	`spawn_worker`
+	`spawn_worker`,
+	`send`
 ];
 function createSpawnWorkerTool(ctx, modelConfig) {
 	return {
@@ -1229,6 +1052,7 @@ When a user opens with a greeting ("hi", "hello", "hey", etc.) or a broad statem
 - web_search: search the web
 - fetch_url: fetch and convert a URL to markdown
 - spawn_worker: dispatch a subagent for an isolated task
+- send: send a message to an Electric Agent/entity by entity URL
 ${docsTools}${skillsTools}
 
 # Working with files
@@ -1276,6 +1100,7 @@ function createHortonTools(workingDirectory, ctx, readSet, opts = {}) {
 			logPrefix: opts.logPrefix ?? `[horton]`
 		})] : [fetchUrlTool],
 		createSpawnWorkerTool(ctx, opts.modelConfig),
+		createSendTool(ctx.send),
 		...opts.docsSearchTool ? [opts.docsSearchTool] : []
 	];
 }
@@ -1524,6 +1349,9 @@ function buildToolsForWorker(tools, workingDirectory, ctx, readSet) {
 		case `spawn_worker`:
 			out.push(createSpawnWorkerTool(ctx));
 			break;
+		case `send`:
+			out.push(createSendTool(ctx.send));
+			break;
 	}
 	return out;
 }
@@ -1648,259 +1476,6 @@ function registerWorker(registry, options) {
 	});
 }
 
-//#endregion
-//#region src/skills/preamble.ts
-function parsePreamble(content) {
-	const lines = content.split(`\n`);
-	if (lines[0]?.trim() !== `---`) return {};
-	let closingIndex = -1;
-	for (let i = 1; i < Math.min(lines.length, 25); i++) if (lines[i]?.trim() === `---`) {
-		closingIndex = i;
-		break;
-	}
-	if (closingIndex === -1) return {};
-	const result = {};
-	for (let i = 1; i < closingIndex; i++) {
-		const line = lines[i];
-		const colonIndex = line.indexOf(`:`);
-		if (colonIndex === -1) continue;
-		const key = line.slice(0, colonIndex).trim();
-		const rawValue = line.slice(colonIndex + 1).trim();
-		switch (key) {
-			case `description`:
-				result.description = stripQuotes(rawValue);
-				break;
-			case `whenToUse`:
-				result.whenToUse = stripQuotes(rawValue);
-				break;
-			case `keywords`: {
-				if (rawValue.length === 0) {
-					const items = [];
-					for (let j = i + 1; j < closingIndex; j++) {
-						const next = lines[j];
-						const match = next.match(/^\s+-\s+(.+)$/);
-						if (match) {
-							items.push(match[1].trim());
-							i = j;
-						} else break;
-					}
-					result.keywords = items;
-				} else result.keywords = parseKeywords(rawValue);
-				break;
-			}
-			case `arguments`: {
-				if (rawValue.length === 0) {
-					const items = [];
-					for (let j = i + 1; j < closingIndex; j++) {
-						const next = lines[j];
-						const match = next.match(/^\s+-\s+(.+)$/);
-						if (match) {
-							items.push(match[1].trim());
-							i = j;
-						} else break;
-					}
-					result.arguments = items;
-				} else result.arguments = parseKeywords(rawValue);
-				break;
-			}
-			case `argument-hint`:
-				result.argumentHint = stripQuotes(rawValue);
-				break;
-			case `user-invocable`:
-				result.userInvocable = rawValue === `true`;
-				break;
-			case `max`: {
-				const num = parseInt(rawValue, 10);
-				if (!Number.isNaN(num) && num > 0) result.max = num;
-				break;
-			}
-		}
-	}
-	return result;
-}
-function parseKeywords(raw) {
-	const stripped = raw.replace(/^\[/, ``).replace(/\]$/, ``);
-	return stripped.split(`,`).map((s) => s.trim()).filter((s) => s.length > 0);
-}
-function stripQuotes(value) {
-	if (value.length >= 2 && value.startsWith(`"`) && value.endsWith(`"`)) return value.slice(1, -1);
-	return value;
-}
-
-//#endregion
-//#region src/skills/extract-meta.ts
-const DEFAULT_MAX = 1e4;
-async function extractSkillMeta(name, content) {
-	const preamble = parsePreamble(content);
-	if (preamble.description && preamble.whenToUse && preamble.keywords) return {
-		description: preamble.description,
-		whenToUse: preamble.whenToUse,
-		keywords: preamble.keywords,
-		...preamble.arguments && { arguments: preamble.arguments },
-		...preamble.argumentHint && { argumentHint: preamble.argumentHint },
-		...preamble.userInvocable && { userInvocable: true },
-		max: preamble.max ?? DEFAULT_MAX
-	};
-	try {
-		return await llmExtract(name, content, preamble);
-	} catch (err) {
-		serverLog.warn(`[skills] LLM metadata extraction failed for "${name}": ${err instanceof Error ? err.message : String(err)}`);
-	}
-	return {
-		description: preamble.description ?? humanize(name),
-		whenToUse: preamble.whenToUse ?? `User asks about ${humanize(name).toLowerCase()}`,
-		keywords: preamble.keywords ?? [name],
-		max: preamble.max ?? DEFAULT_MAX
-	};
-}
-async function llmExtract(name, content, partial) {
-	const truncated = content.slice(0, 8e3);
-	const prompt = `Analyze this skill document and extract metadata. The skill is named "${name}".
-
-<skill>
-${truncated}
-</skill>
-
-Return ONLY a JSON object with these fields:
-- "description": one-line summary of what this skill provides (max 100 chars)
-- "whenToUse": when should an AI agent load this skill (max 200 chars)
-- "keywords": array of 3-8 relevant keywords
-
-Return raw JSON, no markdown fences.`;
-	const text = await completeWithLowCostModel({
-		purpose: `skill metadata extraction`,
-		systemPrompt: `Extract metadata from skill documents. Return only valid JSON that matches the requested schema.`,
-		prompt,
-		maxTokens: 256,
-		log: (message) => serverLog.info(message),
-		logPrefix: `[skills]`
-	});
-	const parsed = JSON.parse(text);
-	return {
-		description: partial.description ?? parsed.description ?? humanize(name),
-		whenToUse: partial.whenToUse ?? parsed.whenToUse ?? `User asks about ${name}`,
-		keywords: partial.keywords ?? parsed.keywords ?? [name],
-		max: partial.max ?? DEFAULT_MAX
-	};
-}
-function humanize(name) {
-	return name.replace(/[-_]/g, ` `).replace(/\b\w/g, (c) => c.toUpperCase());
-}
-
-//#endregion
-//#region src/skills/registry.ts
-const CACHE_FILENAME = `skills-cache.json`;
-async function createSkillsRegistry(opts) {
-	const { baseSkillsDir, appSkillsDir, cacheDir } = opts;
-	const cachePath = path.join(cacheDir, CACHE_FILENAME);
-	const existingCache = await loadCache(cachePath);
-	const files = new Map();
-	await scanDir(baseSkillsDir, files);
-	if (appSkillsDir) await scanDir(appSkillsDir, files);
-	const catalog = new Map();
-	for (const [name, filePath] of files) {
-		const content = await fs$1.readFile(filePath, `utf-8`);
-		const hash = sha256(content);
-		const cached = existingCache[name];
-		if (cached && cached.contentHash === hash && cached.source === filePath) {
-			catalog.set(name, cached);
-			continue;
-		}
-		serverLog.info(`[skills] extracting metadata for "${name}"`);
-		const meta = await extractSkillMeta(name, content);
-		const entry = {
-			name,
-			...meta,
-			charCount: content.length,
-			contentHash: hash,
-			source: filePath
-		};
-		catalog.set(name, entry);
-	}
-	await saveCache(cachePath, catalog, cacheDir);
-	return {
-		catalog,
-		renderCatalog(budget) {
-			if (catalog.size === 0) return ``;
-			const skills = Array.from(catalog.values());
-			const full = renderSkillList(skills, `full`);
-			if (!budget || full.length <= budget) return full;
-			const compact = renderSkillList(skills, `compact`);
-			if (compact.length <= budget) return compact;
-			return renderSkillList(skills, `names`);
-		},
-		async readContent(name) {
-			const meta = catalog.get(name);
-			if (!meta) return null;
-			try {
-				return await fs$1.readFile(meta.source, `utf-8`);
-			} catch {
-				return null;
-			}
-		}
-	};
-}
-async function scanDir(dir, out) {
-	let entries;
-	try {
-		entries = await fs$1.readdir(dir, { withFileTypes: true });
-	} catch {
-		return;
-	}
-	for (const entry of entries) {
-		if (!entry.isFile() || !entry.name.endsWith(`.md`)) continue;
-		const name = entry.name.slice(0, -3);
-		out.set(name, path.resolve(dir, entry.name));
-	}
-}
-async function loadCache(cachePath) {
-	try {
-		const raw = await fs$1.readFile(cachePath, `utf-8`);
-		return JSON.parse(raw);
-	} catch {
-		return {};
-	}
-}
-async function saveCache(cachePath, catalog, cacheDir) {
-	const obj = {};
-	for (const [name, meta] of catalog) obj[name] = meta;
-	fs.mkdirSync(cacheDir, { recursive: true });
-	await fs$1.writeFile(path.join(cacheDir, `.gitignore`), `*\n`, `utf-8`);
-	await fs$1.writeFile(cachePath, JSON.stringify(obj, null, 2), `utf-8`);
-}
-function sha256(content) {
-	return createHash(`sha256`).update(content).digest(`hex`);
-}
-function renderSkillList(skills, mode) {
-	const invocable = skills.filter((s) => s.userInvocable);
-	const others = skills.filter((s) => !s.userInvocable);
-	const lines = [`Available skills:`];
-	if (invocable.length > 0 && mode !== `names`) {
-		lines.push(`\nUser-invocable (the user can trigger these directly):`);
-		for (const meta of invocable) {
-			const hint = meta.argumentHint ? ` ${meta.argumentHint}` : ``;
-			lines.push(`- /${meta.name}${hint} — ${mode === `compact` ? truncate(meta.description, 100) : meta.description}`);
-		}
-		if (others.length > 0) lines.push(``);
-	}
-	const all = mode === `names` ? skills : others.length > 0 ? others : invocable.length === 0 ? skills : [];
-	for (const meta of all) {
-		if (mode === `names`) {
-			const prefix = meta.userInvocable ? `/${meta.name}` : meta.name;
-			lines.push(`- ${prefix}: ${truncate(meta.description, 60)}`);
-			continue;
-		}
-		lines.push(`- ${meta.name} (${meta.charCount.toLocaleString()} chars): ${mode === `compact` ? truncate(meta.description, 100) : meta.description}`);
-		lines.push(`  Use when: ${meta.whenToUse}`);
-		if (mode === `full`) lines.push(`  Keywords: ${meta.keywords.join(`, `)}`);
-		if (meta.argumentHint) lines.push(`  Usage: use_skill("${meta.name}", "${meta.argumentHint}")`);
-	}
-	return lines.join(`\n`);
-}
-function truncate(str, max) {
-	return str.length <= max ? str : str.slice(0, max - 3) + `...`;
-}
-
 //#endregion
 //#region src/bootstrap.ts
 const DEFAULT_BUILTIN_AGENT_HANDLER_PATH = `/_electric/builtin-agent-handler`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@electric-ax/agents",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "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@350",
+    "@durable-streams/state": "https://pkg.pr.new/durable-streams/durable-streams/@durable-streams/state@5d5c217",
     "@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.2.2"
+    "@electric-ax/agents-runtime": "0.3.1"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.13",