@townco/agent 0.1.52 → 0.1.54

package/dist/utils/context-size-calculator.d.ts

@@ -5,6 +5,8 @@
 import type { SessionMessage } from "../acp-server/session-storage.js";
 export interface ContextSize {
     systemPromptTokens: number;
+    toolOverheadTokens?: number;
+    mcpOverheadTokens?: number;
     userMessagesTokens: number;
     assistantMessagesTokens: number;
     toolInputTokens: number;
@@ -22,8 +24,11 @@ export interface ContextSize {
  *   all messages, and all tool results
  * - We pass this as `llmReportedTokens` for comparison with our estimate
  * - This helps us validate the accuracy of our tokenizer estimates
- * - Tool declarations are NOT counted separately in our estimate since they're
- *   included in the LLM-reported value
+ *
+ * @param messages - Resolved messages from context entry
+ * @param systemPrompt - Base system prompt (without TODO instructions)
+ * @param llmReportedTokens - From API usage_metadata.input_tokens
+ * @param toolOverheadTokens - Pre-calculated tool overhead (built-in/custom/filesystem tool definitions + TODO instructions)
+ * @param mcpOverheadTokens - Pre-calculated MCP tool overhead (MCP tool definitions)
  */
-export declare function calculateContextSize(messages: SessionMessage[], // Resolved messages from context entry
-systemPrompt?: string, llmReportedTokens?: number): ContextSize;
+export declare function calculateContextSize(messages: SessionMessage[], systemPrompt?: string, llmReportedTokens?: number, toolOverheadTokens?: number, mcpOverheadTokens?: number): ContextSize;

package/dist/utils/context-size-calculator.js

@@ -37,12 +37,17 @@ function countContentBlock(block) {
  *   all messages, and all tool results
  * - We pass this as `llmReportedTokens` for comparison with our estimate
  * - This helps us validate the accuracy of our tokenizer estimates
- * - Tool declarations are NOT counted separately in our estimate since they're
- *   included in the LLM-reported value
+ *
+ * @param messages - Resolved messages from context entry
+ * @param systemPrompt - Base system prompt (without TODO instructions)
+ * @param llmReportedTokens - From API usage_metadata.input_tokens
+ * @param toolOverheadTokens - Pre-calculated tool overhead (built-in/custom/filesystem tool definitions + TODO instructions)
+ * @param mcpOverheadTokens - Pre-calculated MCP tool overhead (MCP tool definitions)
  */
-export function calculateContextSize(messages, // Resolved messages from context entry
-systemPrompt, llmReportedTokens) {
+export function calculateContextSize(messages, systemPrompt, llmReportedTokens, toolOverheadTokens, mcpOverheadTokens) {
     const systemPromptTokens = systemPrompt ? countTokens(systemPrompt) : 0;
+    const toolOverheadTokensEstimate = toolOverheadTokens ?? 0;
+    const mcpOverheadTokensEstimate = mcpOverheadTokens ?? 0;
     let userMessagesTokens = 0;
     let assistantMessagesTokens = 0;
     let toolInputTokens = 0;
@@ -62,17 +67,29 @@ systemPrompt, llmReportedTokens) {
             }
         }
     }
-    return {
+    const result = {
         systemPromptTokens,
         userMessagesTokens,
         assistantMessagesTokens,
         toolInputTokens,
         toolResultsTokens,
         totalEstimated: systemPromptTokens +
+            toolOverheadTokensEstimate +
+            mcpOverheadTokensEstimate +
             userMessagesTokens +
             assistantMessagesTokens +
             toolInputTokens +
             toolResultsTokens,
-        llmReportedInputTokens: llmReportedTokens,
     };
+    // Only include optional fields if they have values
+    if (toolOverheadTokensEstimate > 0) {
+        result.toolOverheadTokens = toolOverheadTokensEstimate;
+    }
+    if (mcpOverheadTokensEstimate > 0) {
+        result.mcpOverheadTokens = mcpOverheadTokensEstimate;
+    }
+    if (llmReportedTokens !== undefined) {
+        result.llmReportedInputTokens = llmReportedTokens;
+    }
+    return result;
 }

package/dist/utils/tool-overhead-calculator.d.ts

@@ -0,0 +1,30 @@
+/**
+ * Tool overhead calculation utilities
+ * Estimates token overhead from tool definitions sent to LLM APIs
+ */
+export interface ToolMetadata {
+    name: string;
+    description: string;
+    schema: Record<string, unknown>;
+}
+/**
+ * Estimate tokens for a single tool definition
+ * LLMs receive tools as JSON with name, description, and parameters schema
+ *
+ * Note: Different LLM providers (Anthropic, OpenAI, Gemini) serialize tools
+ * slightly differently. This is a rough approximation based on the general format.
+ */
+export declare function estimateToolDefinitionTokens(tool: ToolMetadata): number;
+/**
+ * Estimate total tokens for all tool definitions
+ */
+export declare function estimateAllToolsOverhead(tools: ToolMetadata[]): number;
+/**
+ * Extract metadata from LangChain tools
+ * LangChain tools have .name, .description, and .schema properties
+ */
+export declare function extractToolMetadata(langchainTool: {
+    name: string;
+    description?: string;
+    schema?: unknown;
+}): ToolMetadata;

package/dist/utils/tool-overhead-calculator.js

@@ -0,0 +1,54 @@
+/**
+ * Tool overhead calculation utilities
+ * Estimates token overhead from tool definitions sent to LLM APIs
+ */
+import { countTokens } from "./token-counter.js";
+/**
+ * Estimate tokens for a single tool definition
+ * LLMs receive tools as JSON with name, description, and parameters schema
+ *
+ * Note: Different LLM providers (Anthropic, OpenAI, Gemini) serialize tools
+ * slightly differently. This is a rough approximation based on the general format.
+ */
+export function estimateToolDefinitionTokens(tool) {
+    // Rough serialization of how tools are sent to APIs:
+    // {"name": "tool_name", "description": "...", "input_schema": {...}}
+    const approximateJson = JSON.stringify({
+        name: tool.name,
+        description: tool.description,
+        input_schema: tool.schema,
+    });
+    return countTokens(approximateJson);
+}
+/**
+ * Estimate total tokens for all tool definitions
+ */
+export function estimateAllToolsOverhead(tools) {
+    return tools.reduce((total, tool) => total + estimateToolDefinitionTokens(tool), 0);
+}
+/**
+ * Extract metadata from LangChain tools
+ * LangChain tools have .name, .description, and .schema properties
+ */
+export function extractToolMetadata(langchainTool) {
+    // LangChain tools may have Zod schemas - serialize them to JSON
+    let schemaObject = {};
+    if (langchainTool.schema) {
+        // If it's a Zod schema, it might have a _def property
+        if (typeof langchainTool.schema === "object" &&
+            langchainTool.schema !== null) {
+            // Try to serialize to JSON, fallback to empty object
+            try {
+                schemaObject = JSON.parse(JSON.stringify(langchainTool.schema));
+            }
+            catch {
+                schemaObject = {};
+            }
+        }
+    }
+    return {
+        name: langchainTool.name,
+        description: langchainTool.description || "",
+        schema: schemaObject,
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@townco/agent",
-  "version": "0.1.52",
+  "version": "0.1.54",
   "type": "module",
   "module": "index.ts",
   "files": [
@@ -55,6 +55,7 @@
     "@agentclientprotocol/sdk": "^0.5.1",
     "@anthropic-ai/sandbox-runtime": "^0.0.2",
     "@anthropic-ai/sdk": "^0.70.0",
+    "@google/genai": "^0.14.1",
     "@anthropic-ai/tokenizer": "^0.0.4",
     "@electric-sql/pglite": "^0.2.15",
     "@langchain/anthropic": "1.0.1",
@@ -73,11 +74,11 @@
     "@opentelemetry/sdk-trace-base": "^1.28.0",
     "@opentelemetry/sdk-trace-node": "^1.28.0",
     "@opentelemetry/semantic-conventions": "^1.28.0",
-    "@townco/core": "0.0.25",
-    "@townco/gui-template": "0.1.44",
-    "@townco/tsconfig": "0.1.44",
-    "@townco/tui-template": "0.1.44",
-    "@townco/ui": "0.1.47",
+    "@townco/core": "0.0.27",
+    "@townco/gui-template": "0.1.46",
+    "@townco/tsconfig": "0.1.46",
+    "@townco/tui-template": "0.1.46",
+    "@townco/ui": "0.1.49",
     "exa-js": "^2.0.0",
     "hono": "^4.10.4",
     "langchain": "^1.0.3",

package/templates/index.ts

@@ -4,6 +4,9 @@ import type { AgentDefinition } from "../definition";
 export interface TemplateVars {
   name: string;
   model: string;
+  displayName?: string;
+  description?: string;
+  suggestedPrompts?: string[];
   tools: Array<
     | string
     | { type: "custom"; modulePath: string }
@@ -45,7 +48,7 @@ export function getTemplateVars(
   definition: AgentDefinition,
 ): TemplateVars {
   const tools = definition.tools ?? [];
-  return {
+  const result: TemplateVars = {
     name,
     model: definition.model,
     tools,
@@ -55,6 +58,18 @@ export function getTemplateVars(
     ),
     hooks: definition.hooks as TemplateVars["hooks"],
   };
+
+  if (definition.displayName) {
+    result.displayName = definition.displayName;
+  }
+  if (definition.description) {
+    result.description = definition.description;
+  }
+  if (definition.suggestedPrompts) {
+    result.suggestedPrompts = definition.suggestedPrompts;
+  }
+
+  return result;
 }
 
 export function generatePackageJson(vars: TemplateVars): string {
@@ -94,12 +109,28 @@ export function generatePackageJson(vars: TemplateVars): string {
 }
 
 export async function generateIndexTs(vars: TemplateVars): Promise<string> {
-  const agentDef = {
+  // Build agent definition with fields in a logical order
+  const agentDef: Record<string, unknown> = {
     model: vars.model,
-    systemPrompt: vars.systemPrompt,
-    tools: vars.tools,
-    hooks: vars.hooks,
   };
+
+  if (vars.displayName) {
+    agentDef.displayName = vars.displayName;
+  }
+  if (vars.description) {
+    agentDef.description = vars.description;
+  }
+  if (vars.suggestedPrompts) {
+    agentDef.suggestedPrompts = vars.suggestedPrompts;
+  }
+
+  agentDef.systemPrompt = vars.systemPrompt;
+  agentDef.tools = vars.tools;
+
+  if (vars.hooks) {
+    agentDef.hooks = vars.hooks;
+  }
+
   return prettier.format(
     `import { makeHttpTransport, makeStdioTransport } from "@townco/agent/acp-server";
 import type { AgentDefinition } from "@townco/agent/definition";

package/dist/check-jaeger.d.ts

@@ -1,5 +0,0 @@
-/**
- * Quick script to verify Jaeger connectivity
- * Run with: bun check-jaeger.ts
- */
-export {};

package/dist/check-jaeger.js

@@ -1,82 +0,0 @@
-/**
- * Quick script to verify Jaeger connectivity
- * Run with: bun check-jaeger.ts
- */
-export {}; // Make this a module for top-level await
-console.log("🔍 Checking Jaeger connectivity...\n");
-// Check if Jaeger collector is accepting OTLP on gRPC port
-const checkPort = async (port, protocol) => {
-    try {
-        const net = await import("node:net");
-        const socket = new net.Socket();
-        return new Promise((resolve) => {
-            socket.setTimeout(2000);
-            socket.on("connect", () => {
-                console.log(`✅ ${protocol} port ${port} is accepting connections`);
-                socket.destroy();
-                resolve(true);
-            });
-            socket.on("timeout", () => {
-                console.log(`❌ ${protocol} port ${port} timed out`);
-                socket.destroy();
-                resolve(false);
-            });
-            socket.on("error", (error) => {
-                console.log(`❌ ${protocol} port ${port} not reachable: ${error.message}`);
-                resolve(false);
-            });
-            socket.connect(port, "localhost");
-        });
-    }
-    catch (error) {
-        console.log(`❌ Error checking ${protocol} port ${port}:`, error);
-        return false;
-    }
-};
-// Check Jaeger ports
-console.log("Checking Jaeger ports:");
-console.log("─────────────────────────────");
-await checkPort(4317, "OTLP gRPC"); // Collector OTLP gRPC
-await checkPort(4318, "OTLP HTTP"); // Collector OTLP HTTP
-await checkPort(16686, "UI       "); // Query UI
-console.log("\n🔍 Checking Docker container...\n");
-// Check if Jaeger container is running
-try {
-    const { execSync } = await import("node:child_process");
-    const output = execSync("docker ps --filter name=jaeger --format '{{.Status}}'", {
-        encoding: "utf-8",
-    }).trim();
-    if (output) {
-        console.log(`✅ Jaeger container is running: ${output}`);
-        // Check container logs for OTLP
-        try {
-            const logs = execSync("docker logs jaeger 2>&1 | tail -20", {
-                encoding: "utf-8",
-            });
-            console.log("\n📋 Recent container logs:");
-            console.log("─────────────────────────────");
-            console.log(logs);
-        }
-        catch (e) {
-            console.log("⚠️  Could not fetch container logs");
-        }
-    }
-    else {
-        console.log("❌ No Jaeger container running with name 'jaeger'");
-        console.log("\n💡 Start Jaeger with:");
-        console.log("docker run -d --name jaeger \\");
-        console.log("  -e COLLECTOR_OTLP_ENABLED=true \\");
-        console.log("  -p 16686:16686 \\");
-        console.log("  -p 4317:4317 \\");
-        console.log("  -p 4318:4318 \\");
-        console.log("  jaegertracing/all-in-one:latest");
-    }
-}
-catch (error) {
-    console.log("⚠️  Could not check Docker container:", error);
-}
-console.log("\n🎯 Next steps:");
-console.log("─────────────────────────────");
-console.log("1. Make sure ports above show ✅");
-console.log("2. Run the test: ENABLE_TELEMETRY=true bun test-telemetry.ts");
-console.log("3. Check UI: http://localhost:16686");

package/dist/run-subagents.d.ts

@@ -1,9 +0,0 @@
-#!/usr/bin/env bun
-/**
- * Helper script to test makeSubagentsTool
- *
- * Usage:
- *   bun packages/agent/run-subagents.ts
- *   bun packages/agent/run-subagents.ts "your custom query here"
- */
-export {};

package/dist/run-subagents.js

@@ -1,110 +0,0 @@
-#!/usr/bin/env bun
-/**
- * Helper script to test makeSubagentsTool
- *
- * Usage:
- *   bun packages/agent/run-subagents.ts
- *   bun packages/agent/run-subagents.ts "your custom query here"
- */
-import { makeSubagentsTool } from "./utils";
-import { makeRunnerFromDefinition } from "./runner";
-// Default query if none provided
-const defaultQuery = "Can you search for news about artificial intelligence?";
-const userQuery = process.argv[2] || defaultQuery;
-console.log("🧪 Testing makeSubagentsTool\n");
-console.log("Query:", userQuery);
-console.log("─".repeat(60));
-// Create a simple subagent definition
-const simpleSubagent = {
-    model: "claude-sonnet-4-5-20250929",
-    systemPrompt: "You are a helpful research assistant. Provide concise, informative responses.",
-    tools: [
-        "web_search",
-        "todo_write",
-    ],
-    mcps: [],
-};
-// Create the coordinator agent with subagent tool
-const coordinatorAgent = {
-    model: "claude-sonnet-4-5-20250929",
-    systemPrompt: `You are a coordinator agent that delegates tasks to specialized subagents.
-When you receive a query, evaluate if it needs to be delegated to a subagent.
-If so, use the Task tool with the appropriate subagent.`,
-    tools: [
-        makeSubagentsTool([
-            {
-                agentName: "researcher",
-                description: "Use this agent to research topics, search the web, and gather information",
-                path: import.meta.filename, // Points to itself as a simple test
-            },
-            {
-                agentName: "simple",
-                description: "Use this for general tasks that don't require specialized tools",
-                path: import.meta.filename,
-            },
-        ]),
-    ],
-    mcps: [],
-};
-// Run the test
-async function runTest() {
-    console.log("\n📝 Creating runner...");
-    const runner = makeRunnerFromDefinition(coordinatorAgent);
-    console.log("🚀 Running query...\n");
-    try {
-        const stream = runner.invoke({
-            prompt: [
-                {
-                    type: "text",
-                    text: userQuery,
-                },
-            ],
-            sessionId: "test-session",
-            messageId: "msg-1",
-        });
-        console.log("📊 Stream output:");
-        console.log("─".repeat(60));
-        let messageCount = 0;
-        let toolCallCount = 0;
-        let lastTextContent = "";
-        for await (const chunk of stream) {
-            messageCount++;
-            // Pretty print different types of chunks
-            if (chunk.type === "agent_message_chunk") {
-                const content = chunk.content;
-                if (content.type === "text" && content.text) {
-                    process.stdout.write(content.text);
-                    lastTextContent += content.text;
-                }
-                else if (content.type === "tool_use") {
-                    toolCallCount++;
-                    console.log(`\n\n🔧 Tool Call #${toolCallCount}: ${content.name}`);
-                    console.log("   Input:", JSON.stringify(content.input, null, 2).split('\n').join('\n   '));
-                }
-            }
-            else if (chunk.type === "tool_result") {
-                console.log("\n\n✅ Tool Result:");
-                console.log("   ", JSON.stringify(chunk, null, 2).split('\n').join('\n   '));
-            }
-            else {
-                // Print other chunk types for debugging
-                console.log("\n\n📦 Chunk:", JSON.stringify(chunk, null, 2));
-            }
-        }
-        console.log("\n\n" + "─".repeat(60));
-        console.log("✨ Test completed!");
-        console.log(`   Total chunks: ${messageCount}`);
-        console.log(`   Tool calls: ${toolCallCount}`);
-        console.log("─".repeat(60));
-    }
-    catch (error) {
-        console.error("\n❌ Error during test:");
-        console.error(error);
-        process.exit(1);
-    }
-}
-// Run the test
-runTest().catch((error) => {
-    console.error("Fatal error:", error);
-    process.exit(1);
-});

package/dist/runner/langchain/custom-stream-types.d.ts

@@ -1,36 +0,0 @@
-import { z } from "zod";
-/**
- * Custom stream events emitted by subagent tools via config.writer
- */
-export declare const SubagentToolCallEventSchema: z.ZodObject<{
-    type: z.ZodLiteral<"tool_call">;
-    toolName: z.ZodString;
-}, z.core.$strip>;
-export declare const SubagentMessageEventSchema: z.ZodObject<{
-    type: z.ZodLiteral<"message">;
-    text: z.ZodString;
-}, z.core.$strip>;
-export declare const SubagentEventSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
-    type: z.ZodLiteral<"tool_call">;
-    toolName: z.ZodString;
-}, z.core.$strip>, z.ZodObject<{
-    type: z.ZodLiteral<"message">;
-    text: z.ZodString;
-}, z.core.$strip>], "type">;
-export type SubagentToolCallEvent = z.infer<typeof SubagentToolCallEventSchema>;
-export type SubagentMessageEvent = z.infer<typeof SubagentMessageEventSchema>;
-export type SubagentEvent = z.infer<typeof SubagentEventSchema>;
-/**
- * Wrapper for subagent events that includes the parent tool call ID
- */
-export declare const CustomStreamChunkSchema: z.ZodObject<{
-    parentToolCallId: z.ZodString;
-    event: z.ZodDiscriminatedUnion<[z.ZodObject<{
-        type: z.ZodLiteral<"tool_call">;
-        toolName: z.ZodString;
-    }, z.core.$strip>, z.ZodObject<{
-        type: z.ZodLiteral<"message">;
-        text: z.ZodString;
-    }, z.core.$strip>], "type">;
-}, z.core.$strip>;
-export type CustomStreamChunk = z.infer<typeof CustomStreamChunkSchema>;

package/dist/runner/langchain/custom-stream-types.js

@@ -1,23 +0,0 @@
-import { z } from "zod";
-/**
- * Custom stream events emitted by subagent tools via config.writer
- */
-export const SubagentToolCallEventSchema = z.object({
-    type: z.literal("tool_call"),
-    toolName: z.string(),
-});
-export const SubagentMessageEventSchema = z.object({
-    type: z.literal("message"),
-    text: z.string(),
-});
-export const SubagentEventSchema = z.discriminatedUnion("type", [
-    SubagentToolCallEventSchema,
-    SubagentMessageEventSchema,
-]);
-/**
- * Wrapper for subagent events that includes the parent tool call ID
- */
-export const CustomStreamChunkSchema = z.object({
-    parentToolCallId: z.string(),
-    event: SubagentEventSchema,
-});

package/dist/runner/langchain/tools/bash.d.ts

@@ -1,14 +0,0 @@
-import { z } from "zod";
-export declare function makeBashTool(workingDirectory?: string): import("langchain").DynamicStructuredTool<z.ZodObject<{
-    command: z.ZodString;
-    timeout: z.ZodOptional<z.ZodNumber>;
-    description: z.ZodOptional<z.ZodString>;
-}, z.core.$strip>, {
-    command: string;
-    timeout?: number | undefined;
-    description?: string | undefined;
-}, {
-    command: string;
-    timeout?: number | undefined;
-    description?: string | undefined;
-}, unknown>;