Fix upstream merge 128

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,30 +6,72 @@ labels: ''
 assignees: ''
 
 ---
-
-** Please make sure you read the contribution guide and file the issues in the rigth place. **
+**Please make sure you read the contribution guide and file the issues in the
+ right place. **
 [Contribution guide.](https://google.github.io/adk-docs/contributing-guide/)
 
-**Describe the bug**
+## 🔴 Required Information
+*Please ensure all items in this section are completed to allow for efficient
+triaging. Requests without complete information may be rejected / deprioritized.
+If an item is not applicable to you - please mark it as N/A
+
+**Describe the Bug:**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the behavior:
+**Steps to Reproduce:**
+Please provide a numbered list of steps to reproduce the behavior:
 1. Install '...'
 2. Run '....'
 3. Open '....'
-4. See error
+4. Provide error or stacktrace
 
-**Expected behavior**
+**Expected Behavior:**
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+**Observed Behavior:**
+What actually happened? Include error messages or crash stack traces here.
+
+**Environment Details:**
+
+ - ADK Library Version (see maven dependency):
+ - OS: [e.g., macOS, Linux, Windows]
+ - TS Version (tsc --version):
+
+**Model Information:**
+
+ - Which model is being used: (e.g., gemini-2.5-pro)
+
+---
+
+## 🟡 Optional Information
+*Providing this information greatly speeds up the resolution process.*
+
+**Regression:**
+Did this work in a previous version of ADK? (Yes/No) If so, which one?
+
+**Logs:**
+Please attach relevant logs. Wrap them in code blocks (```) or attach a
+text file.
+```text
+// Paste logs here
+```
+
+**Screenshots / Video:**
+If applicable, add screenshots or screen recordings to help explain
+your problem.
+
+**Additional Context:**
+Add any other context about the problem here.
+
+**Minimal Reproduction Code:**
+Please provide a code snippet or a link to a Gist/repo that isolates the issue.
+```
+// Code snippet here
+```
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Java version:
- - ADK version(see maven dependency):
+**How often has this issue occurred?:**
 
-**Additional context**
-Add any other context about the problem here.
+ - Always (100%)
+ - Often (50%+)
+ - Intermittently (<50%)
+ - Once / Rare

.github/ISSUE_TEMPLATE/feature_request.md

@@ -10,14 +10,39 @@ assignees: ''
 ** Please make sure you read the contribution guide and file the issues in the right place. **
 [Contribution guide.](https://google.github.io/adk-docs/contributing-guide/)
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+## 🔴 Required Information
+*Please ensure all items in this section are completed to allow for efficient
+triaging. Requests without complete information may be rejected / deprioritized.
+If an item is not applicable to you - please mark it as N/A*
 
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
+### Is your feature request related to a specific problem?
+Please describe the problem you are trying to solve. (Ex: "I'm always frustrated
+when I have to manually handle X...")
 
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+### Describe the Solution You'd Like
+A clear and concise description of the feature or API change you want.
+Be specific about input/outputs if this involves an API change.
 
-**Additional context**
+### Impact on your work
+How does this feature impact your work and what are you trying to achieve?
+If this is critical for you, tell us if there is a timeline by when you need
+this feature.
+
+### Willingness to contribute
+Are you interested in implementing this feature yourself or submitting a PR?
+(Yes/No)
+
+---
+
+## 🟡 Recommended Information
+
+### Describe Alternatives You've Considered
+A clear and concise description of any alternative solutions or workarounds
+you've considered and why they didn't work for you.
+
+### Proposed API / Implementation
+If you have ideas on how this should look in code, please share a
+pseudo-code example.
+
+### Additional Context
 Add any other context or screenshots about the feature request here.

.github/workflows/release-please.yaml

@@ -0,0 +1,17 @@
+'on':
+  push:
+    branches:
+      - main
+  workflow_dispatch: {}
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+name: release-please
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: googleapis/release-please-action@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/validation.yml

@@ -37,8 +37,8 @@ jobs:
             ${{ runner.os }}-maven-${{ matrix.java-version }}-
             ${{ runner.os }}-maven-
 
-      - name: Compile and test (all) modules with Java ${{ matrix.java-version }}
-        run: ./mvnw clean test
+      - name: Package and test (all) modules with Java ${{ matrix.java-version }}
+        run: ./mvnw -Prelease clean package
 
       - name: Detected wrongly formatted files
         run: git status && git diff --exit-code

.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+    ".": "0.5.0"
+}

README.md

@@ -138,7 +138,7 @@ debugging, versioning, and deployment anywhere – from your laptop to the cloud
 
 If you're using Maven, add the following to your dependencies:
 
-<!-- {x-version-start:google-adk:released} -->
+<!-- x-release-please-released-start-version -->
 
 ```xml
 <dependency>
@@ -154,7 +154,7 @@ If you're using Maven, add the following to your dependencies:
 </dependency>
 ```
 
-<!-- {x-version-end} -->
+<!-- x-release-please-released-end -->
 
 To instead use an unreleased version, you could use <https://jitpack.io/#google/adk-java/>;
 see <https://github.com/enola-dev/LearningADK#jitpack> for an example illustrating this.