Skip to content

fix(openclaw-plugin): prevent CONFLICT errors with commit lock #1055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leckylao wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −0
Open

fix(openclaw-plugin): prevent CONFLICT errors with commit lock #1055

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions examples/openclaw-plugin/context-engine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ import {
} from "./memory-ranking.js";
import { sanitizeToolUseResultPairing } from "./session-transcript-repair.js";


// Simple in-memory lock to prevent concurrent commits
const commitLocks = new Set<string>();
type AgentMessage = {
role?: string;
content?: unknown;
Expand Down Expand Up @@ -572,6 +575,17 @@ export function createMemoryOpenVikingContextEngine(params: {
}

const OVSessionId = afterTurnParams.sessionId;

// Skip if a commit is already in progress for this session
if (commitLocks.has(OVSessionId)) {
logger.info(`openviking: afterTurn skipped (commit in progress for ${OVSessionId})`);
diag("afterTurn_skip", OVSessionId, {
reason: "commit_lock_contention",
});
return;
}
commitLocks.add(OVSessionId);

try {
const agentId = resolveAgentId(OVSessionId);

Expand Down Expand Up @@ -673,6 +687,8 @@ export function createMemoryOpenVikingContextEngine(params: {
diag("afterTurn_error", OVSessionId, {
error: String(err),
});
} finally {
commitLocks.delete(OVSessionId);
}
},

Expand Down