Skip to content
Merged
Show file tree
Hide file tree
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
7 changes: 5 additions & 2 deletions src/ai/custom-messages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export abstract class CustomMessage
{
if (obj._type === "error")
{
return new ErrorMessage(obj.content, obj.error);
return new ErrorMessage(obj.content, obj.level, obj.error);
}
else if (obj._type === "tool-progress")
{
Expand All @@ -41,18 +41,20 @@ export abstract class CustomMessage
class ErrorMessage extends CustomMessage
{
content: string;
level: "debug" | "warn" | "error";

error?: {
name: string;
message: string;
stack?: string;
};

constructor(content: string, error?: Error | ErrorMessage["error"])
constructor(content: string, level: ErrorMessage["level"] = "error", error?: Error | ErrorMessage["error"])
{
super("error");

this.content = content;
this.level = level;

if (error)
{
Expand Down Expand Up @@ -201,3 +203,4 @@ export
setMessageIsStreaming,
ToolProgressMessage,
};

5 changes: 4 additions & 1 deletion src/ai/session/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,10 @@ export class ChatSession implements IChatSession
})
.catch((error) =>
{
console.error("ERROR: Session save failed!", error);
this.setMessages([
...this.messages,
new ErrorMessage("Saving session failed", "error", error)
]);
});

return this._saveQueue;
Expand Down
6 changes: 3 additions & 3 deletions src/ai/work.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ async function work(props: WorkProps)

if (!stream)
{
messages.push(new ErrorMessage(`ERROR: ${error?.message || error?.toString() || "llm.stream(...) failed."}`, error));
messages.push(new ErrorMessage(`ERROR: ${error?.message || error?.toString() || "llm.stream(...) failed."}`, "error", error));
return messages;
}

Expand Down Expand Up @@ -63,7 +63,7 @@ async function work(props: WorkProps)

if (!result || error)
{
messages.push(new ErrorMessage(`ERROR: ${error?.message || error?.toString() || "llm.generate(...) failed."}`, error));
messages.push(new ErrorMessage(`ERROR: ${error?.message || error?.toString() || "llm.generate(...) failed."}`, "error", error));
return messages;
}

Expand Down Expand Up @@ -201,7 +201,7 @@ function addFailedToolCallMessage(error: string | Error, toolCall: { id?: string
}
else
{
messages.push(new ErrorMessage(content, (error instanceof Error) ? error : undefined));
messages.push(new ErrorMessage(content, "error", (error instanceof Error) ? error : undefined));
}
}

Expand Down