@schlenkr/ragents 0.1.5 → 0.1.6

package/packages/agent/src/core/extensions/wrapper.ts

@@ -2,44 +2,23 @@
  * Tool wrappers for extension-registered tools.
  *
  * These wrappers only adapt tool execution so extension tools receive the runner context.
- * Tool call and tool result interception is handled by AgentSession via agent-core hooks.
+ * Tool result interception is handled by AgentSession via the hooks of the agent loop.
  */
 
-import type { AgentTool } from "@aicontainer/agent-core";
-import { wrapToolDefinition } from "../tools/tool-definition-wrapper.ts";
+import type { AgentTool } from "../../loop/index.ts";
 import type { ExtensionRunner } from "./runner.ts";
 import type { RegisteredTool } from "./types.ts";
 
-/**
- * Wrap a RegisteredTool into an AgentTool.
- * Uses the runner's createContext() for consistent context across tools and event handlers.
- */
-export function wrapRegisteredTool(registeredTool: RegisteredTool, runner: ExtensionRunner): AgentTool {
-	const tool = wrapToolDefinition(registeredTool.definition, () => runner.createContext());
-	const execute = tool.execute;
-	return {
-		...tool,
-		execute: async (toolCallId, params, signal, onUpdate) => {
-			const activeBefore = runner.getActiveTools();
-			const result = await execute(toolCallId, params, signal, onUpdate);
-			const activeAfter = runner.getActiveTools();
-			if (!activeBefore.every((name) => activeAfter.includes(name))) return result;
-
-			const beforeNames = new Set(activeBefore);
-			const addedToolNames = activeAfter.filter((name) => !beforeNames.has(name));
-			if (addedToolNames.length === 0) return result;
-			return {
-				...result,
-				addedToolNames: [...new Set([...(result.addedToolNames ?? []), ...addedToolNames])],
-			};
-		},
-	};
-}
-
-/**
- * Wrap all registered tools into AgentTools.
- * Uses the runner's createContext() for consistent context across tools and event handlers.
- */
+/** Wrap registered tools into AgentTools that receive the runner context on every call. */
 export function wrapRegisteredTools(registeredTools: RegisteredTool[], runner: ExtensionRunner): AgentTool[] {
-	return registeredTools.map((tool) => wrapRegisteredTool(tool, runner));
+	return registeredTools.map(({ definition }) => ({
+		name: definition.name,
+		label: definition.label,
+		description: definition.description,
+		parameters: definition.parameters,
+		prepareArguments: definition.prepareArguments,
+		executionMode: definition.executionMode,
+		execute: (toolCallId, params, signal, onUpdate) =>
+			definition.execute(toolCallId, params, signal, onUpdate, runner.createContext()),
+	}));
 }

package/packages/agent/src/core/messages.ts

@@ -1,12 +1,7 @@
-/**
- * Custom message types and transformers for the coding agent.
- *
- * Extends the base AgentMessage type with coding-agent specific message types,
- * and provides a transformer to convert them to LLM-compatible messages.
- */
+/** Custom message types of the agent runtime and their conversion to LLM messages. */
 
-import type { AgentMessage } from "@aicontainer/agent-core";
-import type { Message, UserContent } from "@aicontainer/ai";
+import type { AgentMessage } from "../loop/index.ts";
+import type { Message, UserContent } from "@ragents/ai";
 
 export const COMPACTION_SUMMARY_PREFIX = `The conversation history before this point was compacted into the following summary:
 
@@ -16,33 +11,7 @@ export const COMPACTION_SUMMARY_PREFIX = `The conversation history before this p
 export const COMPACTION_SUMMARY_SUFFIX = `
 </summary>`;
 
-export const BRANCH_SUMMARY_PREFIX = `The following is a summary of a branch that this conversation came back from:
-
-<summary>
-`;
-
-export const BRANCH_SUMMARY_SUFFIX = `</summary>`;
-
-/**
- * Message type for bash executions via the ! command.
- */
-export interface BashExecutionMessage {
-	role: "bashExecution";
-	command: string;
-	output: string;
-	exitCode: number | undefined;
-	cancelled: boolean;
-	truncated: boolean;
-	fullOutputPath?: string;
-	timestamp: number;
-	/** If true, this message is excluded from LLM context (!! prefix) */
-	excludeFromContext?: boolean;
-}
-
-/**
- * Message type for extension-injected messages via sendMessage().
- * These are custom messages that extensions can inject into the conversation.
- */
+/** Message that an extension injects into the context of a model call. */
 export interface CustomMessage<T = unknown> {
 	role: "custom";
 	customType: string;
@@ -52,13 +21,6 @@ export interface CustomMessage<T = unknown> {
 	timestamp: number;
 }
 
-export interface BranchSummaryMessage {
-	role: "branchSummary";
-	summary: string;
-	fromId: string;
-	timestamp: number;
-}
-
 export interface CompactionSummaryMessage {
 	role: "compactionSummary";
 	summary: string;
@@ -67,45 +29,13 @@ export interface CompactionSummaryMessage {
 }
 
 // Extend CustomAgentMessages via declaration merging
-declare module "@aicontainer/agent-core" {
+declare module "../loop/types.ts" {
 	interface CustomAgentMessages {
-		bashExecution: BashExecutionMessage;
 		custom: CustomMessage;
-		branchSummary: BranchSummaryMessage;
 		compactionSummary: CompactionSummaryMessage;
 	}
 }
 
-/**
- * Convert a BashExecutionMessage to user message text for LLM context.
- */
-export function bashExecutionToText(msg: BashExecutionMessage): string {
-	let text = `Ran \`${msg.command}\`\n`;
-	if (msg.output) {
-		text += `\`\`\`\n${msg.output}\n\`\`\``;
-	} else {
-		text += "(no output)";
-	}
-	if (msg.cancelled) {
-		text += "\n\n(command cancelled)";
-	} else if (msg.exitCode !== null && msg.exitCode !== undefined && msg.exitCode !== 0) {
-		text += `\n\nCommand exited with code ${msg.exitCode}`;
-	}
-	if (msg.truncated && msg.fullOutputPath) {
-		text += `\n\n[Output truncated. Full output: ${msg.fullOutputPath}]`;
-	}
-	return text;
-}
-
-export function createBranchSummaryMessage(summary: string, fromId: string, timestamp: string): BranchSummaryMessage {
-	return {
-		role: "branchSummary",
-		summary,
-		fromId,
-		timestamp: new Date(timestamp).getTime(),
-	};
-}
-
 export function createCompactionSummaryMessage(
 	summary: string,
 	tokensBefore: number,
@@ -119,24 +49,6 @@ export function createCompactionSummaryMessage(
 	};
 }
 
-/** Convert CustomMessageEntry to AgentMessage format */
-export function createCustomMessage(
-	customType: string,
-	content: string | UserContent[],
-	display: boolean,
-	details: unknown | undefined,
-	timestamp: string,
-): CustomMessage {
-	return {
-		role: "custom",
-		customType,
-		content,
-		display,
-		details,
-		timestamp: new Date(timestamp).getTime(),
-	};
-}
-
 /**
  * Transform AgentMessages (including custom types) to LLM-compatible Messages.
  *
@@ -149,16 +61,6 @@ export function convertToLlm(messages: AgentMessage[]): Message[] {
 	return messages
 		.map((m): Message | undefined => {
 			switch (m.role) {
-				case "bashExecution":
-					// Skip messages excluded from context (!! prefix)
-					if (m.excludeFromContext) {
-						return undefined;
-					}
-					return {
-						role: "user",
-						content: [{ type: "text", text: bashExecutionToText(m) }],
-						timestamp: m.timestamp,
-					};
 				case "custom": {
 					const content = typeof m.content === "string" ? [{ type: "text" as const, text: m.content }] : m.content;
 					return {
@@ -167,12 +69,6 @@ export function convertToLlm(messages: AgentMessage[]): Message[] {
 						timestamp: m.timestamp,
 					};
 				}
-				case "branchSummary":
-					return {
-						role: "user",
-						content: [{ type: "text" as const, text: BRANCH_SUMMARY_PREFIX + m.summary + BRANCH_SUMMARY_SUFFIX }],
-						timestamp: m.timestamp,
-					};
 				case "compactionSummary":
 					return {
 						role: "user",