Skip to content

Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.

Store OpenClaw tool parts as assistant messages (#2934)

AutoCoder2d3fa8b17f48
diff --git a/examples/openclaw-plugin/services/context-lifecycle-service.ts b/examples/openclaw-plugin/services/context-lifecycle-service.ts
index 7441763b1..a714f2c14 100644
--- a/examples/openclaw-plugin/services/context-lifecycle-service.ts
+++ b/examples/openclaw-plugin/services/context-lifecycle-service.ts
@@ -716,7 +716,7 @@ function extractRuntimeAgentId(runtimeContext: Record<string, unknown> | undefin
}
function isToolOnlyMessage(msg: ExtractedTurnMessage): boolean {
- return msg.role === "user" && msg.parts.length > 0 && msg.parts.every((part) => part.type === "tool");
+ return msg.role === "assistant" && msg.parts.length > 0 && msg.parts.every((part) => part.type === "tool");
}
function coalesceConsecutiveToolMessages(messages: ExtractedTurnMessage[]): ExtractedTurnMessage[] {
@@ -733,7 +733,7 @@ function coalesceConsecutiveToolMessages(messages: ExtractedTurnMessage[]): Extr
for (const msg of messages) {
if (isToolOnlyMessage(msg)) {
if (!pendingTools) {
- pendingTools = { role: "user", parts: [] };
+ pendingTools = { role: "assistant", parts: [] };
}
pendingTools.parts.push(...msg.parts);
continue;
diff --git a/examples/openclaw-plugin/tests/ut/context-engine-afterTurn.test.ts b/examples/openclaw-plugin/tests/ut/context-engine-afterTurn.test.ts
index 0c592a9e2..27f10c500 100644
--- a/examples/openclaw-plugin/tests/ut/context-engine-afterTurn.test.ts
+++ b/examples/openclaw-plugin/tests/ut/context-engine-afterTurn.test.ts
@@ -467,7 +467,7 @@ describe("context-engine afterTurn()", () => {
expect(client.getSession).toHaveBeenCalled();
});
- it("maps toolResult to user role", async () => {
+ it("maps toolResult to assistant role", async () => {
const { engine, client } = makeEngine();
const messages = [
@@ -487,9 +487,9 @@ describe("context-engine afterTurn()", () => {
});
expect(client.addSessionMessage).toHaveBeenCalledTimes(3);
- // assistant → user(toolResult) → assistant
+ // assistant → assistant(toolResult) → assistant
expect(client.addSessionMessage.mock.calls[0][1]).toBe("assistant");
- expect(client.addSessionMessage.mock.calls[1][1]).toBe("user");
+ expect(client.addSessionMessage.mock.calls[1][1]).toBe("assistant");
expect(client.addSessionMessage.mock.calls[1][2][0].tool_output).toContain("file1.txt");
expect(client.addSessionMessage.mock.calls[1][2][0].tool_output).toContain("file2.txt");
expect(client.addSessionMessage.mock.calls[2][1]).toBe("assistant");
@@ -521,7 +521,7 @@ describe("context-engine afterTurn()", () => {
expect(client.addSessionMessage.mock.calls[2][1]).toBe("assistant");
});
- it("coalesces adjacent toolResults into one user group for turn-level budgets", async () => {
+ it("coalesces adjacent toolResults into one assistant group for turn-level budgets", async () => {
const { engine, client } = makeEngine();
const messages = [
@@ -543,7 +543,7 @@ describe("context-engine afterTurn()", () => {
expect(client.addSessionMessage).toHaveBeenCalledTimes(3);
expect(client.addSessionMessage.mock.calls[0][1]).toBe("assistant");
- expect(client.addSessionMessage.mock.calls[1][1]).toBe("user");
+ expect(client.addSessionMessage.mock.calls[1][1]).toBe("assistant");
const toolParts = client.addSessionMessage.mock.calls[1][2] as Array<{ tool_output?: string }>;
expect(toolParts).toHaveLength(2);
expect(toolParts[0]?.tool_output).toContain("content of a");
diff --git a/examples/openclaw-plugin/tests/ut/text-utils.test.ts b/examples/openclaw-plugin/tests/ut/text-utils.test.ts
index de052ed19..6168511e2 100644
--- a/examples/openclaw-plugin/tests/ut/text-utils.test.ts
+++ b/examples/openclaw-plugin/tests/ut/text-utils.test.ts
@@ -286,6 +286,41 @@ describe("extractNewTurnMessages", () => {
expect(newCount).toBe(1);
expect(extracted).toEqual([]);
});
+
+ it("maps toolResult messages to assistant tool parts", () => {
+ const messages = [
+ {
+ role: "assistant",
+ content: [
+ { type: "toolCall", id: "call_1", name: "read", arguments: { path: "package.json" } },
+ ],
+ },
+ {
+ role: "toolResult",
+ toolCallId: "call_1",
+ toolName: "read",
+ content: [{ type: "text", text: "{\"name\":\"pkg\"}" }],
+ },
+ ];
+
+ const { messages: extracted } = extractNewTurnMessages(messages, 0);
+
+ expect(extracted).toEqual([
+ {
+ role: "assistant",
+ parts: [
+ {
+ type: "tool",
+ toolCallId: "call_1",
+ toolName: "read",
+ toolInput: { path: "package.json" },
+ toolOutput: "{\"name\":\"pkg\"}",
+ toolStatus: "completed",
+ },
+ ],
+ },
+ ]);
+ });
});
describe("extractLatestUserText", () => {
diff --git a/examples/openclaw-plugin/tests/ut/tool-round-trip.test.ts b/examples/openclaw-plugin/tests/ut/tool-round-trip.test.ts
index 31e0c30cd..f9dc9170e 100644
--- a/examples/openclaw-plugin/tests/ut/tool-round-trip.test.ts
+++ b/examples/openclaw-plugin/tests/ut/tool-round-trip.test.ts
@@ -56,7 +56,7 @@ describe("extractNewTurnMessages: toolCallId propagation", () => {
}
});
- it("maps toolResult to role=user", () => {
+ it("maps toolResult to role=assistant", () => {
const messages = [
{
role: "toolResult",
@@ -67,7 +67,7 @@ describe("extractNewTurnMessages: toolCallId propagation", () => {
];
const { messages: extracted } = extractNewTurnMessages(messages, 0);
- expect(extracted[0]!.role).toBe("user");
+ expect(extracted[0]!.role).toBe("assistant");
});
});
diff --git a/examples/openclaw-plugin/text-utils.ts b/examples/openclaw-plugin/text-utils.ts
index 9e651ec84..d5667e648 100644
--- a/examples/openclaw-plugin/text-utils.ts
+++ b/examples/openclaw-plugin/text-utils.ts
@@ -404,7 +404,7 @@ export function extractNewTurnMessages(
: undefined);
if (output) {
result.push({
- role: "user",
+ role: "assistant",
parts: [{
type: "tool",
toolCallId: toolCallId || undefined,