@openviking/openclaw-plugin 2026.5.8 → 2026.5.21

package/dist/client.js

@@ -245,6 +245,36 @@ export class OpenVikingClient {
     async read(uri, agentId) {
         return this.request(`/api/v1/content/read?uri=${encodeURIComponent(uri)}`, {}, agentId);
     }
+    async readToolResult(sessionId, toolResultId, options, agentId) {
+        const params = new URLSearchParams();
+        if (options?.offset !== undefined)
+            params.set("offset", String(options.offset));
+        if (options?.limit !== undefined)
+            params.set("limit", String(options.limit));
+        if (options?.includeMetadata !== undefined) {
+            params.set("include_metadata", String(options.includeMetadata));
+        }
+        const query = params.toString();
+        return this.request(`/api/v1/sessions/${encodeURIComponent(sessionId)}/tool-results/${encodeURIComponent(toolResultId)}${query ? `?${query}` : ""}`, {}, agentId);
+    }
+    async searchToolResult(sessionId, toolResultId, queryText, options, agentId) {
+        const params = new URLSearchParams({ q: queryText });
+        if (options?.limit !== undefined)
+            params.set("limit", String(options.limit));
+        if (options?.contextChars !== undefined) {
+            params.set("context_chars", String(options.contextChars));
+        }
+        return this.request(`/api/v1/sessions/${encodeURIComponent(sessionId)}/tool-results/${encodeURIComponent(toolResultId)}/search?${params.toString()}`, {}, agentId);
+    }
+    async listToolResults(sessionId, options, agentId) {
+        const params = new URLSearchParams();
+        if (options?.toolName)
+            params.set("tool_name", options.toolName);
+        if (options?.limit !== undefined)
+            params.set("limit", String(options.limit));
+        const query = params.toString();
+        return this.request(`/api/v1/sessions/${encodeURIComponent(sessionId)}/tool-results${query ? `?${query}` : ""}`, {}, agentId);
+    }
     async uploadTempFile(filePath, agentId) {
         const fileBytes = await readFile(filePath);
         const form = new FormData();

package/dist/context-engine.js

@@ -29,9 +29,6 @@ function allocateContextBudget(totalBudget, instructionTokens = 0) {
     const sessionContext = Math.max(usableBudget - archiveMemory, 0);
     return { archiveMemory, sessionContext, reserved };
 }
-function estimateTokens(messages) {
-    return Math.max(1, messages.length * 80);
-}
 function roughEstimate(messages) {
     return Math.ceil(JSON.stringify(messages).length / 4);
 }
@@ -265,6 +262,10 @@ export function convertToAgentMessages(msg) {
             const toolName = typeof p.tool_name === "string" ? p.tool_name : undefined;
             const status = typeof p.tool_status === "string" ? p.tool_status : "unknown";
             const output = typeof p.tool_output === "string" ? p.tool_output : "";
+            const ref = typeof p.tool_output_ref === "string" ? p.tool_output_ref : "";
+            const originalChars = typeof p.tool_output_original_chars === "number"
+                ? p.tool_output_original_chars
+                : undefined;
             if (toolId) {
                 // Structured path: emit canonical toolCall + toolResult pair (works for any role)
                 toolCallBlocks.push({
@@ -273,9 +274,15 @@ export function convertToAgentMessages(msg) {
                     name: toolName ?? "unknown",
                     arguments: p.tool_input ?? {},
                 });
-                const resultText = (status === "completed" || status === "error")
+                let resultText = (status === "completed" || status === "error")
                     ? (output || "(no output)")
                     : "(interrupted — tool did not complete)";
+                if (ref && !resultText.includes(ref)) {
+                    const suffix = originalChars !== undefined
+                        ? `\n[tool-result-ref] ${ref} original_chars=${originalChars}`
+                        : `\n[tool-result-ref] ${ref}`;
+                    resultText += suffix;
+                }
                 const resultPayload = {
                     role: "toolResult",
                     toolCallId: toolId,
@@ -330,6 +337,32 @@ export function convertToAgentMessages(msg) {
     }
     return result;
 }
+function isToolOnlyMessage(msg) {
+    return msg.role === "user" && msg.parts.length > 0 && msg.parts.every((part) => part.type === "tool");
+}
+function coalesceConsecutiveToolMessages(messages) {
+    const result = [];
+    let pendingTools;
+    const flush = () => {
+        if (pendingTools) {
+            result.push(pendingTools);
+            pendingTools = undefined;
+        }
+    };
+    for (const msg of messages) {
+        if (isToolOnlyMessage(msg)) {
+            if (!pendingTools) {
+                pendingTools = { role: "user", parts: [] };
+            }
+            pendingTools.parts.push(...msg.parts);
+            continue;
+        }
+        flush();
+        result.push(msg);
+    }
+    flush();
+    return result;
+}
 function normalizeAssistantContent(messages) {
     for (let i = 0; i < messages.length; i++) {
         const msg = messages[i];
@@ -965,7 +998,8 @@ export function createMemoryOpenVikingContextEngine(params) {
                     afterTurnParams.prePromptMessageCount >= 0
                     ? afterTurnParams.prePromptMessageCount
                     : 0;
-                const { messages: extractedMessages, newCount } = extractNewTurnMessages(messages, start);
+                const { messages: extractedMessagesRaw, newCount } = extractNewTurnMessages(messages, start);
+                const extractedMessages = coalesceConsecutiveToolMessages(extractedMessagesRaw);
                 if (extractedMessages.length === 0) {
                     diag("afterTurn_skip", OVSessionId, {
                         reason: "no_new_turn_messages",
@@ -1055,9 +1089,7 @@ export function createMemoryOpenVikingContextEngine(params) {
                 if (commitResult.task_id && cfg.logFindRequests) {
                     logger.info(`openviking: Phase2 memory extraction runs asynchronously on the server (task_id=${commitResult.task_id}). ` +
                         "memories_extracted appears only after that task completes — not in this immediate response.");
-                    if (cfg.logFindRequests) {
-                        void pollPhase2ExtractionOutcome(getClient, commitResult.task_id, agentId, logger, OVSessionId);
-                    }
+                    void pollPhase2ExtractionOutcome(getClient, commitResult.task_id, agentId, logger, OVSessionId);
                 }
             }
             catch (err) {