Skip to content

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

Open
not-stbenjam wants to merge 3 commits intoopenshift:mainfrom
not-stbenjam:fix/skillsaw-lint-warnings
Open

Fix AI instruction quality and bump apm-cli to 0.12.4#3515
not-stbenjam wants to merge 3 commits intoopenshift:mainfrom
not-stbenjam:fix/skillsaw-lint-warnings

Conversation

@not-stbenjam
Copy link
Copy Markdown

@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.12.4 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

Warning

Rate limit exceeded

@not-stbenjam has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 40 minutes and 51 seconds before requesting another review.

You’ve run out of usage credits. Purchase more in the billing tab.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: dd18b710-7897-4ff0-8542-3ae0f95f3a0a

📥 Commits

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

⛔ Files ignored due to path filters (24)
  • .claude/commands/sippy-generate-release-views.md is excluded by !.claude/**
  • .claude/commands/sippy-update-ga-release-views.md is excluded by !.claude/**
  • .claude/commands/sippy-update-job-variant.md is excluded by !.claude/**
  • .cursor/commands/sippy-dev-app.md is excluded by !.cursor/**
  • .cursor/commands/sippy-dev-frontend.md is excluded by !.cursor/**
  • .cursor/commands/sippy-dev-migrate.md is excluded by !.cursor/**
  • .cursor/commands/sippy-dev-regression-cache.md is excluded by !.cursor/**
  • .cursor/commands/sippy-dev-serve.md is excluded by !.cursor/**
  • .cursor/commands/sippy-dev-setup.md is excluded by !.cursor/**
  • .cursor/commands/sippy-dev-tests.md is excluded by !.cursor/**
  • .cursor/commands/sippy-generate-release-views.md is excluded by !.cursor/**
  • .cursor/commands/sippy-update-ga-release-views.md is excluded by !.cursor/**
  • .cursor/commands/sippy-update-job-variant.md is excluded by !.cursor/**
  • .gemini/commands/sippy-generate-release-views.toml is excluded by !.gemini/**
  • .gemini/commands/sippy-update-ga-release-views.toml is excluded by !.gemini/**
  • .gemini/commands/sippy-update-job-variant.toml is excluded by !.gemini/**
  • .opencode/commands/sippy-generate-release-views.md is excluded by !.opencode/**
  • .opencode/commands/sippy-update-ga-release-views.md is excluded by !.opencode/**
  • .opencode/commands/sippy-update-job-variant.md is excluded by !.opencode/**
  • AGENTS.md is excluded by !AGENTS.md
  • CLAUDE.md is excluded by !CLAUDE.md
  • GEMINI.md is excluded by !GEMINI.md
  • sippy-ng/AGENTS.md is excluded by !sippy-ng/AGENTS.md
  • sippy-ng/CLAUDE.md is excluded by !sippy-ng/CLAUDE.md
📒 Files selected for processing (9)
  • .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
  • Makefile
  • apm.lock.yaml
  • apm.yml
  • mcp/AGENTS.md
  • mcp/CLAUDE.md

Walkthrough

Four guidance documents are updated: three APM prompt files receive clarified or relocated instructions for AI-driven release view management and job variant updates, while the CodeRabbit configuration file adjusts code review rules for test coverage and query complexity limits.

Changes

Prompt and Configuration Clarifications

Layer / File(s) Summary
Release View Generation Guidance
.apm/prompts/sippy-generate-release-views.prompt.md
Adds explicit emphasis on replacing ga with now for relative date fields when base release matches source release, duplicated across workflow and base-release-update sections for clarity.
Release View Update Guidance
.apm/prompts/sippy-update-ga-release-views.prompt.md
YAML formatting preservation directive is relocated from an earlier section to align with later processing steps.
Job Variant Update Guidance
.apm/prompts/sippy-update-job-variant.prompt.md
Pattern ordering precedence reminder is added to the code-modification step and the "Pattern Ordering is CRITICAL" section is moved into the helper commands area with consistent wording on early-return behavior.
Code Review Configuration
.coderabbit.yaml
Test coverage requirement for new features changes from "where possible" to mandatory; query line-length instruction is adjusted for clarity; SQL injection prevention rules block is repositioned in custom checks section.

Estimated Code Review Effort

🎯 2 (Simple) | ⏱️ ~8 minutes

🚥 Pre-merge checks | ✅ 16 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Title check ⚠️ Warning The PR title 'Fix AI instruction quality and bump apm-cli to 0.12.4' is partially related to the changeset. The changes focus on fixing instruction positioning and quality in AI config files, but the title mentions 'bump apm-cli to 0.12.4' which is not reflected in the provided file changes. Update the title to accurately reflect only the changes present, such as 'Fix AI instruction quality in config and prompt files' or clarify if apm-cli version bump changes exist elsewhere.
✅ Passed checks (16 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.
Go Error Handling ✅ Passed The Go error handling check is not applicable. This PR modifies only configuration (.yaml) and documentation (.md) files, not Go source code (.go files).
Sql Injection Prevention ✅ Passed SQL Injection Prevention check present with all required instructions. Set to error mode and positioned in final 20% of file as intended.
Excessive Css In React Should Use Styles ✅ Passed The custom check for excessive CSS in React components is not applicable to this PR. The PR only modifies configuration and Markdown prompt files, and no React components exist in the repository.
Test Coverage For New Features ✅ Passed Configuration-only changes to YAML and Markdown prompt files. No testable code logic introduced. Falls under explicit exception for configuration-only changes.
Single Responsibility And Clear Naming ✅ Passed PR only modifies documentation/config files (.coderabbit.yaml, prompts, instructions). The check applies to code packages/structs/methods—not documentation. No code entities changed.
Stable And Deterministic Test Names ✅ Passed Repository has zero Ginkgo tests (uses Go testing + testify). Custom check targets Ginkgo patterns only. Not applicable to this PR.
Test Structure And Quality ✅ Passed This custom check for Ginkgo test quality is not applicable. The PR only modifies prompt and config files, not Go test code.
Microshift Test Compatibility ✅ Passed PR only modifies configuration and documentation files. No Ginkgo e2e tests are added or modified, so MicroShift compatibility check does not apply.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The custom check for SNO Test Compatibility is not applicable to this PR. It only modifies AI prompt and config files—no new Ginkgo e2e tests or Go test code.
Topology-Aware Scheduling Compatibility ✅ Passed The PR only modifies AI prompt documentation and CodeRabbit configuration—not deployment manifests or operator code. No scheduling constraints or topology assumptions are introduced.
Ote Binary Stdout Contract ✅ Passed OTE stdout contract check is not applicable—PR only modifies configuration and documentation files, not executable code.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No Ginkgo e2e tests are added in this PR. Changes are to AI config and prompt files only, not test code. Check not applicable.
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
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 9, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: not-stbenjam
Once this PR has been reviewed and has the lgtm label, please assign xueqzhan for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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 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
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>
@not-stbenjam not-stbenjam force-pushed the fix/skillsaw-lint-warnings branch from 18525fb to e0f766a Compare May 9, 2026 21:43
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>
@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
These were generated but never committed.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@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
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 9, 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

2 participants