@openviking/openclaw-plugin 2026.6.17-dev.2 → 2026.7.11

package/dist/config.js

@@ -11,7 +11,7 @@ const DEFAULT_RECALL_SCORE_THRESHOLD = 0.15;
 const DEFAULT_RECALL_MAX_CONTENT_CHARS = 5000;
 const DEFAULT_RECALL_PREFER_ABSTRACT = false;
 const DEFAULT_RECALL_MAX_INJECTED_CHARS = 4000;
-const DEFAULT_COMMIT_TOKEN_THRESHOLD = 20000;
+const DEFAULT_COMMIT_TOKEN_THRESHOLD_RATIO = 0.5;
 const DEFAULT_COMMIT_KEEP_RECENT_COUNT = 10;
 const DEFAULT_BYPASS_SESSION_PATTERNS = [];
 const DEFAULT_EMIT_STANDARD_DIAGNOSTICS = false;
@@ -168,6 +168,23 @@ function toRecord(value) {
         ? value
         : {};
 }
+function toStringRecord(value, label) {
+    if (value === undefined || value === null) {
+        return {};
+    }
+    if (typeof value !== "object" || Array.isArray(value)) {
+        throw new Error(`${label} must be an object`);
+    }
+    const record = value;
+    const out = {};
+    for (const [key, val] of Object.entries(record)) {
+        if (typeof val !== "string") {
+            throw new Error(`${label}.${key} must be a string`);
+        }
+        out[key] = val;
+    }
+    return out;
+}
 function expandToolSelectors(value, fallback, label) {
     const entries = toStringArray(value, fallback);
     const seen = new Set();
@@ -250,6 +267,7 @@ export const memoryOpenVikingConfigSchema = {
             "peer_prefix",
             "serverAuthMode",
             "apiKey",
+            "headers",
             "accountId",
             "userId",
             "targetUri",
@@ -267,6 +285,7 @@ export const memoryOpenVikingConfigSchema = {
             "recallPreferAbstract",
             "recallTokenBudget",
             "commitTokenThreshold",
+            "commitTokenThresholdRatio",
             "commitKeepRecentCount",
             "bypassSessionPatterns",
             "ingestReplyAssist",
@@ -324,6 +343,7 @@ export const memoryOpenVikingConfigSchema = {
             peer_role: peerRole,
             peer_prefix: peerPrefix,
             apiKey: rawApiKey ? resolveEnvVars(rawApiKey) : "",
+            headers: toStringRecord(cfg.headers, "openviking config headers"),
             accountId,
             userId,
             targetUri: typeof cfg.targetUri === "string" ? cfg.targetUri : DEFAULT_TARGET_URI,
@@ -342,7 +362,7 @@ export const memoryOpenVikingConfigSchema = {
                 : DEFAULT_RECALL_PREFER_ABSTRACT,
             recallMaxInjectedChars,
             recallTokenBudget: recallMaxInjectedChars,
-            commitTokenThreshold: Math.max(0, Math.min(100_000, Math.floor(toNumber(cfg.commitTokenThreshold, DEFAULT_COMMIT_TOKEN_THRESHOLD)))),
+            commitTokenThresholdRatio: Math.max(0, Math.min(1, toNumber(cfg.commitTokenThresholdRatio, DEFAULT_COMMIT_TOKEN_THRESHOLD_RATIO))),
             commitKeepRecentCount: Math.max(0, Math.min(1_000, Math.floor(toNumber(cfg.commitKeepRecentCount, DEFAULT_COMMIT_KEEP_RECENT_COUNT)))),
             bypassSessionPatterns: toStringArray(cfg.bypassSessionPatterns, toStringArray(cfg.ingestReplyAssistIgnoreSessionPatterns, DEFAULT_BYPASS_SESSION_PATTERNS)),
             emitStandardDiagnostics: typeof cfg.emitStandardDiagnostics === "boolean"
@@ -405,6 +425,11 @@ export const memoryOpenVikingConfigSchema = {
             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)",
@@ -503,11 +528,11 @@ export const memoryOpenVikingConfigSchema = {
             help: "Completely bypass OpenViking for matching session keys. Use * within one segment and ** across segments.",
             advanced: true,
         },
-        commitTokenThreshold: {
-            label: "Commit Token Threshold",
-            placeholder: String(DEFAULT_COMMIT_TOKEN_THRESHOLD),
+        commitTokenThresholdRatio: {
+            label: "Commit Token Threshold Ratio",
+            placeholder: String(DEFAULT_COMMIT_TOKEN_THRESHOLD_RATIO),
             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",

package/dist/context-engine.js

@@ -204,12 +204,14 @@ export function createMemoryOpenVikingContextEngine(params) {
             });
         },
         async afterTurn(afterTurnParams) {
+            const tokenBudget = validTokenBudget(afterTurnParams.tokenBudget) ?? 128_000;
             await afterTurnOpenVikingSession({
                 sessionId: afterTurnParams.sessionId,
                 sessionKey: resolveSessionKey(afterTurnParams),
                 messages: afterTurnParams.messages,
                 prePromptMessageCount: afterTurnParams.prePromptMessageCount,
                 isHeartbeat: afterTurnParams.isHeartbeat,
+                tokenBudget,
                 runtimeContext: afterTurnParams.runtimeContext,
                 cfg,
                 getClient,

package/dist/plugin/openviking-client-runtime.js

@@ -1,4 +1,5 @@
 import { OpenVikingClient } from "../client.js";
+import { resolveOpenVikingRequestHeaders } from "../request-headers.js";
 export function createOpenVikingClientRuntime(options) {
     const { cfg, logger } = options;
     if (cfg.logFindRequests) {
@@ -19,7 +20,12 @@ export function createOpenVikingClientRuntime(options) {
             logger.info(msg);
         }
         : undefined;
-    const clientPromise = Promise.resolve(new OpenVikingClient(cfg.baseUrl, cfg.apiKey, cfg.peer_prefix, cfg.timeoutMs, cfg.accountId, cfg.userId, routingDebugLog, { transport: options.transport }));
+    const clientPromise = Promise.resolve(new OpenVikingClient(cfg.baseUrl, cfg.apiKey, cfg.peer_prefix, cfg.timeoutMs, cfg.accountId, cfg.userId, routingDebugLog, {
+        transport: options.transport,
+        headers: resolveOpenVikingRequestHeaders({
+            headers: cfg.headers,
+        }),
+    }));
     const getClient = () => clientPromise;
     return {
         getClient,

package/dist/plugin/openviking-memory-tools.js

@@ -11,7 +11,7 @@ export function registerOpenVikingMemoryTools(deps) {
     deps.registerTool((ctx) => ({
         name: "memory_store",
         label: "Memory Store (OpenViking)",
-        description: "Store text in OpenViking memory pipeline by writing to a session and running memory extraction.",
+        description: "Store text in OpenViking memory pipeline by writing to a session and running memory extraction. Use when the user explicitly asks to remember, save, or store an important long-term fact, preference, project, or decision; automatic capture is threshold/commit dependent.",
         parameters: Type.Object({
             text: Type.String({ description: "Information to store as memory source text" }),
             role: Type.Optional(Type.String({ description: "Session role, default user" })),

package/dist/query-config.js

@@ -171,7 +171,13 @@ export class RuntimeQueryConfigStore {
         const { params, warnings } = normalizeRuntimeQueryParams(patch);
         const key = this.keyForScope(scope, ctx);
         const bucket = scope === "claw" ? this.data.claws : this.data.sessions;
-        bucket[key] = { params, updatedAt: Date.now(), updatedBy: "command", peerId: ctx.peerId };
+        const previous = bucket[key];
+        bucket[key] = {
+            params: { ...(previous?.params ?? {}), ...params },
+            updatedAt: Date.now(),
+            updatedBy: "command",
+            peerId: ctx.peerId,
+        };
         this.data.updatedAt = Date.now();
         await this.persist();
         return { warnings };

package/dist/request-headers.js

@@ -0,0 +1,19 @@
+export function resolveOpenVikingRequestHeaders(options = {}) {
+    return cleanOpenVikingRequestHeaders(options.headers);
+}
+export function cleanOpenVikingRequestHeaders(headers) {
+    if (headers === undefined || headers === null) {
+        return {};
+    }
+    if (typeof headers !== "object" || Array.isArray(headers)) {
+        throw new Error("openviking request headers must be an object");
+    }
+    const out = {};
+    for (const [key, value] of Object.entries(headers)) {
+        if (typeof value !== "string") {
+            throw new Error(`openviking request header ${key} must be a string`);
+        }
+        out[key] = value;
+    }
+    return out;
+}

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

@@ -191,6 +191,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);
@@ -368,6 +372,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 +444,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 +458,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 +503,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;
     }
@@ -578,11 +601,14 @@ export async function afterTurnOpenVikingSession({ sessionId, sessionKey, messag
         }
         const session = await client.getSession(ovSessionId, agentId);
         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,
             });
@@ -598,7 +624,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,
@@ -823,7 +851,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/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/install-manifest.json

@@ -1,6 +1,6 @@
 {
   "manifestVersion": "1.0",
-  "pluginVersion": "2026.6.11",
+  "pluginVersion": "2026.6.18",
   "plugin": {
     "id": "openviking",
     "kind": "context-engine",
@@ -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/",
@@ -32,7 +33,8 @@
       "tsconfig.json",
       "tsconfig.build.json",
       "package.json",
-      "openclaw.plugin.json"
+      "openclaw.plugin.json",
+      "install-manifest.json"
     ],
     "optional": [
       "package-lock.json",
@@ -51,7 +53,9 @@
     "pruneAfterBuild": true
   },
   "compatibility": {
-    "minOpenclawVersion": "2026.4.8",
-    "minOpenvikingVersion": "0.2.9"
+    "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.17-dev.2",
+  "version": "2026.7.11",
   "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/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-memory-tools.ts

@@ -71,7 +71,7 @@ export function registerOpenVikingMemoryTools(deps: OpenVikingMemoryToolsDeps):
       name: "memory_store",
       label: "Memory Store (OpenViking)",
       description:
-        "Store text in OpenViking memory pipeline by writing to a session and running memory extraction.",
+        "Store text in OpenViking memory pipeline by writing to a session and running memory extraction. Use when the user explicitly asks to remember, save, or store an important long-term fact, preference, project, or decision; automatic capture is threshold/commit dependent.",
       parameters: Type.Object({
         text: Type.String({ description: "Information to store as memory source text" }),
         role: Type.Optional(Type.String({ description: "Session role, default user" })),

package/query-config.ts

@@ -231,7 +231,13 @@ export class RuntimeQueryConfigStore {
     const { params, warnings } = normalizeRuntimeQueryParams(patch);
     const key = this.keyForScope(scope, ctx);
     const bucket = scope === "claw" ? this.data.claws : this.data.sessions;
-    bucket[key] = { params, updatedAt: Date.now(), updatedBy: "command", peerId: ctx.peerId };
+    const previous = bucket[key];
+    bucket[key] = {
+      params: { ...(previous?.params ?? {}), ...params },
+      updatedAt: Date.now(),
+      updatedBy: "command",
+      peerId: ctx.peerId,
+    };
     this.data.updatedAt = Date.now();
     await this.persist();
     return { warnings };

package/request-headers.ts

@@ -0,0 +1,29 @@
+export type OpenVikingRequestHeaders = Record<string, string>;
+
+export type ResolveOpenVikingRequestHeadersOptions = {
+  headers?: unknown;
+};
+
+export function resolveOpenVikingRequestHeaders(
+  options: ResolveOpenVikingRequestHeadersOptions = {},
+): OpenVikingRequestHeaders {
+  return cleanOpenVikingRequestHeaders(options.headers);
+}
+
+export function cleanOpenVikingRequestHeaders(headers: unknown): OpenVikingRequestHeaders {
+  if (headers === undefined || headers === null) {
+    return {};
+  }
+  if (typeof headers !== "object" || Array.isArray(headers)) {
+    throw new Error("openviking request headers must be an object");
+  }
+
+  const out: OpenVikingRequestHeaders = {};
+  for (const [key, value] of Object.entries(headers as Record<string, unknown>)) {
+    if (typeof value !== "string") {
+      throw new Error(`openviking request header ${key} must be a string`);
+    }
+    out[key] = value;
+  }
+  return out;
+}

package/services/context-lifecycle-service.ts

@@ -123,10 +123,12 @@ export type AfterTurnOpenVikingSessionParams = {
   messages?: AgentMessage[];
   prePromptMessageCount?: number;
   isHeartbeat?: boolean;
+  /** Model context window in tokens; the auto-commit threshold is a fraction of this. */
+  tokenBudget: number;
   runtimeContext?: Record<string, unknown>;
   cfg: {
     autoCapture: boolean;
-    commitTokenThreshold: number;
+    commitTokenThresholdRatio: number;
     commitKeepRecentCount: number;
     logFindRequests: boolean;
   };
@@ -404,6 +406,11 @@ function assemblePassthrough(
   return { messages: liveMessages, estimatedTokens: originalTokens };
 }
 
+function isSessionNotFoundError(err: unknown): boolean {
+  const errorMessage = String(err);
+  return errorMessage.includes("[NOT_FOUND]") && errorMessage.includes("Session not found");
+}
+
 export async function assembleOpenVikingSession({
   sessionId,
   sessionKey,
@@ -625,6 +632,27 @@ export async function assembleOpenVikingSession({
       ...(instruction.text ? { systemPromptAddition: instruction.text } : {}),
     };
   } 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)}`,
@@ -688,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[] {
@@ -705,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;
@@ -753,6 +781,7 @@ export async function afterTurnOpenVikingSession({
   messages: rawMessages,
   prePromptMessageCount,
   isHeartbeat,
+  tokenBudget,
   runtimeContext,
   cfg,
   getClient,
@@ -880,11 +909,15 @@ export async function afterTurnOpenVikingSession({
     const session = await client.getSession(ovSessionId, agentId);
     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,
       });
@@ -904,7 +937,9 @@ export async function afterTurnOpenVikingSession({
 
     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,
@@ -1183,7 +1218,7 @@ export async function compactOpenVikingSession({
     };
   } 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})`,