NVIDIA
diff --git a/‎.agents/skills/build-from-issue/SKILL.md‎
Lines changed: 19 additions & 11 deletions b/‎.agents/skills/build-from-issue/SKILL.md‎
Lines changed: 19 additions & 11 deletions
diff --git a/‎.agents/skills/create-github-issue/SKILL.md‎
Lines changed: 74 additions & 33 deletions b/‎.agents/skills/create-github-issue/SKILL.md‎
Lines changed: 74 additions & 33 deletions
diff --git a/‎.agents/skills/create-github-pr/SKILL.md‎
Lines changed: 47 additions & 18 deletions b/‎.agents/skills/create-github-pr/SKILL.md‎
Lines changed: 47 additions & 18 deletions
@@ -93,6 +93,8 @@ gh issue view <id> --json number,title,body,state,labels,author
 
 If the issue is closed, report that and stop.
 
+If the issue has the `needs-agent-triage` label, report that the issue has not been triaged yet. Suggest using the `triage-issue` skill first to assess and classify the issue before planning implementation. Stop.
+
 ## Step 2: Fetch and Classify Comments
 
 Fetch all comments:
@@ -480,30 +482,36 @@ gh pr create \
   --body "$(cat <<'EOF'
 > **🏗️ build-from-issue-agent**
 
-Closes #<issue-id>
-
 ## Summary
 <1-3 sentences describing what was built and the approach taken>
 
-## Changes Made
+## Related Issue
+Closes #<issue-id>
+
+## Changes
 - `<file1>`: <what changed and why>
 - `<file2>`: <what changed and why>
 
-## Deviations from Plan
+### Deviations from Plan
 <any deviations from the approved plan, or "None — implemented as planned">
 
-## Tests Added
+## Testing
+- [x] `mise run pre-commit` passes
+- [x] Unit tests added/updated
+- [x] E2E tests added/updated (if applicable)
+
+**Tests added:**
 - **Unit:** <test file(s) and what they cover>
 - **Integration:** <test file(s) and what they cover, or "N/A">
 - **E2E:** <test file(s) and what they cover, or "N/A">
 
-## Documentation Updated
-- `<architecture/doc.md>`: <what was updated>
+## Checklist
+- [x] Follows Conventional Commits
+- [x] Commits are signed off (DCO)
+- [x] Architecture docs updated (if applicable)
 
-## Verification
-- [x] Pre-commit checks passing (unit tests, lint, format)
-- [x] E2E tests passing (if e2e/ files were modified)
-- [x] Architecture documentation updated
+**Documentation updated:**
+- `<architecture/doc.md>`: <what was updated>
 EOF
 )"
 ```
 
@@ -5,66 +5,107 @@ description: Create GitHub issues using the gh CLI. Use when the user wants to c
 
 # Create GitHub Issue
 
-Create issues on GitHub using the `gh` CLI.
+Create issues on GitHub using the `gh` CLI. Issues must conform to the project's issue templates.
 
 ## Prerequisites
 
 The `gh` CLI must be authenticated (`gh auth status`).
 
-## Creating an Issue
+## Issue Templates
 
-Use `gh issue create` with title and body:
+This project uses YAML form issue templates. When creating issues, match the template structure so the output aligns with what GitHub renders.
 
-```bash
-gh issue create --title "Issue title" --body "Issue description"
-```
+### Bug Reports
 
-### With Labels
+Use the `bug` label. The body must include an **Agent Diagnostic** section — this is required by the template and enforced by project convention.
 
 ```bash
-gh issue create --title "Title" --body "Description" --label "bug" --label "priority:high"
-```
+gh issue create \
+  --title "bug: <concise description>" \
+  --label "bug" \
+  --body "$(cat <<'EOF'
+## Agent Diagnostic
 
-### Assign to Someone
+<Paste the output from the agent's investigation. What skills were loaded?
+What was found? What was tried?>
 
-```bash
-gh issue create --title "Title" --body "Description" --assignee "username"
-```
+## Description
 
-### Assign to Yourself
+**Actual behavior:** <what happened>
 
-```bash
-gh issue create --title "Title" --body "Description" --assignee "@me"
-```
+**Expected behavior:** <what should happen>
 
-## Issue Formatting Guidelines
+## Reproduction Steps
 
-Format the description based on the issue type:
+1. <step>
+2. <step>
 
-### Bug Reports
+## Environment
 
-Include:
+- OS: <os>
+- Docker: <version>
+- OpenShell: <version>
 
-- What happened (actual behavior)
-- What should happen (expected behavior)
-- Steps to reproduce
-- Environment details if relevant
+## Logs
+
+```
+<relevant output>
+```
+EOF
+)"
+```
 
 ### Feature Requests
 
-Include:
+Use the `feat` label. The body must include a **Proposed Design** — not a "please build this" request.
+
+```bash
+gh issue create \
+  --title "feat: <concise description>" \
+  --label "feat" \
+  --body "$(cat <<'EOF'
+## Problem Statement
 
-- Problem or use case being addressed
-- Proposed solution
-- Acceptance criteria (what "done" looks like)
+<What problem does this solve? Why does it matter?>
+
+## Proposed Design
+
+<How should this work? Describe the system behavior, components involved,
+and user-facing interface.>
+
+## Alternatives Considered
+
+<What other approaches were evaluated? Why is this design better?>
+
+## Agent Investigation
+
+<If the agent explored the codebase to assess feasibility, paste findings here.>
+EOF
+)"
+```
 
 ### Tasks
 
-Include:
+For internal tasks that don't fit bug/feature templates:
 
-- Clear description of the work
-- Any context or dependencies
-- Definition of done
+```bash
+gh issue create \
+  --title "<type>: <description>" \
+  --body "$(cat <<'EOF'
+## Description
+
+<Clear description of the work>
+
+## Context
+
+<Any dependencies, related issues, or background>
+
+## Definition of Done
+
+- [ ] <criterion>
+EOF
+)"
+```
 
 ## Useful Options
 
 
@@ -152,39 +152,68 @@ Default target is `main`. To target a different branch:
 gh pr create --base "release-1.0"
 ```
 
-## PR Description Guidelines
+## PR Description Format
 
-A good PR description includes:
+PR descriptions must follow the project's [PR template](.github/PULL_REQUEST_TEMPLATE.md) structure:
 
-### Summary
-
-Brief description of changes (2-3 bullet points).
+```markdown
+## Summary
+<!-- 1-3 sentences: what this PR does and why -->
 
-### Test Plan
+## Related Issue
+<!-- Fixes #NNN or Closes #NNN -->
 
-How the changes were tested:
+## Changes
+<!-- Bullet list of key changes -->
 
-- Unit tests added/updated
-- Manual testing performed
-- Integration tests
+## Testing
+<!-- What testing was done? -->
+- [ ] `mise run pre-commit` passes
+- [ ] Unit tests added/updated
+- [ ] E2E tests added/updated (if applicable)
 
-### Related Issues
+## Checklist
+- [ ] Follows Conventional Commits
+- [ ] Commits are signed off (DCO)
+- [ ] Architecture docs updated (if applicable)
+```
 
-Link to related issues using `Closes #123` or `Related to #456`.
+Populate the testing checklist based on what was actually run. Check boxes for steps that were completed.
 
 ## Example PR (Complete)
 
 ```bash
 gh pr create \
-  --title "feat(files): add pagination to dataset list endpoint" \
+  --title "feat(cli): add pagination to sandbox list" \
   --assignee "@me" \
-  --milestone "Platform 26.02" \
-  --body "Closes #456
-
+  --body "$(cat <<'EOF'
 ## Summary
-- Added \`offset\` and \`limit\` query parameters to GET /datasets
+
+Add `--limit` and `--offset` flags to `openshell sandbox list` for pagination.
+
+## Related Issue
+
+Closes #456
+
+## Changes
+
+- Added `offset` and `limit` query parameters to the sandbox list API call
 - Default limit is 20, max is 100
-- Response includes \`total_count\` field"
+- Response includes `total_count` field
+
+## Testing
+
+- [x] `mise run pre-commit` passes
+- [x] Unit tests added/updated
+- [ ] E2E tests added/updated (if applicable)
+
+## Checklist
+
+- [x] Follows Conventional Commits
+- [x] Commits are signed off (DCO)
+- [ ] Architecture docs updated (if applicable)
+EOF
+)"
 ```
 
 ## Useful Options