@openviking/openclaw-plugin 2026.6.18 → 2026.7.15

package/dist/routing/identity-routing.js

@@ -3,6 +3,33 @@ const DEFAULT_OPENCLAW_AGENT_ID = "main";
 /** OpenClaw session UUID (path-safe on Windows). */
 const OPENVIKING_OV_SESSION_UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 const WINDOWS_BAD_SESSION_SEGMENT = /[:<>"\\/|?\u0000-\u001f]/;
+export function sanitizeOpenVikingPeerId(raw) {
+    const normalized = raw
+        ?.trim()
+        .replace(/[^a-zA-Z0-9_-]+/g, "_")
+        .replace(/^_+|_+$/g, "")
+        .replace(/_+/g, "_");
+    return normalized || undefined;
+}
+export function resolveOpenVikingMessagePeerId(params) {
+    if (params.peerRole === "person" && params.role === "user") {
+        return params.personPeerId;
+    }
+    if (params.peerRole === "assistant" && params.role === "assistant") {
+        return params.assistantPeerId;
+    }
+    return undefined;
+}
+export function resolveOpenVikingActorPeerId(params) {
+    const actorPeerId = resolveOpenVikingMessagePeerId({
+        ...params,
+        role: params.peerRole === "person" ? "user" : "assistant",
+    });
+    if (params.peerRole === "person" && !actorPeerId) {
+        throw new Error("openviking: peer_role=person requires a sender identity");
+    }
+    return actorPeerId;
+}
 /**
  * Map OpenClaw session identity to an OpenViking session_id that is safe as a single
  * AGFS path segment on Windows (no `:` etc.). Prefer UUID sessionId when present;

package/dist/routing/memory-uri.js

@@ -1,5 +1,6 @@
 const MEMORY_URI_PATTERNS = [
     /^viking:\/\/user\/(?:[^/]+(?:\/agent\/[^/]+)?\/)?memories(?:\/|$)/,
+    /^viking:\/\/user\/[^/]+\/peers\/[^/]+\/memories(?:\/|$)/,
     /^viking:\/\/agent\/(?:[^/]+(?:\/user\/[^/]+)?\/)?memories(?:\/|$)/,
 ];
 export function isMemoryUri(uri) {

package/dist/services/context-lifecycle-service.js

@@ -2,7 +2,7 @@
 import { DEFAULT_PHASE2_POLL_TIMEOUT_MS } from "../client.js";
 import { buildAutoRecallContext, prepareRecallQuery } from "../auto-recall.js";
 import { toJsonLog } from "../memory-ranking.js";
-import { openClawSessionToOvStorageId } from "../routing/identity-routing.js";
+import { openClawSessionToOvStorageId, resolveOpenVikingActorPeerId, resolveOpenVikingMessagePeerId, sanitizeOpenVikingPeerId, } from "../routing/identity-routing.js";
 import { extractNewTurnMessages } from "../text-utils.js";
 import { estimateAgentMessageTokens, estimateTextTokens } from "../token-estimator.js";
 import { convertToAgentMessages, mergeConsecutiveAssistants, sanitizeAgentMessagesForProvider, toRoleId, } from "./context-message-adapter.js";
@@ -26,12 +26,12 @@ function sleep(ms) {
  * After wait=false commit, Phase2 runs on the server. Poll task until completed/failed/timeout
  * so logs show memories_extracted (otherwise it looks like "nothing was saved").
  */
-async function pollPhase2ExtractionOutcome(client, taskId, agentId, logger, sessionLabel) {
+async function pollPhase2ExtractionOutcome(client, taskId, logger, sessionLabel) {
     const deadline = Date.now() + PHASE2_POLL_MAX_MS;
     try {
         while (Date.now() < deadline) {
             await sleep(PHASE2_POLL_INTERVAL_MS);
-            const task = await client.getTask(taskId, agentId).catch((e) => {
+            const task = await client.getTask(taskId).catch((e) => {
                 logger.warn?.(`openviking: phase2 getTask failed task_id=${taskId}: ${String(e)}`);
                 return null;
             });
@@ -141,7 +141,7 @@ function buildAssembledContext(overview, preAbstracts, ovMessages, tokenBudget,
     const sanitized = sanitizeAgentMessagesForProvider(assembled);
     return { sanitized, archive, session, budgets, instruction };
 }
-export async function commitOpenVikingSession({ sessionId, sessionKey, getClient, logger, resolveAgentId, rememberSessionAgentId, isBypassedSession, }) {
+export async function commitOpenVikingSession({ sessionId, sessionKey, getClient, logger, rememberSessionAgentId, isBypassedSession, }) {
     const ovId = openClawSessionToOvStorageId(sessionId, sessionKey);
     if (isBypassedSession({ sessionId, sessionKey })) {
         logger.warn?.(`openviking: commit skipped because session is bypassed (sessionId=${sessionId}, sessionKey=${sessionKey ?? "none"})`);
@@ -154,10 +154,8 @@ export async function commitOpenVikingSession({ sessionId, sessionKey, getClient
             sessionKey,
             ovSessionId: ovId,
         });
-        const agentId = resolveAgentId(sessionId, sessionKey, ovId);
         const commitResult = await client.commitSession(ovId, {
             wait: true,
-            agentId,
             keepRecentCount: 0,
         });
         const memCount = totalExtractedMemories(commitResult.memories_extracted);
@@ -191,6 +189,10 @@ function assemblePassthrough(params) {
     });
     return { messages: liveMessages, estimatedTokens: originalTokens };
 }
+function isSessionNotFoundError(err) {
+    const errorMessage = String(err);
+    return errorMessage.includes("[NOT_FOUND]") && errorMessage.includes("Session not found");
+}
 export async function assembleOpenVikingSession({ sessionId, sessionKey, messages, tokenBudget, runtimeContext, isMainAssemble, cfg, getClient, logger, resolveAgentId, rememberSessionAgentId, isBypassedSession, queryConfigStore, traceRecorder, diag, roughEstimate, messageDigest, extractAgentMessageText, hasAutoRecallBlock, prependRecallToLatestUserMessage, }) {
     const ovSessionId = openClawSessionToOvStorageId(sessionId, sessionKey);
     const sender = extractRuntimeSenderId(runtimeContext);
@@ -244,6 +246,11 @@ export async function assembleOpenVikingSession({ sessionId, sessionKey, message
             const client = await getClient();
             const routingRef = sessionId ?? sessionKey ?? ovSessionId;
             const agentId = resolveAgentId(routingRef, sessionKey, ovSessionId);
+            const actorPeerId = resolveOpenVikingActorPeerId({
+                peerRole: cfg.peer_role ?? "assistant",
+                personPeerId: sanitizeOpenVikingPeerId(sender.senderId),
+                assistantPeerId: agentId,
+            });
             const queryConfig = await queryConfigStore?.getEffective({
                 agentId,
                 sessionId,
@@ -255,6 +262,7 @@ export async function assembleOpenVikingSession({ sessionId, sessionKey, message
                 queryConfig,
                 client,
                 agentId,
+                actorPeerId,
                 queryText: recallQuery.query,
                 logger,
                 verbose: (message) => logger.info(message),
@@ -303,9 +311,7 @@ export async function assembleOpenVikingSession({ sessionId, sessionKey, message
     }
     try {
         const client = await getClient();
-        const routingRef = sessionId ?? sessionKey ?? ovSessionId;
-        const agentId = resolveAgentId(routingRef, sessionKey, ovSessionId);
-        const ctx = await client.getSessionContext(ovSessionId, tokenBudget, agentId);
+        const ctx = await client.getSessionContext(ovSessionId, tokenBudget);
         const preAbstracts = ctx?.pre_archive_abstracts ?? [];
         const hasArchives = !!ctx?.latest_archive_overview || preAbstracts.length > 0;
         const activeCount = ctx?.messages?.length ?? 0;
@@ -368,6 +374,25 @@ export async function assembleOpenVikingSession({ sessionId, sessionKey, message
         };
     }
     catch (err) {
+        if (isSessionNotFoundError(err)) {
+            const errorMessage = String(err);
+            logger.info(`openviking: assemble skipped because OV session does not exist ` +
+                `(session=${ovSessionId}, tokenBudget=${tokenBudget}, agentId=${resolveAgentId(ovSessionId)})`);
+            return assemblePassthrough({
+                diag,
+                ovSessionId,
+                reason: "session_not_found",
+                liveMessages: messages,
+                originalTokens,
+                extra: {
+                    error: errorMessage,
+                    tokenBudget,
+                    agentId: resolveAgentId(ovSessionId),
+                    senderIdFound: sender.found,
+                    senderId: sender.senderId ?? null,
+                },
+            });
+        }
         logger.warn?.(`openviking: assemble failed for session=${ovSessionId}, ` +
             `tokenBudget=${tokenBudget}, agentId=${resolveAgentId(ovSessionId)}: ${String(err)}`);
         diag("assemble_error", ovSessionId, {
@@ -421,7 +446,7 @@ function extractRuntimeAgentId(runtimeContext) {
     return typeof agentId === "string" && agentId.trim() ? agentId.trim() : undefined;
 }
 function isToolOnlyMessage(msg) {
-    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) {
     const result = [];
@@ -435,7 +460,7 @@ function coalesceConsecutiveToolMessages(messages) {
     for (const msg of messages) {
         if (isToolOnlyMessage(msg)) {
             if (!pendingTools) {
-                pendingTools = { role: "user", parts: [] };
+                pendingTools = { role: "assistant", parts: [] };
             }
             pendingTools.parts.push(...msg.parts);
             continue;
@@ -480,7 +505,7 @@ function messageDigest(messages, maxCharsPerMsg = 2000) {
         };
     });
 }
-export async function afterTurnOpenVikingSession({ sessionId, sessionKey, messages: rawMessages, prePromptMessageCount, isHeartbeat, runtimeContext, cfg, getClient, logger, resolveAgentId, rememberSessionAgentId, isBypassedSession, diag, }) {
+export async function afterTurnOpenVikingSession({ sessionId, sessionKey, messages: rawMessages, prePromptMessageCount, isHeartbeat, tokenBudget, runtimeContext, cfg, getClient, logger, resolveAgentId, rememberSessionAgentId, isBypassedSession, diag, }) {
     if (!cfg.autoCapture) {
         return;
     }
@@ -573,16 +598,24 @@ export async function afterTurnOpenVikingSession({ sessionId, sessionKey, messag
                 };
             });
             if (ovParts.length > 0) {
-                await client.addSessionMessage(ovSessionId, msg.role, ovParts, agentId, createdAt, msg.role === "user" ? senderRoleId : undefined);
+                await client.addSessionMessage(ovSessionId, msg.role, ovParts, undefined, createdAt, resolveOpenVikingMessagePeerId({
+                    peerRole: cfg.peer_role ?? "assistant",
+                    role: msg.role,
+                    personPeerId: senderRoleId,
+                    assistantPeerId: agentId,
+                }));
             }
         }
-        const session = await client.getSession(ovSessionId, agentId);
+        const session = await client.getSession(ovSessionId);
         const pendingTokens = session.pending_tokens ?? 0;
-        if (pendingTokens < cfg.commitTokenThreshold) {
+        const commitTokenThreshold = Math.floor(tokenBudget * cfg.commitTokenThresholdRatio);
+        if (pendingTokens < commitTokenThreshold) {
             diag("afterTurn_skip", ovSessionId, {
                 reason: "below_threshold",
                 pendingTokens,
-                commitTokenThreshold: cfg.commitTokenThreshold,
+                commitTokenThreshold,
+                commitTokenThresholdRatio: cfg.commitTokenThresholdRatio,
+                tokenBudget,
                 senderIdFound: sender.found,
                 senderId: sender.senderId ?? null,
             });
@@ -590,7 +623,6 @@ export async function afterTurnOpenVikingSession({ sessionId, sessionKey, messag
         }
         const commitResult = await client.commitSession(ovSessionId, {
             wait: false,
-            agentId,
             keepRecentCount: cfg.commitKeepRecentCount,
         });
         logger.info(`openviking: committed session=${ovSessionId}, ` +
@@ -598,7 +630,9 @@ export async function afterTurnOpenVikingSession({ sessionId, sessionKey, messag
             `task_id=${commitResult.task_id ?? "none"}, trace_id=${commitResult.trace_id ?? "none"}`);
         diag("afterTurn_commit", ovSessionId, {
             pendingTokens,
-            commitTokenThreshold: cfg.commitTokenThreshold,
+            commitTokenThreshold,
+            commitTokenThresholdRatio: cfg.commitTokenThresholdRatio,
+            tokenBudget,
             status: commitResult.status,
             archived: commitResult.archived ?? false,
             taskId: commitResult.task_id ?? null,
@@ -609,7 +643,7 @@ export async function afterTurnOpenVikingSession({ sessionId, sessionKey, messag
         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.");
-            void pollPhase2ExtractionOutcome(client, commitResult.task_id, agentId, logger, ovSessionId);
+            void pollPhase2ExtractionOutcome(client, commitResult.task_id, logger, ovSessionId);
         }
     }
     catch (err) {
@@ -669,7 +703,7 @@ export async function compactOpenVikingSession({ sessionId, sessionKey, tokenBud
     let preCommitEstimatedTokens;
     if (typeof tokensBeforeOriginal !== "number") {
         try {
-            const preCtx = await client.getSessionContext(ovSessionId, tokenBudget, agentId);
+            const preCtx = await client.getSessionContext(ovSessionId, tokenBudget);
             if (typeof preCtx.estimatedTokens === "number" && Number.isFinite(preCtx.estimatedTokens)) {
                 preCommitEstimatedTokens = preCtx.estimatedTokens;
             }
@@ -684,7 +718,6 @@ export async function compactOpenVikingSession({ sessionId, sessionKey, tokenBud
         logger.info(`openviking: compact committing session=${ovSessionId} (wait=true, tokenBudget=${tokenBudget})`);
         const commitResult = await client.commitSession(ovSessionId, {
             wait: true,
-            agentId,
             keepRecentCount: 0,
         });
         const memCount = totalExtractedMemories(commitResult.memories_extracted);
@@ -746,7 +779,7 @@ export async function compactOpenVikingSession({ sessionId, sessionKey, tokenBud
         let tokensAfter;
         let contextFetchError;
         try {
-            const ctx = await client.getSessionContext(ovSessionId, tokenBudget, agentId);
+            const ctx = await client.getSessionContext(ovSessionId, tokenBudget);
             logger.info(`openviking: compact getSessionContext raw result for ${ovSessionId}: ` +
                 JSON.stringify(ctx, null, 2));
             if (typeof ctx.latest_archive_overview === "string") {
@@ -823,7 +856,7 @@ export async function compactOpenVikingSession({ sessionId, sessionKey, tokenBud
     }
     catch (err) {
         const errorMessage = String(err);
-        if (errorMessage.includes("[NOT_FOUND]") && errorMessage.includes("Session not found")) {
+        if (isSessionNotFoundError(err)) {
             logger.info(`openviking: compact skipped because OV session does not exist ` +
                 `(session=${ovSessionId}, agentId=${agentId})`);
             diag("compact_result", ovSessionId, {

package/dist/services/context-message-adapter.js

@@ -1,14 +1,7 @@
+import { sanitizeOpenVikingPeerId } from "../routing/identity-routing.js";
 import { sanitizeToolUseResultPairing } from "../session-transcript-repair.js";
 export function toRoleId(senderId) {
-    if (!senderId) {
-        return undefined;
-    }
-    const normalized = senderId
-        .trim()
-        .replace(/[^a-zA-Z0-9_-]+/g, "_")
-        .replace(/^_+|_+$/g, "")
-        .replace(/_+/g, "_");
-    return normalized || undefined;
+    return sanitizeOpenVikingPeerId(senderId);
 }
 /**
  * Convert an OpenViking stored message (parts-based format) into one or more

package/dist/text-utils.js

@@ -36,13 +36,8 @@ function looksLikeMetadataJsonBlock(content) {
     }
     return matchedKeys.size >= 3;
 }
-const HEARTBEAT_RE = /\bHEARTBEAT(?:\.md|_OK)\b/;
 const TOOL_PLACEHOLDER_RE = /^\s*\[tool(?::\s*|Use:\s*)[^\]]+\]\s*$/i;
 export function sanitizeUserTextForCapture(text) {
-    // 过滤 HEARTBEAT 健康检查消息
-    if (HEARTBEAT_RE.test(text)) {
-        return "";
-    }
     // Drop legacy synthetic tool placeholders before they reach memory extraction.
     if (TOOL_PLACEHOLDER_RE.test(text)) {
         return "";
@@ -344,7 +339,7 @@ export function extractNewTurnMessages(messages, startIndex) {
                     : undefined);
             if (output) {
                 result.push({
-                    role: "user",
+                    role: "assistant",
                     parts: [{
                             type: "tool",
                             toolCallId: toolCallId || undefined,

package/index.ts

@@ -41,7 +41,7 @@ import {
 import type { CommandDefinition } from "./plugin/command-registration.js";
 
 import type { HttpTransport } from "./adapters/http-transport.js";
-import { formatMessageFaithful, toRoleId } from "./services/context-message-adapter.js";
+import { formatMessageFaithful } from "./services/context-message-adapter.js";
 import {
   clampScore,
   postProcessMemories,
@@ -212,6 +212,7 @@ const contextEnginePlugin = {
       resolvePluginSessionRouting,
       toQueryConfigContext,
     } = createOpenVikingSessionRoutingRuntime({
+      peerRole: cfg.peer_role,
       peerPrefix: cfg.peer_prefix,
       logFindRequests: cfg.logFindRequests,
       logger: api.logger,
@@ -329,8 +330,7 @@ const contextEnginePlugin = {
       getClient,
       normalizeSessionId: openClawSessionRefToOvStorageId,
       createTempSessionId: createMemoryStoreTempSessionId,
-      extractSenderId: extractToolSenderId,
-      toRoleId,
+      peerRole: cfg.peer_role,
       resolvePluginSessionRouting,
       isBypassedSession,
       makeBypassedToolResult,

package/install-manifest.json

@@ -20,6 +20,7 @@
       "tool-call-id.ts",
       "session-transcript-repair.ts",
       "runtime-utils.ts",
+      "request-headers.ts",
       "recall-trace.ts",
       "query-config.ts",
       "adapters/",
@@ -52,7 +53,7 @@
     "pruneAfterBuild": true
   },
   "compatibility": {
-    "minOpenclawVersion": "2026.4.8",
+    "minOpenclawVersion": "2026.5.27",
     "recommendedOpenclawVersion": "2026.6.6",
     "minOpenvikingVersion": "0.4.1",
     "recommendedOpenvikingVersion": "0.4.1"

package/openclaw.plugin.json

@@ -98,6 +98,11 @@
       "placeholder": "${OPENVIKING_API_KEY}",
       "help": "Optional API key for OpenViking server"
     },
+    "headers": {
+      "label": "Headers",
+      "advanced": true,
+      "help": "Optional HTTP headers merged into every OpenViking request."
+    },
     "accountId": {
       "label": "Account ID",
       "placeholder": "(derived from API key)",
@@ -196,11 +201,11 @@
       "help": "Completely bypass OpenViking for matching session keys. Use * within one segment and ** across segments.",
       "advanced": true
     },
-    "commitTokenThreshold": {
-      "label": "Commit Token Threshold",
-      "placeholder": "20000",
+    "commitTokenThresholdRatio": {
+      "label": "Commit Token Threshold Ratio",
+      "placeholder": "0.5",
       "advanced": true,
-      "help": "Minimum estimated pending tokens before auto-commit triggers. Set to 0 to commit every turn."
+      "help": "Auto-commit triggers once estimated pending tokens reach this fraction (0-1) of the model context window (e.g. 0.5 = 50%). Set to 0 to commit every turn."
     },
     "commitKeepRecentCount": {
       "label": "Commit Keep Recent Count",
@@ -287,6 +292,12 @@
       "apiKey": {
         "type": "string"
       },
+      "headers": {
+        "type": "object",
+        "additionalProperties": {
+          "type": "string"
+        }
+      },
       "accountId": {
         "type": "string"
       },
@@ -358,6 +369,11 @@
       "commitTokenThreshold": {
         "type": "number"
       },
+      "commitTokenThresholdRatio": {
+        "type": "number",
+        "minimum": 0,
+        "maximum": 1
+      },
       "commitKeepRecentCount": {
         "type": "number",
         "minimum": 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openviking/openclaw-plugin",
-  "version": "2026.6.18",
+  "version": "2026.7.15",
   "displayName": "OpenViking",
   "description": "OpenClaw context-engine plugin — OpenViking AI memory, long-term memory, knowledge base, semantic search, RAG, context engine. 长期记忆 · 知识库 · 语义检索 · 上下文引擎",
   "type": "module",
@@ -47,7 +47,7 @@
     "test:watch": "vitest"
   },
   "engines": {
-    "openclaw": ">=2026.4.8"
+    "openclaw": ">=2026.5.27"
   },
   "dependencies": {
     "@sinclair/typebox": "0.34.48",
@@ -69,12 +69,12 @@
     ],
     "setupEntry": "./dist/commands/setup.js",
     "compat": {
-      "pluginApi": ">=2026.4.8",
-      "minGatewayVersion": "2026.4.8"
+      "pluginApi": ">=2026.5.27",
+      "minGatewayVersion": "2026.5.27"
     },
     "build": {
-      "openclawVersion": "2026.4.8",
-      "pluginSdkVersion": "2026.4.8"
+      "openclawVersion": "2026.5.27",
+      "pluginSdkVersion": "2026.5.27"
     }
   },
   "devDependencies": {

package/plugin/command-registration.ts

@@ -5,6 +5,8 @@ export type PluginCommandContext = {
   sessionId?: string;
   agentId?: string;
   ovSessionId?: string;
+  senderId?: string;
+  requesterSenderId?: string;
 };
 
 export type CommandResult = {

package/plugin/openviking-archive-tools.ts

@@ -26,7 +26,7 @@ export type OpenVikingArchiveClient = {
   grepSessionArchives: (
     sessionId: string,
     pattern: string,
-    options: { archiveId?: string; caseInsensitive: boolean; agentId?: string },
+    options: { archiveId?: string; caseInsensitive: boolean },
   ) => Promise<{
     count?: number;
     matches?: OpenVikingArchiveMatch[];
@@ -34,7 +34,6 @@ export type OpenVikingArchiveClient = {
   getSessionArchive: (
     sessionId: string,
     archiveId: string,
-    agentId?: string,
   ) => Promise<{
     archive_id: string;
     abstract?: string;
@@ -128,7 +127,6 @@ export function registerOpenVikingArchiveTools(deps: OpenVikingArchiveToolsDeps)
           const result = await client.grepSessionArchives(ovSessionId, escapedQuery, {
             archiveId,
             caseInsensitive: true,
-            agentId,
           });
           const traceResults: RecallTraceResult[] = (result.matches ?? []).slice(0, deps.traceRecallMaxResultsPerSearch).map((match) => ({
             uri: match.uri,
@@ -263,7 +261,6 @@ export function registerOpenVikingArchiveTools(deps: OpenVikingArchiveToolsDeps)
         const detail = await client.getSessionArchive(
           session.ovSessionId,
           archiveId,
-          session.agentId,
         );
 
         const header = [

package/plugin/openviking-client-runtime.ts

@@ -1,5 +1,6 @@
 import { OpenVikingClient } from "../client.js";
 import type { HttpTransport } from "../adapters/http-transport.js";
+import { resolveOpenVikingRequestHeaders } from "../request-headers.js";
 
 type Logger = {
   info: (message: string) => void;
@@ -13,6 +14,7 @@ type ClientRuntimeConfig = {
   timeoutMs: number;
   accountId?: string;
   userId?: string;
+  headers?: Record<string, string>;
   logFindRequests: boolean;
 };
 
@@ -61,7 +63,12 @@ export function createOpenVikingClientRuntime(options: {
       cfg.accountId,
       cfg.userId,
       routingDebugLog,
-      { transport: options.transport },
+      {
+        transport: options.transport,
+        headers: resolveOpenVikingRequestHeaders({
+          headers: cfg.headers,
+        }),
+      },
     ),
   );
 

package/plugin/openviking-command-definitions.ts

@@ -6,6 +6,7 @@ export type OpenVikingCommandSession = {
   sessionKey?: string;
   ovSessionId?: string;
   agentId: string;
+  actorPeerId?: string;
 };
 
 export type OpenVikingCommandToolResult = {
@@ -217,7 +218,7 @@ export function createOpenVikingCommandDefinitions(
           }
           const session = deps.resolvePluginSessionRouting(ctx);
           const input = deps.parseAddResourceCommandArgs(ctx.args ?? "");
-          return toCommandResult(await deps.addResourceOpenViking(input, session.agentId));
+          return toCommandResult(await deps.addResourceOpenViking(input, session.actorPeerId));
         } catch (err) {
           return { text: `OpenViking add resource failed: ${err instanceof Error ? err.message : String(err)}` };
         }
@@ -234,7 +235,7 @@ export function createOpenVikingCommandDefinitions(
           }
           const session = deps.resolvePluginSessionRouting(ctx);
           const input = deps.parseAddSkillCommandArgs(ctx.args ?? "");
-          return toCommandResult(await deps.addSkillOpenViking(input, session.agentId));
+          return toCommandResult(await deps.addSkillOpenViking(input, session.actorPeerId));
         } catch (err) {
           return { text: `OpenViking add skill failed: ${err instanceof Error ? err.message : String(err)}` };
         }
@@ -251,7 +252,7 @@ export function createOpenVikingCommandDefinitions(
           }
           const session = deps.resolvePluginSessionRouting(ctx);
           const input = deps.parseOVSearchCommandArgs(ctx.args ?? "");
-          return toCommandResult(await deps.searchOpenViking(input, session.agentId, session));
+          return toCommandResult(await deps.searchOpenViking(input, session.actorPeerId, session));
         } catch (err) {
           return { text: `OpenViking search failed: ${err instanceof Error ? err.message : String(err)}` };
         }

package/plugin/openviking-import-tools.ts

@@ -12,6 +12,7 @@ export type OpenVikingImportToolContext = {
   sessionId?: string;
   agentId?: string;
   senderId?: string;
+  requesterSenderId?: string;
 };
 
 export type OpenVikingImportSession = {
@@ -19,6 +20,7 @@ export type OpenVikingImportSession = {
   sessionKey?: string;
   ovSessionId?: string;
   agentId: string;
+  actorPeerId?: string;
 };
 
 export type OpenVikingImportClient = {
@@ -80,7 +82,7 @@ export function registerOpenVikingImportTools(deps: OpenVikingImportToolsDeps):
             instruction: typeof params.instruction === "string" ? params.instruction : undefined,
             wait: typeof params.wait === "boolean" ? params.wait : undefined,
             timeout: typeof params.timeout === "number" ? params.timeout : undefined,
-          }, session.agentId);
+          }, session.actorPeerId);
           return {
             content: [{ type: "text" as const, text: formatResourceImportText(result) }],
             details: {
@@ -118,7 +120,7 @@ export function registerOpenVikingImportTools(deps: OpenVikingImportToolsDeps):
           data: params.data,
           wait: typeof params.wait === "boolean" ? params.wait : undefined,
           timeout: typeof params.timeout === "number" ? params.timeout : undefined,
-        }, session.agentId);
+        }, session.actorPeerId);
         return {
           content: [{ type: "text" as const, text: formatSkillImportText(result) }],
           details: {

package/plugin/openviking-memory-recall-tools.ts

@@ -15,6 +15,7 @@ export type OpenVikingMemoryRecallToolContext = {
   sessionId?: string;
   agentId?: string;
   senderId?: string;
+  requesterSenderId?: string;
 };
 
 export type OpenVikingMemoryRecallSession = {
@@ -22,6 +23,7 @@ export type OpenVikingMemoryRecallSession = {
   sessionKey?: string;
   ovSessionId?: string;
   agentId: string;
+  actorPeerId?: string;
 };
 
 export type OpenVikingMemoryRecallClient = {
@@ -163,7 +165,7 @@ export function registerOpenVikingMemoryRecallTools(
         const recallClient = await deps.getClient();
         if (deps.cfg.logFindRequests) {
           deps.logger.info?.(
-            `openviking: memory_recall X-OpenViking-Actor-Peer="${session.agentId}" ` +
+            `openviking: memory_recall X-OpenViking-Actor-Peer="${session.actorPeerId ?? "none"}" ` +
               `(plugin defaultAgentId="${recallClient.getDefaultAgentId()}" is unused when session context is present)`,
           );
         }
@@ -177,7 +179,7 @@ export function registerOpenVikingMemoryRecallTools(
             targetUri,
             limit: requestLimit,
             scoreThreshold: 0,
-            actorPeerId: session.agentId,
+            actorPeerId: session.actorPeerId,
           },
         );
           const traceResults = [
@@ -207,7 +209,7 @@ export function registerOpenVikingMemoryRecallTools(
                 limit: requestLimit,
                 scoreThreshold: 0,
                 contextType: search.contextType,
-                actorPeerId: session.agentId,
+                actorPeerId: session.actorPeerId,
               },
             ),
           ));
@@ -319,7 +321,7 @@ export function registerOpenVikingMemoryRecallTools(
         }
         const { lines: memoryLines } = await deps.buildMemoryLinesWithBudget(
           memories,
-          (uri) => recallClient.read(uri, session.agentId),
+          (uri) => recallClient.read(uri, session.actorPeerId),
           {
             recallPreferAbstract: false,
             recallMaxInjectedChars: queryConfig.maxInjectedChars,