Merge pull request #30 from Avivbens/fix/jira-master-fixes

Author: Avivbens

projects/packages/jira-master/info.plist

@@ -483,7 +483,7 @@ https://github.com/Avivbens/alfredo</string>
       </dict>
     </array>
     <key>version</key>
-    <string>1.0.0</string>
+    <string>1.1.0</string>
     <key>webaddress</key>
     <string>https://github.com/Avivbens/alfredo</string>
   </dict>

projects/packages/jira-master/src/common/prompts/extract-ticket.prompt.ts

@@ -6,10 +6,13 @@ export const EXTRACT_TICKET_SYSTEM_PROMPT = (useTitleFormat: boolean) =>
     pipelinePrompts: [TITLE_FORMAT_SYSTEM_PROMPT_PARAM],
     finalPrompt:
       PromptTemplate.fromTemplate(`You are an AI assistant that extracts structured Jira ticket information from Slack threads, issue descriptions, or any text input.
+Your task is to analyze the provided text and generate a list of tickets.
+When multiple distinct issues or tasks are mentioned, create separate tickets for each.
+When details span a single cohesive issue, keep them in one ticket.
 
 Current date: {currentDate}
 
-Your task is to analyze the provided text and extract:
+For each ticket, extract:
 1. **Title**: A concise, one-liner summary that captures the essence of the issue
 2. **Description**: A concise, to-the-point description of the issue
 3. **Story Points**: An estimate of the work effort (use Fibonacci scale: 1, 2, 3, 5, 8, 13, or null if uncertain)
@@ -25,6 +28,8 @@ Guidelines:
 - For story points, consider complexity and effort. Use null if the work scope is unclear
 - For issue type: Story = new functionality, Task = work to do, Bug = something broken, Epic = large initiative
 - For priority, base it on urgency keywords in the text, or use null if not mentioned
+- When multiple issues are mentioned, associate details (description, priority, story points) with the correct ticket
+- Your response must be ONLY the list of tickets
 
 ${useTitleFormat ? '{TITLE_FORMAT_SYSTEM_PROMPT}' : ''}
 
@@ -33,7 +38,7 @@ Extract structured information accurately and thoughtfully.`),
 
 export const EXTRACT_TICKET_USER_PROMPT = new PromptTemplate({
   inputVariables: ['userInput'],
-  template: `Extract a Jira ticket from the following text:
+  template: `Extract Jira tickets from the following text:
 
 {userInput}`,
 });

projects/packages/jira-master/src/main/extract-jira-ticket.ts

@@ -44,27 +44,37 @@ import { extractTicket } from '../services/ticket-extractor.service';
 
     await setTimeout(debounceTime);
 
-    const ticket = await extractTicket(llmToken, selectedModel, alfredClient.input, titleExample);
+    const { tickets } = await extractTicket(llmToken, selectedModel, alfredClient.input, titleExample);
 
-    const storyPointsText =
-      ticket.storyPoints !== null && ticket.storyPoints !== undefined ? ` • ${ticket.storyPoints} points` : '';
+    if (!tickets.length) {
+      alfredClient.output({
+        items: [
+          {
+            title: 'No tickets found',
+            subtitle: 'Could not extract ticket information. Try rephrasing or providing more details.',
+            valid: false,
+          },
+        ],
+      });
+      return;
+    }
 
-    const priorityText = ticket.priority ? ` • ${ticket.priority}` : '';
-    const subtitle = `${ticket.title} | ${ticket.issueType}${storyPointsText}${priorityText} | Press Enter to create`;
+    const items = tickets.map((ticket, index) => {
+      const storyPointsText =
+        ticket.storyPoints !== null && ticket.storyPoints !== undefined ? ` • ${ticket.storyPoints} points` : '';
 
-    alfredClient.output({
-      items: [
-        {
-          title: ticket.title,
-          subtitle,
-          arg: JSON.stringify(ticket),
-          valid: true,
-          text: {
-            largetype: `Title: ${ticket.title}\n\nType: ${ticket.issueType}\nStory Points: ${ticket.storyPoints || 'N/A'}\nPriority: ${ticket.priority || 'N/A'}\n\nDescription:\n${ticket.description}`,
-          },
-        },
-      ],
+      const priorityText = ticket.priority ? ` • ${ticket.priority}` : '';
+      const subtitle = `${ticket.issueType}${storyPointsText}${priorityText} | Press Enter to create`;
+
+      return {
+        title: ticket.title,
+        subtitle,
+        arg: JSON.stringify(ticket),
+        valid: true,
+      };
     });
+
+    alfredClient.output({ items });
   } catch (error) {
     alfredClient.error(error);
   }

projects/packages/jira-master/src/models/jira-ticket.model.ts

@@ -41,4 +41,16 @@ export const GeminiJiraTicketSchema = z.object({
   priority: priority.optional(),
 });
 
+// Array wrapper schemas for multiple ticket extraction
+export const OpenAIJiraTicketsSchema = z.object({
+  tickets: z.array(JiraTicketSchema),
+});
+
+export const GeminiJiraTicketsSchema = z.object({
+  tickets: z.array(GeminiJiraTicketSchema),
+});
+
 export type JiraTicket = z.infer<typeof JiraTicketSchema>;
+export type JiraTickets = {
+  tickets: JiraTicket[];
+};

projects/packages/jira-master/src/services/ticket-extractor.service.ts

@@ -1,13 +1,13 @@
 import { type AvailableModels, callModelWithStructuredResponse } from '@alfredo/llm';
 import { EXTRACT_TICKET_SYSTEM_PROMPT, EXTRACT_TICKET_USER_PROMPT } from '../common/prompts/extract-ticket.prompt';
-import { GeminiJiraTicketSchema, type JiraTicket, JiraTicketSchema } from '../models/jira-ticket.model';
+import { GeminiJiraTicketsSchema, type JiraTickets, OpenAIJiraTicketsSchema } from '../models/jira-ticket.model';
 
 export async function extractTicket(
   token: string,
   model: AvailableModels,
   input: string,
   titleExample?: string,
-): Promise<JiraTicket> {
+): Promise<JiraTickets> {
   const currentDate = new Date().toISOString().split('T')[0];
   const useTitleFormat = Boolean(titleExample);
   const system = await EXTRACT_TICKET_SYSTEM_PROMPT(useTitleFormat).format({
@@ -21,16 +21,16 @@ export async function extractTicket(
 
   // Select appropriate schema based on model
   const isGemini = model.toLowerCase().includes('gemini');
-  const schema = isGemini ? GeminiJiraTicketSchema : JiraTicketSchema;
+  const schema = isGemini ? GeminiJiraTicketsSchema : OpenAIJiraTicketsSchema;
 
   const result = await callModelWithStructuredResponse(token, model, { system, user }, schema);
 
   // Normalize the result to ensure consistent types (convert undefined to null)
-  const ticket: JiraTicket = {
-    ...result,
-    storyPoints: result.storyPoints ?? null,
-    priority: result.priority ?? null,
-  };
+  const normalizedTickets = result.tickets.map((ticket) => ({
+    ...ticket,
+    storyPoints: ticket.storyPoints ?? null,
+    priority: ticket.priority ?? null,
+  }));
 
-  return ticket;
+  return { tickets: normalizedTickets };
 }