Skip to content

A self-improving RLM agent for coding workflows and long-running autonomous tasks.

Rust

refactor(agent): typed codes for Agent.continue precondition failures (#1588)

Sebastian Müller35103cb420ab
diff --git a/packages/agent/.changes/fix-typed-continue-preconditions.md b/packages/agent/.changes/fix-typed-continue-preconditions.md
new file mode 100644
index 0000000000..20054bba0c
--- /dev/null
+++ b/packages/agent/.changes/fix-typed-continue-preconditions.md
@@ -0,0 +1 @@
+- Added `AgentContinueError` with stable codes (`busy`, `nothing-to-continue`) for `Agent.continue()` precondition failures, so callers classify without matching message text.
diff --git a/packages/agent/src/agent.ts b/packages/agent/src/agent.ts
index 6f8849ac26..0b7b5ae774 100644
--- a/packages/agent/src/agent.ts
+++ b/packages/agent/src/agent.ts
@@ -172,6 +172,20 @@ type ActiveRun = {
abortController: AbortController;
};
+/** Why {@link Agent.continue} refused to start a continuation. */
+export type AgentContinueErrorCode = "busy" | "nothing-to-continue";
+
+/** Typed precondition failure from {@link Agent.continue}, so callers classify by code instead of message text. */
+export class AgentContinueError extends Error {
+ constructor(
+ readonly code: AgentContinueErrorCode,
+ message: string,
+ ) {
+ super(message);
+ this.name = "AgentContinueError";
+ }
+}
+
export class Agent {
private _state: MutableAgentState;
private readonly listeners = new Set<(event: AgentEvent, signal: AbortSignal) => Promise<void> | void>();
@@ -340,7 +354,7 @@ export class Agent {
/** The last message must convert to a user or tool-result message. */
async continue(): Promise<void> {
if (this.activeRun) {
- throw new Error("Agent is already processing. Wait for completion before continuing.");
+ throw new AgentContinueError("busy", "Agent is already processing. Wait for completion before continuing.");
}
const runQueuedMessages = (): Promise<void> | undefined => {
@@ -365,7 +379,7 @@ export class Agent {
return;
}
- throw new Error("No messages to continue from");
+ throw new AgentContinueError("nothing-to-continue", "No messages to continue from");
}
if (lastMessage.role === "assistant") {
@@ -375,7 +389,7 @@ export class Agent {
return;
}
- throw new Error("Cannot continue from message role: assistant");
+ throw new AgentContinueError("nothing-to-continue", "Cannot continue from message role: assistant");
}
const lastMessageRole: string = lastMessage.role;
diff --git a/packages/agent/test/agent.test.ts b/packages/agent/test/agent.test.ts
index 6ac4820ea7..471ffe3ac3 100644
--- a/packages/agent/test/agent.test.ts
+++ b/packages/agent/test/agent.test.ts
@@ -550,9 +550,11 @@ describe("Agent", () => {
await new Promise((resolve) => setTimeout(resolve, 10));
expect(agent.state.isStreaming).toBe(true);
- await expect(agent.continue()).rejects.toThrow(
- "Agent is already processing. Wait for completion before continuing.",
- );
+ await expect(agent.continue()).rejects.toMatchObject({
+ name: "AgentContinueError",
+ code: "busy",
+ message: "Agent is already processing. Wait for completion before continuing.",
+ });
agent.abort();
await firstPrompt.catch(() => {});
diff --git a/packages/agent/test/e2e.test.ts b/packages/agent/test/e2e.test.ts
index b75645b06c..b06838389d 100644
--- a/packages/agent/test/e2e.test.ts
+++ b/packages/agent/test/e2e.test.ts
@@ -268,7 +268,10 @@ describe("Agent.continue() with faux provider", () => {
},
});
- await expect(agent.continue()).rejects.toThrow("No messages to continue from");
+ await expect(agent.continue()).rejects.toMatchObject({
+ code: "nothing-to-continue",
+ message: "No messages to continue from",
+ });
});
it("throws when last message is assistant", async () => {
@@ -300,7 +303,10 @@ describe("Agent.continue() with faux provider", () => {
};
agent.state.messages = [assistantMessage];
- await expect(agent.continue()).rejects.toThrow("Cannot continue from message role: assistant");
+ await expect(agent.continue()).rejects.toMatchObject({
+ code: "nothing-to-continue",
+ message: "Cannot continue from message role: assistant",
+ });
});
});
diff --git a/packages/coding-agent/.changes/fix-typed-continue-preconditions.md b/packages/coding-agent/.changes/fix-typed-continue-preconditions.md
new file mode 100644
index 0000000000..1b168861b1
--- /dev/null
+++ b/packages/coding-agent/.changes/fix-typed-continue-preconditions.md
@@ -0,0 +1 @@
+- Changed post-compaction continuation error classification to typed `AgentContinueError` codes instead of matching error message text.
diff --git a/packages/coding-agent/src/core/agent-session.ts b/packages/coding-agent/src/core/agent-session.ts
index 661938a972..b01c929f20 100644
--- a/packages/coding-agent/src/core/agent-session.ts
+++ b/packages/coding-agent/src/core/agent-session.ts
@@ -6,6 +6,7 @@ import { basename, dirname, join, resolve } from "node:path";
import {
Agent,
type AgentContext,
+ AgentContinueError,
type AgentEvent,
type AgentMessage,
type AgentState,
@@ -7624,11 +7625,11 @@ export class AgentSession {
await this.agent.continue();
this._forgetConsumedPostCompactionContinuations(continuationMessages);
} catch (error) {
- const message = error instanceof Error ? error.message : String(error);
- if (message.includes("already processing")) {
+ const code = error instanceof AgentContinueError ? error.code : undefined;
+ if (code === "busy") {
this._schedulePostCompactionContinue();
- } else if (!message.includes("continue from")) {
- // "continue from" means the turn already completed; anything else must reject headless idle waiters.
+ } else if (code !== "nothing-to-continue") {
+ // "nothing-to-continue" means the turn already completed; anything else must reject headless idle waiters.
this._settlePostCompactionContinue(this._asError(error));
}
}
diff --git a/packages/coding-agent/test/suite/agent-session-compaction.test.ts b/packages/coding-agent/test/suite/agent-session-compaction.test.ts
index 9504460649..234179b9ec 100644
--- a/packages/coding-agent/test/suite/agent-session-compaction.test.ts
+++ b/packages/coding-agent/test/suite/agent-session-compaction.test.ts
@@ -1,5 +1,5 @@
import { appendFileSync } from "node:fs";
-import type { AgentMessage, ShouldStopAfterTurnContext } from "@earendil-works/pi-agent-core";
+import { AgentContinueError, type AgentMessage, type ShouldStopAfterTurnContext } from "@earendil-works/pi-agent-core";
import { type AssistantMessage, fauxAssistantMessage, type Model, type ToolResultMessage } from "@earendil-works/pi-ai";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { SessionManager } from "../../src/core/session-manager.js";
@@ -947,7 +947,7 @@ describe("AgentSession compaction characterization", () => {
];
const continueSpy = vi
.spyOn(harness.session.agent, "continue")
- .mockRejectedValueOnce(new Error("already processing"));
+ .mockRejectedValueOnce(new AgentContinueError("busy", "already processing"));
sessionInternals._schedulePostCompactionContinue();
await vi.advanceTimersByTimeAsync(100);
diff --git a/packages/coding-agent/test/suite/agent-session-queue.test.ts b/packages/coding-agent/test/suite/agent-session-queue.test.ts
index 5719667b35..658db2182a 100644
--- a/packages/coding-agent/test/suite/agent-session-queue.test.ts
+++ b/packages/coding-agent/test/suite/agent-session-queue.test.ts
@@ -1,6 +1,6 @@
import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
import { join } from "node:path";
-import type { AgentTool } from "@earendil-works/pi-agent-core";
+import { AgentContinueError, type AgentTool } from "@earendil-works/pi-agent-core";
import { fauxAssistantMessage, fauxToolCall } from "@earendil-works/pi-ai";
import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
import { Type } from "typebox";
@@ -331,7 +331,9 @@ describe("AgentSession queue characterization", () => {
const internals = harness.session as unknown as AutoRefineInternals;
const continueAgent = vi
.spyOn(harness.session.agent, "continue")
- .mockRejectedValueOnce(new Error("Agent is already processing. Wait for completion before continuing."))
+ .mockRejectedValueOnce(
+ new AgentContinueError("busy", "Agent is already processing. Wait for completion before continuing."),
+ )
.mockResolvedValueOnce();
try {