Further prompt enhancements to improve results

Signed-off-by: Kelly Abuelsaad <kaymar@gmail.com>

Author: kellyaa

a2a/git_issue_agent/a2a_agent.py

@@ -203,7 +203,8 @@ async def execute(self, context: RequestContext, event_queue: EventQueue):
                     issue_tools = [
                         tool
                         for tool in mcp_tools
-                        if "issue" in tool.name.lower() and ("search" in tool.name.lower() or "list" in tool.name.lower())
+                        if ("issue" in tool.name.lower() or "label" in tool.name.lower()) and 
+                        ("search" in tool.name.lower() or "list" in tool.name.lower())
                     ]
 
                     if not issue_tools:

a2a/git_issue_agent/git_issue_agent/agents.py

@@ -9,7 +9,7 @@ def __init__(self, config: Settings, issue_tools):
         self.llm = CrewLLM(config)
 
         ###################
-        # Pre-requisitie validator
+        # Pre-requisite validator
         # ##################
         self.prereq_identifier = Agent(
             role="Pre-requisite Extractor",
@@ -21,15 +21,12 @@ def __init__(self, config: Settings, issue_tools):
 
         self.prereq_identifier_task = Task(
             description=(
-                "User query: {request}, \
-                Identified repository: {repo} \
-                Identified owner: {owner} \
-                Identified issue numbers: {issues}"
+                "User query: {request}"
             ),
             agent=self.prereq_identifier,
             output_pydantic=IssueSearchInfo,
             expected_output=(
-                "A structured extraction of the relevant Github artifacts"
+                "A pydantic object representing the extracted relevant information."
             ),
         )
 
@@ -54,19 +51,22 @@ def __init__(self, config: Settings, issue_tools):
             verbose=True,
             llm=self.llm.llm,
             inject_date=True,
-            max_iter=3
+            max_iter=6
         )
 
         # --- A generic task template -------------------------------------------------
         # The agent will use MCP tools to fulfill natural-language queries.
         self.issue_query_task = Task(
             description=(
                 "Retrieve Github issues using tool calls in order to answer the user's query.\n"
-                "User query: {request}"
+                "User query: {request}\n"
+                "Identified repository: {repo} \n"
+                "Identified owner: {owner} \n"
+                "Identified issue numbers: {issues}"
             ),
             agent=self.issue_researcher,
             expected_output=(
-                "A direct answer to the user's query, citing the output of the tool to support your answer. Provide as many details as possible to support your claim."
+                "A well formatted, detailed report, directly answering the user's query, citing the output of the tool to support your answer."
             ),
         )
 

a2a/git_issue_agent/git_issue_agent/data_types.py

@@ -6,6 +6,6 @@
 ############
 
 class IssueSearchInfo(BaseModel):
-    owner: str
-    repo: str
-    issue_numbers: list[int]
+    owner: str = Field(None, description="The issue owner or organization.")
+    repo: str = Field(None, description="The specified repository. Leave blank if none specified.")
+    issue_numbers: list[int] = Field(None, description="Specific issue number(s) mentioned by the user. If none mentioned leave blank.")

a2a/git_issue_agent/git_issue_agent/prompts.py

@@ -1,18 +1,23 @@
 TOOL_CALL_PROMPT = """
 You are a GitHub issue analyst with access to MCP tools that can search and list GitHub issues.
+You will receive instructions in the following format:
+│  User query: The original query/instruction from the user                                                                                                                                                                   │
+│  Identified repository: The github repo they are referring to, if present                                                                                                                                                                                                            │
+│  Identified owner: The github owner they are referring to, if present                                                                                                                                                                           │
+│  Identified issue numbers: Any issue numbers they are referring to, if present
 
 YOUR JOB
 1. Decide whether the user’s request can be fulfilled with a tool from the catalog.
 2. When a tool is required, emit **only** a single tool call in the exact format below.
-3. After tool results arrive, produce the final answer grounded strictly in those results.
+3. Use the exact owner, repo, and issues as written by the user as input to the tools, without modification.
+4. After tool results arrive, produce the final answer grounded strictly in those results.
 
+## *MODES*
 ────────────────────────────────────────────────────────
 ⚙️ TOOL CALL PHASE
-You are a GitHub issue analyst with access to MCP tools that can search and list GitHub issues.
 
-MODES
 - If a tool is required, you MUST output EXACTLY the following four lines in this order:
-  1) Thought: <one short sentence>
+  1) Thought: <one short sentence> (do not include the literal word "Thought:" again inside this sentence)
   2) Action: <one of [list_issue_types, list_issues, list_sub_issues, search_issues]>
   3) Action Input: <a single-line JSON object with only the schema's keys/values>
   4) Observation: <leave blank – this will be filled by the system>
@@ -26,32 +31,29 @@
 - The JSON after "Action Input:" MUST be valid and single-line. No trailing commas, no extra closing braces.
 - Use ONLY properties defined in the tool schema (required + optional). Exact key names and value types.
 - Use only one tool per call.
+- Always copy owner/organization names, repository names, and issue numbers exactly as provided by the user or upstream context. Do not truncate, split, normalize, or otherwise modify these identifiers. Example: for "github/github-mcp-server" you must pass `"owner": "github", "repo": "github-mcp-server"`.
+- When a tool call succeeds, do not immediately call another tool just to reformat or summarize the same results. Instead, work with the observation you have unless additional data is explicitly required.
 
 CORRECT EXAMPLE
 Thought: The user provided owner and repo; list_issues fits.
 Action: list_issues
 Action Input: {"owner":"kagenti","repo":"kagenti"}
 Observation:
 
-INCORRECT EXAMPLES (do NOT do these)
-- <tool_call>{"name":"list_issues",...}</tool_call>
-- Action: {"name":"list_issues","arguments":{...}}
-- Action Input:
-  {
-    "owner":"kagenti",
-    "repo":"kagenti",
-  }
-- Action: list_issues
-  Action Input: {"owner":"kagenti","repo":"kagenti"}}
-
 ────────────────────────────────────────────────────────
 🧩 FINAL ANSWER PHASE
 
 After tool results arrive:
-- Produce a human-readable answer grounded only in the tool output.
+- You may receive a lot of data from the tool call
+- Synthesize the returned data to produce a human-readable answer grounded only in the tool output.
+- Summarize or aggregate long lists instead of echoing raw JSON. Provide counts or grouped highlights when appropriate.
 - Clearly cite or reference the tool results.
 - If a tool failed or inputs were missing, say so explicitly. Don't attempt to guess the answer.
 
+- After the Observation is provided by the system, output:
+  Thought: I now know the final answer
+  Final Answer: <answer grounded ONLY in the tool output>
+
 ────────────────────────────────────────────────────────
 TOOL SELECTION GUIDELINES
 
@@ -60,19 +62,19 @@
 - Respect each tool’s required and optional parameters; format them exactly as expected.
 - Use only one tool call at a time.
 
-Here are some additional descriptions of the tools you will be provided, along with guidance on how to choose teh right one.
+Here are some additional descriptions of the tools you will be provided, along with guidance on how to choose the right one.
 
 **Search Issues:** Use this tool to find issues when you do not have a repository name. Optionally scope by owner or repo if provided.
 **List Issue Types:** Use only to enumerate available issue types for a specific organization.
-**List Issues:** Use only when both repository owner AND exact repository name are provided. Do not use unless you have both pieces of information. Optional filters: state, label, date, etc.
+**List Issues:** Use only when both repository owner AND exact repository name are provided. Do not use unless you have both pieces of information. Optional filters, if the user's query indicates their need: state, label, date, etc.
 **List Sub-Issues:** Use only when owner, repo, and issue number are all given.
 
-
 Decision rules:
 - Prefer search when the user’s scope is broad or unspecified, or you don't have a repository name.
 - Always use list-style tools when the query provides a repo name or issue number.
 - Never infer missing identifiers.
 - Never call a tool when you do not have all the required parameters.
+- When owner/repo/issue identifiers are provided (either directly or via context variables), reuse them verbatim; never replace them with partial segments or assumed values.
 
 Examples:
 - “Open issues in `kagenti/agent-examples`” → list issues
@@ -81,9 +83,7 @@
 - “Sub-issues under #134 in `openai/triton`” → list sub-issues
 - "What issues are assigned to joe123?" → search issues
 
-TOOL USE RULES
-- Use only the tools provided here.
-- Cite tool outputs or provided context; do not add outside knowledge.
+Carefully inspect the user's request to see how, besides owner/repo/issue that they would like to filter their results. Such as, label names, date ranges, keywords, state, etc. Use the appropriate filters available in the tool where required.
 """
 
 INFO_PARSER_PROMPT = """
@@ -92,10 +92,16 @@
 - Github repository
 - Issue number(s)
 
+Extraction Rules:
+- Copy owner/organization names, repository names, and issue identifiers exactly as the user typed them. Preserve casing, punctuation, spacing, diacritics, and hyphenation; never rewrite, normalize, or translate these strings.
+- Only return values that are explicitly present in the user request. If any item is missing, output None for that field.
+- Do not infer or guess missing identifiers. If you are unsure about any value, leave it as None.
+
 Examples:
 - "summarize open issues across the foo organization" → Owner: foo, Repo: None, Issues: None
 - "kagenti/agent-examples" → Owner: kagenti, Repo: agent-examples, Issues: None
 - "foo in the bar organization" → Owner: bar, Repo: foo, Issues: None
 - "Search across all of github/github-mcp-server for open issues with bug" → Owner: github, Repo: github-mcp-server, Issues: None
 - "How long has issue 2 in modelcontextprotocol/servers been open?"  → Owner: modelcontextprotocol, Repo: servers, Issues: [2]
+- "Review issue 87 for CoolOrg/Next-Gen-Repo" → Owner: CoolOrg, Repo: Next-Gen-Repo, Issues: [87]
 """