@townco/agent 0.1.81 → 0.1.82

package/dist/acp-server/adapter.js

@@ -602,8 +602,7 @@ export class AgentAcpAdapter {
             const context_size = calculateContextSize(contextMessages, this.agent.definition.systemPrompt ?? undefined, undefined, // No LLM-reported tokens yet
             this.currentToolOverheadTokens, // Include tool overhead
             this.currentMcpOverheadTokens, // Include MCP overhead
-            getModelContextWindow(this.agent.definition.model), // Model context window for UI
-            true);
+            getModelContextWindow(this.agent.definition.model));
             const contextSnapshot = createContextSnapshot(session.messages.length - 1, // Exclude the newly added user message (it will be passed separately via prompt)
             new Date().toISOString(), previousContext, context_size);
             session.context.push(contextSnapshot);
@@ -1215,13 +1214,10 @@ export class AgentAcpAdapter {
                 }
             }
             // Calculate context size with LLM-reported tokens from this turn
-            // Exclude tool results - they're only sent during the turn they were received,
-            // not in subsequent turns (only messages are sent)
             const context_size = calculateContextSize(contextMessages, this.agent.definition.systemPrompt ?? undefined, turnTokenUsage.inputTokens, // Final LLM-reported tokens from this turn
             this.currentToolOverheadTokens, // Include tool overhead
             this.currentMcpOverheadTokens, // Include MCP overhead
-            getModelContextWindow(this.agent.definition.model), // Model context window for UI
-            true);
+            getModelContextWindow(this.agent.definition.model));
             const contextSnapshot = createContextSnapshot(session.messages.length, new Date().toISOString(), previousContext, context_size);
             session.context.push(contextSnapshot);
             await this.saveSessionToDisk(params.sessionId, session);

package/dist/runner/hooks/predefined/compaction-tool.js

@@ -24,14 +24,36 @@ export const compactionTool = async (ctx) => {
         });
         // Build the conversation history to compact
         const messagesToCompact = ctx.session.messages;
-        // Convert session messages to text for context
+        // Convert session messages to text for context, including tool calls and results
         const conversationText = messagesToCompact
             .map((msg) => {
-            const textContent = msg.content
-                .filter((block) => block.type === "text")
-                .map((block) => block.text)
-                .join("\n");
-            return `${msg.role.toUpperCase()}:\n${textContent}`;
+            const parts = [];
+            for (const block of msg.content) {
+                if (block.type === "text") {
+                    parts.push(block.text);
+                }
+                else if (block.type === "tool_call") {
+                    // Include tool call info
+                    parts.push(`[Tool: ${block.title}]`);
+                    if (block.rawInput) {
+                        parts.push(`Input: ${JSON.stringify(block.rawInput, null, 2)}`);
+                    }
+                    if (block.rawOutput) {
+                        // Summarize large outputs to avoid overwhelming the compaction LLM
+                        const outputStr = JSON.stringify(block.rawOutput);
+                        if (outputStr.length > 2000) {
+                            parts.push(`Output: [Large output - ${outputStr.length} chars]`);
+                        }
+                        else {
+                            parts.push(`Output: ${outputStr}`);
+                        }
+                    }
+                    if (block.error) {
+                        parts.push(`Error: ${block.error}`);
+                    }
+                }
+            }
+            return `${msg.role.toUpperCase()}:\n${parts.join("\n")}`;
         })
             .join("\n\n---\n\n");
         // Create system prompt for compaction

package/dist/runner/langchain/index.js

@@ -472,6 +472,7 @@ export class LangchainAgent {
             }
             const agent = createAgent(agentConfig);
             // Build messages from context history if available, otherwise use just the prompt
+            // Type includes tool messages for sending tool results
             let messages;
             // Helper to convert content blocks to LangChain format
             // LangChain expects image_url type with data URL, not Claude's native image+source format
@@ -539,11 +540,62 @@ export class LangchainAgent {
             };
             if (req.contextMessages && req.contextMessages.length > 0) {
                 // Use context messages (already resolved from context entries)
-                // Convert to LangChain format
-                messages = req.contextMessages.map((msg) => ({
-                    type: msg.role === "user" ? "human" : "ai",
-                    content: convertContentBlocks(msg.content),
-                }));
+                // Convert to LangChain format, including tool calls and their results
+                messages = [];
+                for (const msg of req.contextMessages) {
+                    if (msg.role === "user") {
+                        messages.push({
+                            type: "human",
+                            content: convertContentBlocks(msg.content),
+                        });
+                    }
+                    else if (msg.role === "assistant") {
+                        // Check if message has tool calls
+                        const toolCalls = msg.content.filter((block) => block.type === "tool_call");
+                        const textBlocks = msg.content.filter((block) => block.type === "text" || block.type === "image");
+                        if (toolCalls.length > 0) {
+                            // Build AI message with tool_use blocks
+                            const aiContent = [];
+                            // Add any text content first
+                            for (const block of textBlocks) {
+                                if (block.type === "text") {
+                                    aiContent.push({ type: "text", text: block.text });
+                                }
+                            }
+                            // Add tool_use blocks
+                            for (const tc of toolCalls) {
+                                if (tc.type === "tool_call") {
+                                    aiContent.push({
+                                        type: "tool_use",
+                                        id: tc.id,
+                                        name: tc.title,
+                                        input: tc.rawInput || {},
+                                    });
+                                }
+                            }
+                            messages.push({ type: "ai", content: aiContent });
+                            // Add tool result messages for each tool call that has output
+                            for (const tc of toolCalls) {
+                                if (tc.type === "tool_call" && tc.rawOutput) {
+                                    messages.push({
+                                        type: "tool",
+                                        tool_call_id: tc.id,
+                                        content: typeof tc.rawOutput === "string"
+                                            ? tc.rawOutput
+                                            : JSON.stringify(tc.rawOutput),
+                                    });
+                                }
+                            }
+                        }
+                        else {
+                            // No tool calls - simple AI message
+                            messages.push({
+                                type: "ai",
+                                content: convertContentBlocks(msg.content),
+                            });
+                        }
+                    }
+                }
                 // Add the current prompt as the final human message
                 const promptContent = convertContentBlocks(req.prompt);
                 messages.push({