Skip to content

Fix AI instruction quality and bump apm-cli to 0.13.0#3515

Merged
openshift-merge-bot[bot] merged 4 commits into
openshift:mainfrom
not-stbenjam:fix/skillsaw-lint-warnings
May 15, 2026
Merged

Fix AI instruction quality and bump apm-cli to 0.13.0#3515
openshift-merge-bot[bot] merged 4 commits into
openshift:mainfrom
not-stbenjam:fix/skillsaw-lint-warnings

Conversation

@not-stbenjam
Copy link
Copy Markdown
Contributor

@not-stbenjam not-stbenjam commented May 9, 2026

Summary

  • Removes hedging language ("ideally", "where possible") in .coderabbit.yaml in favor of direct requirements
  • Moves critical instructions out of the middle of long prompt files to the top or bottom where LLMs pay more attention
  • Bumps apm-cli from 0.11.0 to 0.13.0 and updates apm.yml to the current config format
  • Recompiles all generated APM output

Issues found by skillsaw, a linter for AI config files.

Test plan

  • skillsaw . passes with 0 errors and 0 warnings
  • make verify-apm passes
  • No code changes, only instruction text and APM tooling

🤖 Generated with Claude Code

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: automatic mode

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 9, 2026

Walkthrough

Four APM prompt files and CodeRabbit config wording are updated; Makefile apm CLI version, apm.yml formatting/dependencies, apm.lock refresh, and generated MCP metadata headers are also changed.

Changes

Prompt and Configuration Clarifications

Layer / File(s) Summary
Release View Generation Guidance
.apm/prompts/sippy-generate-release-views.prompt.md
Adds explicit guidance to replace ga with now for relative_start/relative_end when the base release becomes the sample release, applied in multiple workflow sections.
Release View Update Guidance
.apm/prompts/sippy-update-ga-release-views.prompt.md
Moves the YAML formatting preservation instruction from an earlier workflow position to a later "Important Notes" section without other changes.
Job Variant Update Guidance
.apm/prompts/sippy-update-job-variant.prompt.md
Rewords and relocates pattern-ordering guidance: adds precedence reminder to the code-modify step and moves the full "Pattern Ordering is CRITICAL" subsection into Helper Commands, preserving early-return/first-match examples.
Code Review Configuration
.coderabbit.yaml
Tightens review rules: pkg/**/query/** must stay under 200 lines, and new/modified features must include test coverage.
Makefile apm target
Makefile
Bumps the apm target to use apm-cli@0.12.4 for apm install and apm compile.
APM lockfile updates
apm.lock.yaml
Refreshes local_deployed_files and local_deployed_file_hashes, removing restore-prodlike variants and docs entries and updating hashes for multiple agent command/rule files.
APM manifest formatting
apm.yml
Convert targets to a multiline list and replace dependencies: {} with explicit apm: [] and mcp: [].
Regenerated MCP metadata
mcp/AGENTS.md, mcp/CLAUDE.md
Update generated file headers with new Build ID and APM CLI version (v0.12.4).

Estimated Code Review Effort

🎯 2 (Simple) | ⏱️ ~8 minutes

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Title check ⚠️ Warning The title claims 'bump apm-cli to 0.13.0' but the actual changes show an upgrade to 0.12.4, not 0.13.0. This is a factual inaccuracy. Correct the title to reflect the actual version change: 'Fix AI instruction quality and bump apm-cli to 0.12.4'.
✅ Passed checks (4 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci Bot requested review from dgoodwin and petr-muller May 9, 2026 21:32
@openshift-ci openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 9, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 9, 2026

Hi @not-stbenjam. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@not-stbenjam not-stbenjam force-pushed the fix/skillsaw-lint-warnings branch from 514f91f to 7d70804 Compare May 9, 2026 21:35
Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In @.apm/prompts/sippy-generate-release-views.prompt.md:
- Around line 8-10: Unify the wording so the replacement scope is precise:
change both occurrences that currently say "replace 'ga' with 'now' in relative
dates" or mix fields to instead instruct only the exact fields relative_start
and relative_end to be updated when base becomes source release; update the two
lines shown and the other occurrence referenced (lines 62-63) so every
instruction consistently reads something like "When base becomes source release,
replace 'ga' with 'now' in relative_start and relative_end" to avoid
broad/ambiguous edits.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: b874d9a1-dc8a-4bb6-b94e-8163f5c46245

📥 Commits

Reviewing files that changed from the base of the PR and between e682208 and 514f91f.

📒 Files selected for processing (4)
  • .apm/prompts/sippy-generate-release-views.prompt.md
  • .apm/prompts/sippy-update-ga-release-views.prompt.md
  • .apm/prompts/sippy-update-job-variant.prompt.md
  • .coderabbit.yaml

Comment thread .apm/prompts/sippy-generate-release-views.prompt.md Outdated
@not-stbenjam not-stbenjam force-pushed the fix/skillsaw-lint-warnings branch from 7d70804 to 18525fb Compare May 9, 2026 21:40
@openshift-merge-bot openshift-merge-bot Bot added the ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review label May 9, 2026
@not-stbenjam not-stbenjam force-pushed the fix/skillsaw-lint-warnings branch from 18525fb to e0f766a Compare May 9, 2026 21:43
@not-stbenjam not-stbenjam changed the title Fix instruction positioning and hedging in AI config files Fix AI instruction quality and bump apm-cli to 0.12.4 May 9, 2026
@stbenjam
Copy link
Copy Markdown
Member

stbenjam commented May 9, 2026

/ok-to-test

@openshift-ci openshift-ci Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 9, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test e2e

@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 15, 2026
not-stbenjam and others added 3 commits May 15, 2026 06:33
Addresses 10 skillsaw lint warnings across .coderabbit.yaml and
.apm/prompts/ by:

- Removing hedging language ("ideally", "where possible") in favor
  of direct requirements
- Moving critical instructions (NEVER, MUST, CRITICAL, IMPORTANT)
  out of the attention dead zone (20-80% of file) to the first or
  last 20% where LLMs pay more attention

Based on attention research (lost-in-the-middle) showing that LLMs
attend less to instructions in the middle of long contexts.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Update apm.yml to use the new 0.12.4 config schema (targets list,
structured dependencies) and bump the Makefile pin. Recompile all
generated output.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
These were generated but never committed.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@not-stbenjam not-stbenjam force-pushed the fix/skillsaw-lint-warnings branch from 4766bb4 to d92d9ad Compare May 15, 2026 10:34
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 15, 2026
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@not-stbenjam not-stbenjam changed the title Fix AI instruction quality and bump apm-cli to 0.12.4 Fix AI instruction quality and bump apm-cli to 0.13.0 May 15, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test e2e

Comment thread .coderabbit.yaml
mode: warning
instructions: |
New or modified functionality should include test coverage where possible:
New or modified functionality must include test coverage:
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two seem very strict, but I guess we can tune if CR becomes too zealous

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 15, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 15, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: not-stbenjam, petr-muller

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 15, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 15, 2026

@not-stbenjam: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot Bot merged commit 412f57e into openshift:main May 15, 2026
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants