Skip to content

fix: discover subagent files by directory scan instead of JSONL references #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
neoeny152 wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −11
Open

fix: discover subagent files by directory scan instead of JSONL references #245

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions src/utils/jsonl-metrics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,25 @@ export async function getTokenMetrics(transcriptPath: string): Promise<TokenMetr
+ (usage.cache_creation_input_tokens ?? 0);
}

// Include tokens from subagent transcript files
const subagentPaths = getSubagentTranscriptPaths(transcriptPath);
for (const subagentPath of subagentPaths) {
try {
const subLines = await readJsonlLines(subagentPath);
for (const subLine of subLines) {
const subData = parseJsonlLine(subLine) as TranscriptLine | null;
if (subData?.message?.usage) {
inputTokens += subData.message.usage.input_tokens || 0;
outputTokens += subData.message.usage.output_tokens || 0;
cachedTokens += subData.message.usage.cache_read_input_tokens ?? 0;
cachedTokens += subData.message.usage.cache_creation_input_tokens ?? 0;
}
}
} catch {
// Skip unreadable subagent files
}
}

const totalTokens = inputTokens + outputTokens + cachedTokens;

return { inputTokens, outputTokens, cachedTokens, totalTokens, contextLength };
Expand Down Expand Up @@ -409,11 +428,7 @@ function buildEmptyWindowedMetrics(windowSeconds: number[]): Record<string, Spee
return windowed;
}

function getSubagentTranscriptPaths(transcriptPath: string, referencedAgentIds: Set<string>): string[] {
if (referencedAgentIds.size === 0) {
return [];
}

function getSubagentTranscriptPaths(transcriptPath: string): string[] {
const transcriptDir = path.dirname(transcriptPath);
const transcriptStem = path.parse(transcriptPath).name;
const candidateDirs = [
Expand All @@ -440,10 +455,6 @@ function getSubagentTranscriptPaths(transcriptPath: string, referencedAgentIds:
continue;
}

if (!referencedAgentIds.has(match[1])) {
continue;
}

const fullPath = path.join(subagentsDir, entry.name);
if (seenPaths.has(fullPath)) {
continue;
Expand Down Expand Up @@ -487,8 +498,7 @@ export async function getSpeedMetricsCollection(
];

if (options.includeSubagents === true) {
const referencedSubagentIds = getReferencedSubagentIds(mainLines);
const subagentPaths = getSubagentTranscriptPaths(transcriptPath, referencedSubagentIds);
const subagentPaths = getSubagentTranscriptPaths(transcriptPath);
const subagentMetricsResults = await Promise.all(subagentPaths.map(async (subagentPath) => {
try {
const subagentLines = await readJsonlLines(subagentPath);
Expand Down