diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 5bfc08f80f..44626273b5 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -53,6 +53,16 @@ body:
     validations:
       required: true
 
+  - type: textarea
+    id: roo-code-tasks
+    attributes:
+      label: Roo Code Task Links (Optional)
+      description: |
+        If you have any publicly shared task links that demonstrate the issue, please paste them here.
+        This helps maintainers understand the context.
+        Example: https://app.roocode.com/share/task-id
+      placeholder: Paste your Roo Code share links here, one per line
+
   - type: textarea
     id: steps
     attributes:
@@ -85,4 +95,4 @@ body:
     attributes:
       label: 📄 Relevant Logs or Errors (Optional)
       description: Paste API logs, terminal output, or errors here. Use triple backticks (```) for code formatting.
-      render: shell
\ No newline at end of file
+      render: shell
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 85263d8813..4863f9ffa6 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -57,6 +57,16 @@ body:
       label: Additional context (optional)
       description: Mockups, screenshots, links, user quotes, or other relevant information that supports your proposal.
 
+  - type: textarea
+    id: roo-code-tasks
+    attributes:
+      label: Roo Code Task Links (Optional)
+      description: |
+        If you used Roo Code to explore this feature request or develop solutions, share the public task links here.
+        This helps maintainers understand the context and any exploration you've done.
+        Example: https://app.roocode.com/share/task-id
+      placeholder: Paste your Roo Code share links here, one per line
+
   - type: checkboxes
     id: checklist
     attributes:
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 765c70614c..e83e44cd66 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -12,6 +12,14 @@ Before submitting your PR, please ensure:
 
 Closes: # <!-- Replace with the issue number, e.g., Closes: #123 -->
 
+### Roo Code Task Context (Optional)
+
+<!--
+If you used Roo Code to help create this PR, you can share public task links here.
+This helps reviewers understand your development process and provides additional context.
+Example: https://app.roocode.com/share/task-id
+-->
+
 ### Description
 
 <!--