@townco/agent 0.1.142 → 0.1.144

package/dist/acp-server/adapter.d.ts

@@ -17,7 +17,7 @@ export interface SubagentModeExtension {
  */
 export interface CitationSource {
     id: string;
-    url: string;
+    url?: string | undefined;
     title: string;
     snippet?: string | undefined;
     favicon?: string | undefined;

package/dist/acp-server/adapter.js

@@ -465,7 +465,15 @@ export class AgentAcpAdapter {
                 return citationSource;
             };
             // Check if this is a search results array (library__search_keyword)
-            const results = outputContent.results ?? outputContent.documents;
+            // Results may be at top level or nested in structuredContent (MCP tool wrapper)
+            const structuredContent = typeof outputContent.structuredContent === "object" &&
+                outputContent.structuredContent !== null
+                ? outputContent.structuredContent
+                : null;
+            const results = outputContent.results ??
+                outputContent.documents ??
+                structuredContent?.results ??
+                structuredContent?.documents;
             if (Array.isArray(results)) {
                 // Handle array of search results
                 logger.debug("Processing library search results array", {

package/dist/acp-server/session-storage.d.ts

@@ -164,7 +164,7 @@ export interface StoredSession {
  */
 export interface PersistedCitationSource {
     id: string;
-    url: string;
+    url?: string | undefined;
     title: string;
     snippet?: string | undefined;
     favicon?: string | undefined;

package/dist/acp-server/session-storage.js

@@ -168,7 +168,7 @@ const sessionMetadataSchema = z.object({
 // Citation schemas - matches SourceSchema from packages/ui/src/core/schemas/source.ts
 const persistedCitationSourceSchema = z.object({
     id: z.string(),
-    url: z.string(),
+    url: z.string().optional(), // Optional for backward compatibility with sessions that have missing URLs
     title: z.string(),
     snippet: z.string().optional(),
     favicon: z.string().optional(),

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

@@ -1,6 +1,6 @@
-import { ChatAnthropic } from "@langchain/anthropic";
 import { HumanMessage, SystemMessage } from "@langchain/core/messages";
 import { createLogger } from "../../../logger.js";
+import { createModelFromString } from "../../langchain/model-factory.js";
 import { createContextEntry, createFullMessageEntry, } from "../types";
 import { applyTokenPadding } from "./token-utils.js";
 const logger = createLogger("compaction-tool");
@@ -67,10 +67,8 @@ export const compactionTool = async (ctx) => {
     const hasLibraryMcp = ctx.agent.mcps?.some((mcp) => typeof mcp === "string" ? mcp === "library" : mcp.name === "library");
     try {
         // Create the LLM client using the same model as the agent
-        const model = new ChatAnthropic({
-            model: ctx.model,
-            temperature: 0,
-        });
+        // Use model factory to properly handle town- prefixed models (routes through shed proxy)
+        const model = await createModelFromString(ctx.model);
         // Build the conversation history to compact
         const messagesToCompact = ctx.session.messages;
         // Convert session messages to text for context, including tool calls and results

package/dist/runner/langchain/index.js

@@ -185,7 +185,15 @@ function extractSourcesBeforeCompaction(toolName, rawOutput) {
             };
         };
         // Check for results array (library__search_keyword, library__semantic_search)
-        const results = actualOutput.results ?? actualOutput.documents;
+        // Results may be at top level or nested in structuredContent (MCP tool wrapper)
+        const structuredContent = typeof actualOutput.structuredContent === "object" &&
+            actualOutput.structuredContent !== null
+            ? actualOutput.structuredContent
+            : null;
+        const results = actualOutput.results ??
+            actualOutput.documents ??
+            structuredContent?.results ??
+            structuredContent?.documents;
         if (Array.isArray(results)) {
             for (const result of results) {
                 if (result && typeof result === "object") {
@@ -202,6 +210,32 @@ function extractSourcesBeforeCompaction(toolName, rawOutput) {
                 sources.push(source);
         }
     }
+    // Handle subagent tool outputs (SubagentResult format: { text, sources })
+    const isSubagentTool = toolName === "subagent" || toolName === "Task";
+    if (isSubagentTool && Array.isArray(actualOutput.sources)) {
+        for (const source of actualOutput.sources) {
+            if (source &&
+                typeof source === "object" &&
+                typeof source.url === "string" &&
+                source.url) {
+                sourceCounter++;
+                sources.push({
+                    id: typeof source.id === "string" ? source.id : String(sourceCounter),
+                    url: source.url,
+                    title: typeof source.title === "string" ? source.title : "Untitled",
+                    snippet: typeof source.snippet === "string"
+                        ? source.snippet.slice(0, 200)
+                        : undefined,
+                    favicon: typeof source.favicon === "string"
+                        ? source.favicon
+                        : getFaviconFromUrl(source.url),
+                    sourceName: typeof source.sourceName === "string"
+                        ? source.sourceName
+                        : getSourceNameFromUrl(source.url),
+                });
+            }
+        }
+    }
     return sources;
 }
 function stableStringify(value) {
@@ -742,7 +776,41 @@ export class LangchainAgent {
                     const toolCallId = hasInflightToolCompaction
                         ? await consumeToolCallId(originalTool.name, input)
                         : `unknown_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-                    const result = await originalTool.invoke(input);
+                    let result = await originalTool.invoke(input);
+                    // Apply subagent source renumbering BEFORE extraction
+                    // This ensures pre-extracted sources have the same IDs as the text references
+                    const isSubagentToolResult = originalTool.name === SUBAGENT_TOOL_NAME &&
+                        result &&
+                        typeof result === "object" &&
+                        "sources" in result &&
+                        Array.isArray(result.sources) &&
+                        result.sources.length > 0;
+                    if (isSubagentToolResult) {
+                        const subagentResult = result;
+                        subagentCallCounter++;
+                        const baseOffset = subagentCallCounter * 1000;
+                        let sourceIndex = 0;
+                        // Create ID mapping and re-number sources with offset
+                        const idMapping = new Map();
+                        const renumberedSources = subagentResult.sources.map((source) => {
+                            sourceIndex++;
+                            const newId = String(baseOffset + sourceIndex);
+                            idMapping.set(source.id, newId);
+                            return { ...source, id: newId };
+                        });
+                        // Update citation references in the text [[oldId]] -> [[newId]]
+                        let updatedText = subagentResult.text;
+                        for (const [oldId, newId] of idMapping) {
+                            const pattern = new RegExp(`\\[\\[${oldId}\\]\\]`, "g");
+                            updatedText = updatedText.replace(pattern, `[[${newId}]]`);
+                        }
+                        _logger.info("Re-numbered subagent citation sources (in-flight)", {
+                            subagentCall: subagentCallCounter,
+                            originalCount: subagentResult.sources.length,
+                            idRange: `${baseOffset + 1}-${baseOffset + sourceIndex}`,
+                        });
+                        result = { text: updatedText, sources: renumberedSources };
+                    }
                     if (!inflightHookExecutor || !hasInflightToolCompaction) {
                         return result;
                     }
@@ -756,6 +824,7 @@ export class LangchainAgent {
                     const outputTokens = await countToolResultTokens(rawOutput);
                     // Extract citation sources BEFORE compaction to preserve URLs
                     // Compaction LLM may remove URLs as "unnecessary" during summarization
+                    // NOTE: For subagent tools, sources are already renumbered above
                     const preExtractedSources = extractSourcesBeforeCompaction(originalTool.name, rawOutput);
                     // Include current prompt as the last user message for better context.
                     const nowIso = new Date().toISOString();
@@ -899,65 +968,10 @@ export class LangchainAgent {
                         allowedToolNames.has(t.name));
                 });
             }
-            // Wrap the subagent tool to re-number citation sources
-            // This ensures sources from subagents get unique IDs that don't conflict
-            // with the parent agent's own sources or other subagent calls
-            // Each subagent call gets a unique ID range (1000+, 2000+, etc.)
-            finalTools = finalTools.map((t) => {
-                if (t.name !== SUBAGENT_TOOL_NAME) {
-                    return t;
-                }
-                const wrappedFunc = async (input) => {
-                    const result = (await t.invoke(input));
-                    // Check if result has sources to re-number
-                    if (!result ||
-                        typeof result !== "object" ||
-                        !Array.isArray(result.sources) ||
-                        result.sources.length === 0) {
-                        return result;
-                    }
-                    // Increment subagent call counter and calculate base offset
-                    subagentCallCounter++;
-                    const baseOffset = subagentCallCounter * 1000;
-                    let sourceIndex = 0;
-                    // Create ID mapping and re-number sources with offset
-                    const idMapping = new Map();
-                    const renumberedSources = result.sources.map((source) => {
-                        sourceIndex++;
-                        const newId = String(baseOffset + sourceIndex);
-                        idMapping.set(source.id, newId);
-                        return { ...source, id: newId };
-                    });
-                    // Update citation references in the text [[oldId]] -> [[newId]]
-                    let updatedText = result.text;
-                    for (const [oldId, newId] of idMapping) {
-                        const pattern = new RegExp(`\\[\\[${oldId}\\]\\]`, "g");
-                        updatedText = updatedText.replace(pattern, `[[${newId}]]`);
-                    }
-                    _logger.info("Re-numbered subagent citation sources", {
-                        subagentCall: subagentCallCounter,
-                        originalCount: result.sources.length,
-                        idRange: `${baseOffset + 1}-${baseOffset + sourceIndex}`,
-                    });
-                    return { text: updatedText, sources: renumberedSources };
-                };
-                // Create new tool with wrapped function
-                // biome-ignore lint/suspicious/noExplicitAny: Need to pass function with dynamic signature
-                const wrappedTool = tool(wrappedFunc, {
-                    name: t.name,
-                    description: t.description,
-                    // biome-ignore lint/suspicious/noExplicitAny: Accessing internal schema property
-                    schema: t.schema,
-                });
-                // Preserve metadata
-                // biome-ignore lint/suspicious/noExplicitAny: Need to add custom properties to LangChain tool
-                wrappedTool.prettyName = t.prettyName;
-                // biome-ignore lint/suspicious/noExplicitAny: Need to add custom properties to LangChain tool
-                wrappedTool.icon = t.icon;
-                // biome-ignore lint/suspicious/noExplicitAny: Need to preserve subagentConfigs for metadata
-                wrappedTool.subagentConfigs = t.subagentConfigs;
-                return wrappedTool;
-            });
+            // NOTE: Subagent source renumbering now happens earlier in the wrappedTools
+            // wrapper (around line 1050) to ensure pre-extracted sources have matching IDs.
+            // This ensures that when sources are extracted before compaction, they already
+            // have the renumbered IDs (1001+, 2001+, etc.) that match the text references.
             // Create the model instance using the factory
             // This detects the provider from the model string:
             // - "gemini-2.0-flash" → Google Generative AI