@townco/agent 0.1.123 → 0.1.124
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/acp-server/session-storage.js +25 -0
- package/dist/runner/langchain/tools/subagent-connections.d.ts +2 -0
- package/dist/runner/langchain/tools/subagent.js +13 -6
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +7 -7
- package/dist/runner/langchain/tools/conversation_search.d.ts +0 -22
- package/dist/runner/langchain/tools/conversation_search.js +0 -137
|
@@ -45,11 +45,36 @@ const subagentContentBlockSchema = z.discriminatedUnion("type", [
|
|
|
45
45
|
toolCall: subagentToolCallBlockSchema,
|
|
46
46
|
}),
|
|
47
47
|
]);
|
|
48
|
+
const subagentContextSizeSchema = z.object({
|
|
49
|
+
systemPromptTokens: z.number(),
|
|
50
|
+
toolOverheadTokens: z.number().optional(),
|
|
51
|
+
mcpOverheadTokens: z.number().optional(),
|
|
52
|
+
userMessagesTokens: z.number(),
|
|
53
|
+
assistantMessagesTokens: z.number(),
|
|
54
|
+
toolInputTokens: z.number(),
|
|
55
|
+
toolResultsTokens: z.number(),
|
|
56
|
+
totalEstimated: z.number(),
|
|
57
|
+
llmReportedInputTokens: z.number().optional(),
|
|
58
|
+
modelContextWindow: z.number().optional(),
|
|
59
|
+
});
|
|
48
60
|
const subagentMessageSchema = z.object({
|
|
49
61
|
id: z.string(),
|
|
50
62
|
content: z.string(),
|
|
51
63
|
contentBlocks: z.array(subagentContentBlockSchema).optional(),
|
|
52
64
|
toolCalls: z.array(subagentToolCallBlockSchema).optional(),
|
|
65
|
+
// Subagent streaming metadata (for UI)
|
|
66
|
+
_meta: z
|
|
67
|
+
.object({
|
|
68
|
+
semanticName: z.string().optional(),
|
|
69
|
+
agentDefinitionName: z.string().optional(),
|
|
70
|
+
currentActivity: z.string().optional(),
|
|
71
|
+
statusGenerating: z.boolean().optional(),
|
|
72
|
+
context_size: subagentContextSizeSchema.optional(),
|
|
73
|
+
})
|
|
74
|
+
.passthrough()
|
|
75
|
+
.optional(),
|
|
76
|
+
// Some older payloads may send context_size top-level
|
|
77
|
+
context_size: subagentContextSizeSchema.optional(),
|
|
53
78
|
});
|
|
54
79
|
const toolCallBlockSchema = z.object({
|
|
55
80
|
type: z.literal("tool_call"),
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { ContextSize } from "../../../utils/context-size-calculator.js";
|
|
1
2
|
/**
|
|
2
3
|
* Sub-agent tool call tracked during streaming
|
|
3
4
|
*/
|
|
@@ -33,6 +34,7 @@ export interface SubagentMessage {
|
|
|
33
34
|
agentDefinitionName?: string;
|
|
34
35
|
currentActivity?: string;
|
|
35
36
|
statusGenerating?: boolean;
|
|
37
|
+
context_size?: ContextSize;
|
|
36
38
|
};
|
|
37
39
|
}
|
|
38
40
|
/**
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import * as crypto from "node:crypto";
|
|
2
2
|
import * as fs from "node:fs/promises";
|
|
3
|
-
import { mkdir } from "node:fs/promises";
|
|
4
3
|
import * as path from "node:path";
|
|
5
4
|
import Anthropic from "@anthropic-ai/sdk";
|
|
6
5
|
import { context, propagation, trace } from "@opentelemetry/api";
|
|
@@ -8,7 +7,7 @@ import { createLogger } from "@townco/core";
|
|
|
8
7
|
import { z } from "zod";
|
|
9
8
|
import { AgentAcpAdapter, SUBAGENT_MODE_KEY, } from "../../../acp-server/adapter.js";
|
|
10
9
|
import { makeRunnerFromDefinition } from "../../index.js";
|
|
11
|
-
import {
|
|
10
|
+
import { getAbortSignal, getSessionContext } from "../../session-context.js";
|
|
12
11
|
import { emitSubagentMessages, hashQuery, } from "./subagent-connections.js";
|
|
13
12
|
const logger = createLogger("subagent-tool", "debug");
|
|
14
13
|
/**
|
|
@@ -404,6 +403,14 @@ function createStreamingConnection(queryHash, currentMessage, toolCallMap, toolN
|
|
|
404
403
|
sessionUpdate: (notification) => {
|
|
405
404
|
const update = notification.update;
|
|
406
405
|
let shouldEmit = false;
|
|
406
|
+
// Capture subagent context size (usually sent by adapter via _meta.context_size)
|
|
407
|
+
const meta = update._meta;
|
|
408
|
+
const contextSize = meta?.context_size ??
|
|
409
|
+
update.context_size;
|
|
410
|
+
if (contextSize != null && currentMessage._meta) {
|
|
411
|
+
currentMessage._meta.context_size = contextSize;
|
|
412
|
+
shouldEmit = true;
|
|
413
|
+
}
|
|
407
414
|
// Handle agent_message_chunk
|
|
408
415
|
if (update.sessionUpdate === "agent_message_chunk") {
|
|
409
416
|
const content = update.content;
|
|
@@ -424,13 +431,13 @@ function createStreamingConnection(queryHash, currentMessage, toolCallMap, toolN
|
|
|
424
431
|
}
|
|
425
432
|
// Handle tool_call
|
|
426
433
|
if (update.sessionUpdate === "tool_call" && update.toolCallId) {
|
|
427
|
-
const
|
|
434
|
+
const toolMeta = update._meta;
|
|
428
435
|
const rawInput = update.rawInput;
|
|
429
436
|
const toolCall = {
|
|
430
437
|
id: update.toolCallId,
|
|
431
438
|
title: update.title || "Tool call",
|
|
432
|
-
prettyName:
|
|
433
|
-
icon:
|
|
439
|
+
prettyName: toolMeta?.prettyName,
|
|
440
|
+
icon: toolMeta?.icon,
|
|
434
441
|
status: update.status || "pending",
|
|
435
442
|
rawInput,
|
|
436
443
|
};
|
|
@@ -608,7 +615,7 @@ async function querySubagent(agentName, agentPath, agentWorkingDirectory, query,
|
|
|
608
615
|
try {
|
|
609
616
|
// Invoke through adapter (gets full session tracking + hook execution)
|
|
610
617
|
// The adapter will call connection.sessionUpdate() for streaming updates
|
|
611
|
-
|
|
618
|
+
await adapter.prompt(promptRequest);
|
|
612
619
|
logger.info("[DEBUG] Subagent adapter.prompt() completed", {
|
|
613
620
|
agentName,
|
|
614
621
|
queryHash,
|