refactor: extract detail display logic into helper functions
This commit is contained in:
@@ -14,6 +14,11 @@ export type ToolCallDisplayModel = {
|
|||||||
errorText?: string;
|
errorText?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
type DetailDisplay = {
|
||||||
|
displayName?: string;
|
||||||
|
summary?: string;
|
||||||
|
};
|
||||||
|
|
||||||
function isRecord(value: unknown): value is Record<string, unknown> {
|
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||||
return typeof value === "object" && value !== null && !Array.isArray(value);
|
return typeof value === "object" && value !== null && !Array.isArray(value);
|
||||||
}
|
}
|
||||||
@@ -56,55 +61,84 @@ function formatErrorText(error: unknown): string | undefined {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function buildToolCallDisplayModel(input: ToolCallDisplayInput): ToolCallDisplayModel {
|
function buildFilePathDisplay(
|
||||||
const lowerName = input.name.trim().toLowerCase();
|
displayName: string,
|
||||||
|
filePath: string,
|
||||||
let displayName = humanizeToolName(input.name);
|
cwd: string | undefined,
|
||||||
let summary: string | undefined;
|
): DetailDisplay {
|
||||||
|
return {
|
||||||
|
displayName,
|
||||||
|
summary: stripCwdPrefix(filePath, cwd),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildCanonicalDetailDisplay(input: ToolCallDisplayInput): DetailDisplay {
|
||||||
switch (input.detail.type) {
|
switch (input.detail.type) {
|
||||||
case "shell":
|
case "shell":
|
||||||
displayName = "Shell";
|
return {
|
||||||
summary = input.detail.command;
|
displayName: "Shell",
|
||||||
break;
|
summary: input.detail.command,
|
||||||
|
};
|
||||||
case "read":
|
case "read":
|
||||||
displayName = "Read";
|
return buildFilePathDisplay("Read", input.detail.filePath, input.cwd);
|
||||||
summary = stripCwdPrefix(input.detail.filePath, input.cwd);
|
|
||||||
break;
|
|
||||||
case "edit":
|
case "edit":
|
||||||
displayName = "Edit";
|
return buildFilePathDisplay("Edit", input.detail.filePath, input.cwd);
|
||||||
summary = stripCwdPrefix(input.detail.filePath, input.cwd);
|
|
||||||
break;
|
|
||||||
case "write":
|
case "write":
|
||||||
displayName = "Write";
|
return buildFilePathDisplay("Write", input.detail.filePath, input.cwd);
|
||||||
summary = stripCwdPrefix(input.detail.filePath, input.cwd);
|
|
||||||
break;
|
|
||||||
case "search":
|
case "search":
|
||||||
displayName = "Search";
|
return {
|
||||||
summary = input.detail.query;
|
displayName: "Search",
|
||||||
break;
|
summary: input.detail.query,
|
||||||
|
};
|
||||||
case "worktree_setup":
|
case "worktree_setup":
|
||||||
displayName = "Worktree Setup";
|
return {
|
||||||
summary = input.detail.branchName;
|
displayName: "Worktree Setup",
|
||||||
break;
|
summary: input.detail.branchName,
|
||||||
|
};
|
||||||
case "sub_agent":
|
case "sub_agent":
|
||||||
displayName = readString(input.detail.subAgentType) ?? "Task";
|
return {
|
||||||
summary = readString(input.detail.description);
|
displayName: readString(input.detail.subAgentType) ?? "Task",
|
||||||
break;
|
summary: readString(input.detail.description),
|
||||||
|
};
|
||||||
case "plain_text":
|
case "plain_text":
|
||||||
summary = input.detail.label;
|
return {
|
||||||
break;
|
summary: input.detail.label,
|
||||||
|
};
|
||||||
case "unknown":
|
case "unknown":
|
||||||
break;
|
return {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildUnknownDetailOverride(input: ToolCallDisplayInput): DetailDisplay {
|
||||||
|
if (input.detail.type !== "unknown") {
|
||||||
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lowerName === "task" && input.detail.type === "unknown") {
|
const lowerName = input.name.trim().toLowerCase();
|
||||||
displayName = "Task";
|
if (lowerName === "task") {
|
||||||
summary = isRecord(input.metadata) ? readString(input.metadata.subAgentActivity) : undefined;
|
return {
|
||||||
} else if (lowerName === "thinking" && input.detail.type === "unknown") {
|
displayName: "Task",
|
||||||
displayName = "Thinking";
|
summary: isRecord(input.metadata)
|
||||||
|
? readString(input.metadata.subAgentActivity)
|
||||||
|
: undefined,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
if (lowerName === "thinking") {
|
||||||
|
return {
|
||||||
|
displayName: "Thinking",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
export function buildToolCallDisplayModel(input: ToolCallDisplayInput): ToolCallDisplayModel {
|
||||||
|
const canonicalDisplay = buildCanonicalDetailDisplay(input);
|
||||||
|
const unknownDetailOverride = buildUnknownDetailOverride(input);
|
||||||
|
const displayName =
|
||||||
|
unknownDetailOverride.displayName ??
|
||||||
|
canonicalDisplay.displayName ??
|
||||||
|
humanizeToolName(input.name);
|
||||||
|
const summary = unknownDetailOverride.summary ?? canonicalDisplay.summary;
|
||||||
const errorText = input.status === "failed" ? formatErrorText(input.error) : undefined;
|
const errorText = input.status === "failed" ? formatErrorText(input.error) : undefined;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|||||||
Reference in New Issue
Block a user