Add progress tracking fields to shared types and session parser
Introduce ProgressSubtype union ("hook" | "bash" | "mcp" | "agent") and
three new fields on ParsedMessage: toolUseId, parentToolUseId, and
progressSubtype. These enable linking hook_progress events to the
tool_call that spawned them and classifying progress by source.
Session parser changes:
- Extract `id` from tool_use content blocks into toolUseId
- Extract `tool_use_id` from tool_result blocks into toolUseId (was
previously misassigned to toolName)
- Read `parentToolUseID` from raw progress lines
- Derive progressSubtype from the `data.type` field using a new
deriveProgressSubtype() helper
- Add `toolProgress` map to SessionDetailResponse for grouped progress
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import fs from "fs/promises";
|
||||
import type { ParsedMessage } from "../../shared/types.js";
|
||||
import type { ParsedMessage, ProgressSubtype } from "../../shared/types.js";
|
||||
|
||||
/**
|
||||
* Real Claude Code JSONL format (verified from actual session files):
|
||||
@@ -19,6 +19,7 @@ import type { ParsedMessage } from "../../shared/types.js";
|
||||
|
||||
interface ContentBlock {
|
||||
type: string;
|
||||
id?: string;
|
||||
text?: string;
|
||||
thinking?: string;
|
||||
name?: string;
|
||||
@@ -31,6 +32,7 @@ interface RawLine {
|
||||
type?: string;
|
||||
uuid?: string;
|
||||
timestamp?: string;
|
||||
parentToolUseID?: string;
|
||||
message?: {
|
||||
role?: string;
|
||||
content?: string | ContentBlock[];
|
||||
@@ -85,12 +87,16 @@ function extractMessages(raw: RawLine, rawIndex: number): ParsedMessage[] {
|
||||
const progressText = data
|
||||
? formatProgressData(data)
|
||||
: "Progress event";
|
||||
const dataType = typeof data?.type === "string" ? data.type : "";
|
||||
const progressSubtype = deriveProgressSubtype(dataType);
|
||||
messages.push({
|
||||
uuid,
|
||||
category: "hook_progress",
|
||||
content: progressText,
|
||||
timestamp,
|
||||
rawIndex,
|
||||
parentToolUseId: raw.parentToolUseID,
|
||||
progressSubtype,
|
||||
});
|
||||
return messages;
|
||||
}
|
||||
@@ -155,7 +161,7 @@ function extractMessages(raw: RawLine, rawIndex: number): ParsedMessage[] {
|
||||
uuid: `${uuid}-tr-${block.tool_use_id || rawIndex}`,
|
||||
category: "tool_result",
|
||||
content: resultText,
|
||||
toolName: block.tool_use_id,
|
||||
toolUseId: block.tool_use_id,
|
||||
timestamp,
|
||||
rawIndex,
|
||||
});
|
||||
@@ -215,6 +221,7 @@ function extractMessages(raw: RawLine, rawIndex: number): ParsedMessage[] {
|
||||
toolInput: JSON.stringify(block.input, null, 2),
|
||||
timestamp,
|
||||
rawIndex,
|
||||
toolUseId: block.id,
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -239,3 +246,10 @@ function formatProgressData(data: Record<string, unknown>): string {
|
||||
function detectSystemReminder(text: string): boolean {
|
||||
return text.includes("<system-reminder>") || text.includes("</system-reminder>");
|
||||
}
|
||||
|
||||
function deriveProgressSubtype(dataType: string): ProgressSubtype {
|
||||
if (dataType === "bash_progress") return "bash";
|
||||
if (dataType === "mcp_progress") return "mcp";
|
||||
if (dataType === "agent_progress") return "agent";
|
||||
return "hook";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user