diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..eeb83313
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Report a reproducible issue
+labels: bug
+---
+
+## Summary
+A clear and concise description of the bug.
+
+## Environment
+- OS:
+- Python version:
+- GenericAgent commit/version:
+- Model/provider:
+
+## Steps To Reproduce
+1.
+2.
+3.
+
+## Expected Behavior
+What should happen.
+
+## Actual Behavior
+What actually happens.
+
+## Logs / Screenshots
+Paste relevant logs or screenshots.
+
+## Additional Context
+Anything else that helps reproduction.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..d36fcb52
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Propose an improvement
+labels: enhancement
+---
+
+## Problem
+What user pain or workflow issue does this solve?
+
+## Proposed Solution
+Describe the expected behavior and UX.
+
+## Alternatives Considered
+Any other options considered.
+
+## Scope
+- [ ] Docs only
+- [ ] Small code change
+- [ ] Cross-module change
+
+## Success Criteria
+How we can verify this feature is done.
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..1535a10a
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,20 @@
+## Summary
+Describe what this PR changes and why.
+
+## Related Issue
+Closes #
+
+## Type of Change
+- [ ] Bug fix
+- [ ] Feature
+- [ ] Refactor
+- [ ] Documentation
+- [ ] Tests
+
+## Validation
+- [ ] I ran relevant tests/checks locally
+- [ ] I verified no obvious regressions
+- [ ] I updated docs when behavior changed
+
+## Notes for Reviewers
+Anything reviewers should pay attention to.
\ No newline at end of file