Skip to content
Merged
Changes from all commits
Commits
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
26 changes: 14 additions & 12 deletions src/McpResponse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ export class McpResponse implements Response {
detailedNetworkRequest = formatter;
}

let consoleData: ConsoleFormatter | IssueFormatter | undefined;
let detailedConsoleMessage: ConsoleFormatter | IssueFormatter | undefined;

if (this.#attachedConsoleMessageId) {
const message = context.getConsoleMessageById(
Expand All @@ -239,7 +239,7 @@ export class McpResponse implements Response {
if ('args' in message) {
const consoleMessage = message as ConsoleMessage;
const devTools = context.getDevToolsUniverse();
consoleData = await ConsoleFormatter.from(consoleMessage, {
detailedConsoleMessage = await ConsoleFormatter.from(consoleMessage, {
id: consoleMessageStableId,
fetchDetailedData: true,
devTools: devTools ?? undefined,
Expand All @@ -255,15 +255,15 @@ export class McpResponse implements Response {
"Can't provide detals for the msgid " + consoleMessageStableId,
);
}
consoleData = formatter;
detailedConsoleMessage = formatter;
} else {
consoleData = await ConsoleFormatter.from(message as Error, {
detailedConsoleMessage = await ConsoleFormatter.from(message as Error, {
id: consoleMessageStableId,
});
}
}

let consoleListData: Array<ConsoleFormatter | IssueFormatter> | undefined;
let consoleMessages: Array<ConsoleFormatter | IssueFormatter> | undefined;
if (this.#consoleDataOptions?.include) {
let messages = context.getConsoleData(
this.#consoleDataOptions.includePreservedMessages,
Expand All @@ -282,7 +282,7 @@ export class McpResponse implements Response {
});
}

consoleListData = (
consoleMessages = (
await Promise.all(
messages.map(
async (item): Promise<ConsoleFormatter | IssueFormatter | null> => {
Expand Down Expand Up @@ -354,8 +354,8 @@ export class McpResponse implements Response {
}

return this.format(toolName, context, {
consoleData,
consoleListData,
detailedConsoleMessage,
consoleMessages,
snapshot,
detailedNetworkRequest,
networkRequests,
Expand All @@ -366,8 +366,8 @@ export class McpResponse implements Response {
toolName: string,
context: McpContext,
data: {
consoleData: ConsoleFormatter | IssueFormatter | undefined;
consoleListData: Array<ConsoleFormatter | IssueFormatter> | undefined;
detailedConsoleMessage: ConsoleFormatter | IssueFormatter | undefined;
consoleMessages: Array<ConsoleFormatter | IssueFormatter> | undefined;
snapshot: SnapshotFormatter | string | undefined;
detailedNetworkRequest?: NetworkFormatter;
networkRequests?: NetworkFormatter[];
Expand Down Expand Up @@ -454,7 +454,9 @@ Call ${handleDialog.name} to handle it before continuing.`);
structuredContent.networkRequest =
data.detailedNetworkRequest.toJSONDetailed();
}
response.push(...this.#formatConsoleData(context, data.consoleData));
response.push(
...this.#formatConsoleData(context, data.detailedConsoleMessage),
);

if (this.#networkRequestsOptions?.include) {
let requests = context.getNetworkRequests(
Expand Down Expand Up @@ -492,7 +494,7 @@ Call ${handleDialog.name} to handle it before continuing.`);
}

if (this.#consoleDataOptions?.include) {
const messages = data.consoleListData ?? [];
const messages = data.consoleMessages ?? [];

response.push('## Console messages');
if (messages.length) {
Expand Down