Skip to content

merge: incorporate upstream/master (2026-04-27 release) - #42

Merged
joshbouncesecurity merged 3 commits into
masterfrom
claude/rebase-upstream-changes-YfDN8
Apr 29, 2026
Merged

merge: incorporate upstream/master (2026-04-27 release)#42
joshbouncesecurity merged 3 commits into
masterfrom
claude/rebase-upstream-changes-YfDN8

Conversation

@joshbouncesecurity

Copy link
Copy Markdown
Owner

Summary

Incorporates the two new upstream commits from knostic/OpenAnt into the fork without rewriting any of the fork's 47 already-published commits.

Upstream commits merged:

A merge (not a rebase) was used — consistent with prior upstream incorporations (a565352, 46531ee) and avoids rewriting published history.

Conflict resolutions

  • core/scanner.py — kept the fork's resume/checkpoint scaffolding around build-output; adopted upstream's repo_name/repo_url/commit_sha plumbing into build_pipeline_output and the "no API calls succeeded" warning in _print_summary.
  • core/verifier.py — kept code_by_route propagation; adopted upstream's verdict-based filter for confirmed_findings.
  • report/generator.py — kept the SDK port (analyze_sync); layered upstream's _splice_code_section + payload sanitization on top so the verbatim vulnerable-code block is never sent to the LLM.

Follow-ups required to keep the merge green

  • core/reporter.py — auto-merge dropped import json; re-added it (used by upstream's new caller/callee dedup code).
  • core/schemas.py — declared the missing resumed_steps field on ScanResult. The fork's resume code already referenced it without it being declared; upstream's new test_silent_401 exposes the latent AttributeError.
  • tests/report/test_disclosure_source_fidelity.py — adapted to patch AnthropicClient instead of generator.anthropic.Anthropic, since the fork no longer imports the anthropic SDK directly.
  • tests/test_silent_401.py::test_analyze_sync_raises_on_auth_error — rewrote to assert sdk_errors.AuthError propagates from _run_query_sync, matching the fork's SDK error surface (was asserting legacy anthropic.AuthenticationError).

Test plan

  • pytest tests/ — 260 passed locally
  • CI green on this PR
  • Spot-check openant scan on a small repo to confirm build_pipeline_output accepts the new repo_url/commit_sha fields end-to-end

Generated by Claude Code

gadievron and others added 3 commits April 28, 2026 09:13
…h validation, dynamic-test hardening)

Merges upstream commits 3d2e058 (README clarity) and ec5213b (the
2026-04-27 release) into the fork.

Conflict resolutions:
- core/scanner.py: kept the fork's resume/checkpoint scaffolding for
  build-output and adopted upstream's repo_name/repo_url/commit_sha
  threading into build_pipeline_output, plus the "no API calls
  succeeded" warning in _print_summary.
- core/verifier.py: kept code_by_route propagation and adopted
  upstream's verdict-based filter for confirmed_findings.
- report/generator.py: kept the SDK port (analyze_sync) and layered
  upstream's _splice_code_section + payload sanitization on top so the
  vulnerable-code block is never sent to the LLM.

Follow-ups required for the merge to function:
- core/reporter.py: re-added "import json" (used by upstream's new
  caller/callee dedup code; auto-merge dropped it).
- core/schemas.py: declared the resumed_steps field on ScanResult (the
  fork's resume code referenced it without it being declared, and
  upstream's new test_silent_401 trips over the AttributeError).
- tests/report/test_disclosure_source_fidelity.py: adapted to patch
  AnthropicClient instead of generator.anthropic.Anthropic, since the
  fork no longer imports the anthropic SDK directly.
- tests/test_silent_401.py: rewrote test_analyze_sync_raises_on_auth_error
  to match the SDK error surface (sdk_errors.AuthError raised from
  _run_query_sync) instead of the legacy anthropic.AuthenticationError.
@joshbouncesecurity
joshbouncesecurity merged commit 5c3855e into master Apr 29, 2026
7 checks passed
@joshbouncesecurity
joshbouncesecurity deleted the claude/rebase-upstream-changes-YfDN8 branch April 29, 2026 07:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants