Repository navigation
fix(workflows): night-issue-prs merge-blocker drain (open threads + conflicts) - #2046
Merged
Merged
Conversation
…issue-prs Human cannot merge PRs with unresolved conversations or conflicts. PR follow-up now drains merge blockers before issue Work (and again after), selects oldest first for anti-starvation, requires completeness on each selected PR, and still runs when the issue queue is empty. Default max_prs is 6 (cap 12). > Co-Authored by Grok Build using grok-4.5 with agent main.
natechadwick-intsof
added
operator:grok
natechadwick
approved these changes
Aug 5, 2026
2 tasks done
This was referenced Sep 5, 2026
natechadwick-intsof
added a commit
that referenced
this pull request
Sep 6, 2026
* fix(codeql): path-injection #2039–#2044 PSConfigService config files Contain package config files under RxDir via requireSafeFileName and requireUnderBase before File.exists / FileInputStream. Parent audit #4348. > Co-Authored by Grok Build 1.0.13 using grok-4.6 with agent night-issue-prs-security. * fix(codeql): path-injection #2045 IOTools.getFileContent Reject NUL paths, open the canonical file, and add getFileContentUnderBase with requireUnderBase. Parent audit #4348. > Co-Authored by Grok Build 1.0.13 using grok-4.6 with agent night-issue-prs-security. * fix(codeql): path-injection #2046–#2050 object-store save files Contain application save paths under RxDir via requireFileUnderRxDir before exists/isFile/mkdirs. Parent audit #4348. > Co-Authored by Grok Build 1.0.13 using grok-4.6 with agent night-issue-prs-security. * docs(codeql): record path-injection residual alerts #2055–#2057 PR #4349 already has runtime requireUnderBase, sink-line annotations, query-filters, and tests. CodeQL re-fingerprinted exists() as #2055–#2057 on the PR scan (query-filters do not always filter PR review comments). > Co-Authored by Grok Build 1.0.13 using grok-4.6 with agent night-issue-prs. * docs(codeql): record path-injection residual alert #2054 PR #4350 already has NUL reject + getCanonicalFile, getFileContentUnderBase, sink-line annotations, query-filters, and tests. CodeQL re-fingerprinted FileInputStream as #2054 on the PR scan. > Co-Authored by Grok Build 1.0.13 using grok-4.6 with agent night-issue-prs. * docs(codeql): record path-injection residual alerts #2058–#2062 PR #4351 already has requireFileUnderRxDir, sink-line annotations, query-filters, and tests. CodeQL re-fingerprinted save File API as #2058–#2062 on the PR scan. > Co-Authored by Grok Build 1.0.13 using grok-4.6 with agent night-issue-prs.
natechadwick
pushed a commit
that referenced
this pull request
Sep 18, 2026
…4578) * fix(security): CodeQL #2063–#2075 path-injection residuals (#4577) Add ObjectStore ApplicationFile store tests under a thread RxDir so exists/rename/delete stay inside requireUnderBase. Document #2074–#2075 as residual of #2046–#2062. Do not re-edit annotated sinks. Partial #4577 > Co-Authored by Grok Build 1.0.34 using grok-4.6 with agent night-issue-prs-security. * fix(security): keep ApplicationFileAdaptor sink line numbers Drop extra javadoc so CodeQL does not re-fingerprint annotated exists/move/delete sinks (#2063–#2073). > Co-Authored by Grok Build 1.0.34 using grok-4.6 with agent night-issue-prs-security.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Context
Operator cannot merge with open review conversations or conflicts. Overnight was conflict-first + max_prs=3, so MERGEABLE PRs with open Kilo threads never cleared.
Test plan
Operator
Grok (model:grok-4.5)