-
Notifications
You must be signed in to change notification settings - Fork 20
Appeng 4747/run eval per skill #49
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.
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
Open
GuyZivRH
wants to merge
2
commits into
main
Choose a base branch
from
APPENG-4747/run_eval_per_skill
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,180 @@ | ||
| # Per-Skill Evaluation: Skill Path Fixes | ||
|
|
||
| This document records all modifications made to SKILL.md files and environment | ||
| directories to ensure paths resolve correctly when the agent runs inside the | ||
| Harbor container. | ||
|
|
||
| ## Container Layout | ||
|
|
||
| The Dockerfile copies environment contents into: | ||
|
|
||
| ``` | ||
| /root/ | ||
| ├── .claude/skills/<skill-name>/SKILL.md # from environment/skills/ | ||
| ├── .claude/docs/... # from environment/docs/ | ||
| ├── docs/... # second copy of docs | ||
| ├── .mcp.json # generated or copied | ||
| └── .mcp-servers/ # from environment/mcp-servers/ | ||
| ``` | ||
|
|
||
| From a SKILL.md at `/root/.claude/skills/<skill>/SKILL.md`: | ||
| - `../../docs/` resolves to `/root/.claude/docs/` | ||
| - `../../../docs/` resolves to `/root/docs/` (second copy) | ||
| - `../references/` resolves to `/root/.claude/skills/references/` | ||
| - `./` resolves to `/root/.claude/skills/<skill>/` | ||
|
|
||
| --- | ||
|
|
||
| ## Fixes Applied | ||
|
|
||
| ### 1. rh-ai-engineer (7 tasks): Added shared `skills/references/` | ||
|
|
||
| **Tasks**: ai-observability, debug-inference, ds-project-setup, model-deploy, | ||
| nim-setup, serving-runtime-config, workbench-manage | ||
|
|
||
| **Problem**: SKILL.md files reference `../references/skill-conventions.md`, | ||
| `../references/live-doc-lookup.md`, and `../references/common-issues.md`. | ||
| These expect `environment/skills/references/` to exist. It was missing. | ||
|
|
||
| **Fix**: Copied `agentic-collections/rh-ai-engineer/skills/references/` into | ||
| each task's `environment/skills/references/` directory. | ||
|
|
||
| **Files added** (per task): | ||
| - `environment/skills/references/skill-conventions.md` | ||
| - `environment/skills/references/live-doc-lookup.md` | ||
| - `environment/skills/references/common-issues.md` | ||
|
|
||
| --- | ||
|
|
||
| ### 2. ocp-admin__cluster-report: Added `scripts/` and `.mcp.json` | ||
|
|
||
| **Problem**: SKILL.md references `../../scripts/cluster-report/assemble.py`, | ||
| `../../scripts/cluster-report/aggregate.py`, | ||
| `../../scripts/cluster-report/build-kubeconfig.py`, and `../../.mcp.json`. | ||
| None were present in the environment. | ||
|
|
||
| **Fix**: Copied from `agentic-collections/ocp-admin/`: | ||
| - `scripts/cluster-report/` (6 files) into `environment/scripts/cluster-report/` | ||
| - `.mcp.json` into `environment/.mcp.json` | ||
|
|
||
| --- | ||
|
|
||
| ### 3. rh-sre (7 tasks): Added cross-referenced skill directories | ||
|
|
||
| **Problem**: Several SRE skills reference other skills via `../other-skill/SKILL.md`. | ||
| In the per-skill evaluation, only the evaluated skill is included, so cross-refs | ||
| broke. | ||
|
|
||
| **Fix**: Copied the referenced skill directories from | ||
| `agentic-collections/rh-sre/skills/` into each task's `environment/skills/`: | ||
|
|
||
| | Task | Added skills | | ||
| |------|-------------| | ||
| | rh-sre__cve-impact | mcp-lightspeed-validator | | ||
| | rh-sre__cve-validation | mcp-lightspeed-validator | | ||
| | rh-sre__fleet-inventory | mcp-lightspeed-validator | | ||
| | rh-sre__job-template-creator | mcp-aap-validator, playbook-executor | | ||
| | rh-sre__job-template-remediation-validator | mcp-aap-validator, playbook-executor, job-template-creator | | ||
| | rh-sre__playbook-executor | mcp-aap-validator | | ||
| | rh-sre__remediation | cve-validation | | ||
|
|
||
| --- | ||
|
|
||
| ### 4. rh-developer (5 tasks): Added `templates/` | ||
|
|
||
| **Tasks**: containerize-deploy, deploy, detect-project, helm-deploy, rhel-deploy | ||
|
|
||
| **Problem**: SKILL.md files reference `templates/deployment.yaml.template`, | ||
| `templates/helm/`, `templates/systemd/`, etc. The templates directory was | ||
| not present in the environment. | ||
|
|
||
| **Fix**: Copied `agentic-collections/rh-developer/templates/` into each | ||
| task's `environment/templates/` directory. | ||
|
|
||
| --- | ||
|
|
||
| ### 5. rh-sre__cve-impact: Fixed dangling doc references (SKILL.md modified) | ||
|
|
||
| **Problem**: SKILL.md referenced `insights-api.md` and `fleet-management.md` | ||
| in `../../docs/insights/`. These files do not exist in the source | ||
| agentic-collections repository. | ||
|
|
||
| **Fix**: Replaced broken links with references to | ||
| `vulnerability-logic.md` (which exists at `../../docs/insights/vulnerability-logic.md` | ||
| and covers related content): | ||
|
|
||
| | Original reference | Replaced with | | ||
| |-------------------|---------------| | ||
| | `../../docs/insights/insights-api.md` | `../../docs/insights/vulnerability-logic.md` | | ||
| | `../../docs/insights/fleet-management.md` | `../../docs/insights/vulnerability-logic.md` | | ||
|
|
||
| Lines changed: 221-222, 252-253, 394-395 | ||
|
|
||
| --- | ||
|
|
||
| ### 6. rh-sre__fleet-inventory: Fixed dangling doc references (SKILL.md modified) | ||
|
|
||
| **Problem**: Same as cve-impact — references to non-existent `insights-api.md` | ||
| and `fleet-management.md`. | ||
|
|
||
| **Fix**: Same replacement to `vulnerability-logic.md`. | ||
|
|
||
| Lines changed: 101-102, 127-128, 219-220 | ||
|
|
||
| --- | ||
|
|
||
| ### 7. rh-sre__cve-impact: Fixed path depth `../../../docs/` → `../../docs/` | ||
|
|
||
| **Problem**: Two references used `../../../docs/references/` (three levels up) | ||
| instead of `../../docs/references/` (two levels up). Both paths work inside | ||
| the container (docs is at both `/root/.claude/docs/` and `/root/docs/`), but | ||
| `../../docs/` is the canonical path. | ||
|
|
||
| **Fix**: Changed `../../../docs/` to `../../docs/` in two places: | ||
| - Line 23: `skill-invocation.md` | ||
| - Line 325: `lightspeed-mcp-tool-failures.md` | ||
|
|
||
| --- | ||
|
|
||
| ### 8. rh-sre__cve-validation: Fixed path depth `../../../docs/` → `../../docs/` | ||
|
|
||
| **Problem**: Same path depth issue as cve-impact. | ||
|
|
||
| **Fix**: Changed `../../../docs/references/skill-invocation.md` path from | ||
| `../../../docs/` to `../../docs/`. | ||
|
|
||
| Line changed: 24 | ||
|
|
||
| --- | ||
|
|
||
| ### 9. rh-virt__vm-rebalance: Fixed citation paths (SKILL.md modified) | ||
|
|
||
| **Problem**: SKILL.md uses absolute-style paths | ||
| `rh-virt/skills/vm-rebalance/REBALANCE_MANUAL.md` in agent output citation | ||
| text. These don't resolve from the skill directory. The actual Read | ||
| instructions correctly use `./REBALANCE_MANUAL.md`. | ||
|
|
||
| **Fix**: Changed citation paths to use relative `./` prefix: | ||
| - `rh-virt/skills/vm-rebalance/REBALANCE_MANUAL.md` → `./REBALANCE_MANUAL.md` | ||
| - `rh-virt/skills/vm-rebalance/REBALANCE_AUTOMATIC.md` → `./REBALANCE_AUTOMATIC.md` | ||
|
|
||
| Lines changed: 94, 103 | ||
|
|
||
| --- | ||
|
|
||
| ## Remaining Non-Issues (false positives) | ||
|
|
||
| | Task | Pattern | Explanation | | ||
| |------|---------|-------------| | ||
| | rh-developer__debug-rhel | `[path](/.*)? ` | SELinux fcontext regex, not a file link | | ||
| | rh-developer__rhel-deploy | `[app-name](/.*)? ` | SELinux fcontext regex, not a file link | | ||
|
|
||
| These appear in `semanage fcontext` shell command examples. The markdown | ||
| link syntax parser matches them, but they are regex patterns, not file | ||
| references. | ||
|
|
||
| --- | ||
|
|
||
| ## Validation Results | ||
|
|
||
| After all fixes: **269 paths OK, 0 real broken references**. |
20 changes: 20 additions & 0 deletions
20
evaluation/with_skills/ocp-admin__cluster-report/environment/.mcp.json
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "mcpServers": { | ||
| "openshift": { | ||
| "command": "bash", | ||
| "args": [ | ||
| "-c", | ||
| "U=(); [ \"$(uname -s)\" = Linux ] && U=(--userns=keep-id:uid=65532,gid=65532); exec podman run \"${U[@]}\" --rm -i --network=host -v \"${KUBECONFIG}:/kubeconfig:ro,Z\" --entrypoint /app/kubernetes-mcp-server quay.io/ecosystem-appeng/openshift-mcp-server:latest --kubeconfig /kubeconfig --read-only --toolsets core,config" | ||
| ], | ||
| "env": { | ||
| "KUBECONFIG": "${KUBECONFIG}" | ||
| }, | ||
| "description": "Red Hat OpenShift MCP server for multi-cluster administration and reporting", | ||
| "security": { | ||
| "isolation": "container", | ||
| "network": "local", | ||
| "credentials": "env-only" | ||
| } | ||
| } | ||
| } | ||
| } |
70 changes: 70 additions & 0 deletions
70
evaluation/with_skills/ocp-admin__cluster-report/environment/Dockerfile
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| FROM ubuntu:24.04 | ||
|
|
||
| ENV DEBIAN_FRONTEND=noninteractive | ||
|
|
||
| RUN apt-get update && apt-get install -y \ | ||
| python3 \ | ||
| python3-pip \ | ||
| python3-venv \ | ||
| curl \ | ||
| jq \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| WORKDIR /root | ||
|
|
||
| RUN pip3 install --break-system-packages \ | ||
| pyyaml==6.0.1 \ | ||
| fastmcp | ||
|
|
||
| ENV KUBECONFIG=/root/.kube/config | ||
| RUN mkdir -p /root/.kube && echo '\ | ||
| apiVersion: v1\n\ | ||
| kind: Config\n\ | ||
| current-context: ocp-prod\n\ | ||
| clusters:\n\ | ||
| - name: ocp-prod\n\ | ||
| cluster:\n\ | ||
| server: https://api.ocp-prod.example.com:6443\n\ | ||
| contexts:\n\ | ||
| - name: ocp-prod\n\ | ||
| context:\n\ | ||
| cluster: ocp-prod\n\ | ||
| user: admin\n\ | ||
| namespace: default\n\ | ||
| users:\n\ | ||
| - name: admin\n\ | ||
| user:\n\ | ||
| token: mock-token-for-testing\n' > /root/.kube/config | ||
|
|
||
| COPY docs /root/docs | ||
|
|
||
| RUN mkdir -p /logs/agent/sessions && \ | ||
| ln -s /root/docs /logs/agent/sessions/docs | ||
|
|
||
| COPY skills /root/.claude/skills | ||
| COPY docs /root/.claude/docs | ||
| COPY skills /root/.codex/skills | ||
| COPY docs /root/.codex/docs | ||
| COPY skills /root/.opencode/skill | ||
| COPY docs /root/.opencode/docs | ||
| COPY skills /root/.goose/skills | ||
| COPY docs /root/.goose/docs | ||
| COPY skills /root/.factory/skills | ||
| COPY docs /root/.factory/docs | ||
| COPY skills /root/.agents/skills | ||
| COPY docs /root/.agents/docs | ||
| COPY skills /root/.gemini/skills | ||
| COPY docs /root/.gemini/docs | ||
|
|
||
| COPY mcp-servers /root/.mcp-servers | ||
|
|
||
| RUN echo '{ \ | ||
| "mcpServers": { \ | ||
| "openshift": { \ | ||
| "command": "python3", \ | ||
| "args": ["/root/.mcp-servers/mock-ocp-mcp.py"] \ | ||
| } \ | ||
| } \ | ||
| }' > /root/.mcp.json | ||
|
|
||
| WORKDIR /root |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why this one is not generated from within the Dockerfile as I see in other tests?
example:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
will check that.