Skip to content

fix(queue): dedupe unchanged pull request edits #857

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

Merged
brokemac79 merged 2 commits into from
Jul 26, 2026
Merged

fix(queue): dedupe unchanged pull request edits #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b56553
fix(queue): dedupe unchanged pull request edits
brokemac79 Jul 25, 2026
a9e0ecd
fix(queue): preserve semantic edit fallback ingress
brokemac79 Jul 26, 2026
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
77 changes: 68 additions & 9 deletions .github/workflows/sweep.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,37 @@ jobs:
set -euo pipefail
test -n "$CLAWSWEEPER_WEBHOOK_SECRET"
queue_url="${QUEUE_URL%/}"
IFS=$'\t' read -r target_repo target_branch < <(node <<'NODE'
IFS=$'\t' read -r target_repo target_branch use_source_authority < <(node <<'NODE'
const payload = JSON.parse(process.env.CLIENT_PAYLOAD || "{}");
const itemKind = payload.item_kind === "pull_request" ? "pull_request" : "issue";
const queueClaim = payload.queue_claim && typeof payload.queue_claim === "object"
? payload.queue_claim
: {};
const installationId = Number(queueClaim.installation_id ?? payload.installation_id);
const sourceHeadSha = String(
queueClaim.source_head_sha ?? payload.source_head_sha ?? "",
)
.trim()
.toLowerCase();
const sourceBaseSha = String(
queueClaim.source_base_sha ?? payload.source_base_sha ?? "",
)
.trim()
.toLowerCase();
const sourceIsDraft = queueClaim.source_is_draft ?? payload.source_is_draft;
const sourceContentRevision = String(
queueClaim.source_content_revision ?? payload.source_content_revision ?? "",
)
.trim()
.toLowerCase();
const ingressFingerprint = String(payload.ingress_fingerprint || "").trim().toLowerCase();
const targetDispatcherIngress =
payload.ingress_route === "target_dispatcher" &&
itemKind === "pull_request" &&
(payload.source_event === "pull_request" || payload.source_event === "pull_request_target") &&
/^[0-9a-f]{64}$/.test(ingressFingerprint);
process.stdout.write(
`${String(payload.target_repo || "openclaw/openclaw").trim()}\t${String(payload.target_branch || "").trim()}\n`,
`${String(payload.target_repo || "openclaw/openclaw").trim()}\t${String(payload.target_branch || "").trim()}\t${itemKind === "pull_request" && payload.source_event === "pull_request" && payload.source_action === "edited" && Number.isInteger(installationId) && installationId > 0 && /^[0-9a-f]{40}$/.test(sourceHeadSha) && /^[0-9a-f]{40}$/.test(sourceBaseSha) && typeof sourceIsDraft === "boolean" && /^[0-9a-f]{64}$/.test(sourceContentRevision) && !targetDispatcherIngress ? "1" : "0"}\n`,
);
NODE
)
Expand All @@ -268,13 +295,20 @@ jobs:
echo "Invalid legacy target branch for $target_repo: $target_branch" >&2
exit 1
fi
queue_path="/internal/exact-review/enqueue"
if [ "$use_source_authority" = "1" ]; then
queue_path="/internal/exact-review/source-authority"
fi
payload="$(TARGET_REPO="$target_repo" TARGET_BRANCH="$target_branch" node <<'NODE'
const payload = JSON.parse(process.env.CLIENT_PAYLOAD || "{}");
const itemKind = payload.item_kind === "pull_request" ? "pull_request" : "issue";
const sourceEvent =
payload.source_event === "pull_request" || payload.source_event === "pull_request_target"
? "pull_request"
: "issues";
const queueClaim = payload.queue_claim && typeof payload.queue_claim === "object"
? payload.queue_claim
: {};
const dispatchKey = String(payload.dispatch_key || "").trim();
const ingressFingerprint = String(payload.ingress_fingerprint || "").trim().toLowerCase();
const ingress =
Expand All @@ -284,11 +318,20 @@ jobs:
/^[0-9a-f]{64}$/.test(ingressFingerprint)
? { route: "target_dispatcher", fingerprint: ingressFingerprint }
: undefined;
const sourceHeadSha = String(queueClaim.source_head_sha ?? payload.source_head_sha ?? "").trim().toLowerCase();
const sourceBaseSha = String(queueClaim.source_base_sha ?? payload.source_base_sha ?? "").trim().toLowerCase();
const sourceIsDraft = queueClaim.source_is_draft ?? payload.source_is_draft;
const sourceContentRevision = String(queueClaim.source_content_revision ?? payload.source_content_revision ?? "").trim().toLowerCase();
const sourceUpdatedAt = String(queueClaim.source_updated_at ?? payload.source_updated_at ?? "").trim();
const installationId = Number(queueClaim.installation_id ?? payload.installation_id);
process.stdout.write(
JSON.stringify({
delivery_id: dispatchKey
? `router:${dispatchKey}`
: `legacy:${process.env.GITHUB_RUN_ID}:${process.env.GITHUB_RUN_ATTEMPT}`,
...(itemKind === "pull_request" && Number.isInteger(installationId) && installationId > 0
? { installation_id: installationId }
: {}),
decision: {
targetRepo: process.env.TARGET_REPO,
targetBranch: process.env.TARGET_BRANCH,
Expand All @@ -297,14 +340,30 @@ jobs:
sourceEvent,
sourceAction: payload.source_action || "legacy_dispatch",
supersedesInProgress: payload.supersedes_in_progress === true,
...(/^[0-9a-f]{40}$/.test(String(payload.queue_claim?.source_head_sha || payload.source_head_sha || "").trim().toLowerCase())
? { sourceHeadSha: String(payload.queue_claim?.source_head_sha || payload.source_head_sha).trim().toLowerCase() }
...(/^[0-9a-f]{40}$/.test(sourceHeadSha)
? { sourceHeadSha }
: {}),
...(/^[0-9a-f]{40}$/.test(sourceBaseSha)
? { sourceBaseSha }
: {}),
...(typeof sourceIsDraft === "boolean" ? { sourceIsDraft } : {}),
...(/^[0-9a-f]{64}$/.test(sourceContentRevision)
? { sourceContentRevision }
: {}),
...(sourceUpdatedAt && Number.isFinite(Date.parse(sourceUpdatedAt))
? { sourceUpdatedAt }
: {}),
...(Number.isFinite(Number(payload.codex_timeout_ms))
? { codexTimeoutMs: Number(payload.codex_timeout_ms) }
...(Number.isFinite(Number(queueClaim.codex_timeout_ms ?? payload.codex_timeout_ms))
? { codexTimeoutMs: Number(queueClaim.codex_timeout_ms ?? payload.codex_timeout_ms) }
: {}),
...(Number.isFinite(Number(payload.media_proof_timeout_ms))
? { mediaProofTimeoutMs: Number(payload.media_proof_timeout_ms) }
...(Number.isFinite(
Number(queueClaim.media_proof_timeout_ms ?? payload.media_proof_timeout_ms),
)
? {
mediaProofTimeoutMs: Number(
queueClaim.media_proof_timeout_ms ?? payload.media_proof_timeout_ms,
),
}
: {}),
...(Object.hasOwn(payload, "command_status_marker")
? { commandStatusMarker: payload.command_status_marker }
Expand All @@ -327,7 +386,7 @@ jobs:
--header "content-type: application/json" \
--header "x-clawsweeper-exact-review-signature: $signature" \
--data "$payload" \
"$queue_url/internal/exact-review/enqueue" >/dev/null
"$queue_url$queue_path" >/dev/null

event-review-apply:
name: Review exact event item
Expand Down
Loading