@mgsoftwarebv/mcp-server-bridge 2.20.0 → 2.20.2

package/dist/index.js

@@ -207,7 +207,7 @@ var TOOLS = [
         priority: { type: "string", enum: ["low", "medium", "high", "critical"] },
         projectId: { type: "string" },
         customerId: { type: "string" },
-        q: { type: "string", description: "Search query for title or description" },
+        q: { type: "string", description: "Search query for ticket number, title, or description" },
         pageSize: { type: "number", default: 20, maximum: 100 }
       },
       required: []
@@ -647,7 +647,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
         if (priority) query = query.eq("priority", priority);
         if (projectId) query = query.eq("project_id", projectId);
         if (customerId) query = query.eq("customer_id", customerId);
-        if (q) query = query.or(`title.ilike.%${q}%,description.ilike.%${q}%`);
+        if (q) query = query.or(`ticket_number.ilike.%${q}%,title.ilike.%${q}%,description.ilike.%${q}%`);
         const { data, error } = await query.order("created_at", { ascending: false });
         if (error) throw error;
         return {
@@ -807,10 +807,48 @@ ${attachments && attachments.length > 0 ? `
       case "create-ticket": {
         const { title, description, status = "open", priority = "medium", type = "task", projectId, customerId } = args2;
         const year = (/* @__PURE__ */ new Date()).getFullYear();
-        const { count } = await supabase.from("tickets").select("*", { count: "exact", head: true }).eq("team_id", authContext.teamId);
-        const ticketNumber = `${year}-${String((count || 0) + 1).padStart(3, "0")}`;
+        let resolvedTeamId = authContext.teamId;
+        let resolvedCustomerId = customerId;
+        let projectAbbreviation = "";
+        if (projectId) {
+          const { data: project } = await supabase.from("projects").select("name, team_id, customer_id").eq("id", projectId).single();
+          if (project) {
+            if (project.team_id) {
+              resolvedTeamId = project.team_id;
+            }
+            if (!resolvedCustomerId && project.customer_id) {
+              resolvedCustomerId = project.customer_id;
+            }
+            if (project.name) {
+              const name2 = project.name.toUpperCase().replace(/[^A-Z0-9\s]/g, "");
+              const words = name2.split(/\s+/).filter(Boolean);
+              if (words.length >= 2) {
+                projectAbbreviation = words.slice(0, 2).map((w) => w.substring(0, 3)).join("").substring(0, 5);
+              } else if (words.length === 1 && words[0]) {
+                projectAbbreviation = words[0].substring(0, 5);
+              }
+            }
+          }
+        }
+        let ticketNumber;
+        if (projectId && projectAbbreviation) {
+          const pattern = `${year}-${projectAbbreviation}-%`;
+          const { data: existingTickets } = await supabase.from("tickets").select("ticket_number").eq("project_id", projectId).like("ticket_number", pattern).order("ticket_number", { ascending: false }).limit(1);
+          let nextSequence = 1;
+          if (existingTickets && existingTickets.length > 0 && existingTickets[0]?.ticket_number) {
+            const parts = existingTickets[0].ticket_number.split("-");
+            if (parts.length === 3) {
+              const lastSeq = parseInt(parts[2], 10);
+              if (!isNaN(lastSeq)) nextSequence = lastSeq + 1;
+            }
+          }
+          ticketNumber = `${year}-${projectAbbreviation}-${String(nextSequence).padStart(3, "0")}`;
+        } else {
+          const { count } = await supabase.from("tickets").select("*", { count: "exact", head: true }).eq("team_id", resolvedTeamId);
+          ticketNumber = `${year}-${String((count || 0) + 1).padStart(3, "0")}`;
+        }
         const { data, error } = await supabase.from("tickets").insert({
-          team_id: authContext.teamId,
+          team_id: resolvedTeamId,
           ticket_number: ticketNumber,
           title,
           description,
@@ -818,7 +856,7 @@ ${attachments && attachments.length > 0 ? `
           priority,
           type,
           project_id: projectId || null,
-          customer_id: customerId || null,
+          customer_id: resolvedCustomerId || null,
           requester_id: authContext.userId
         }).select().single();
         if (error) throw error;
@@ -1092,10 +1130,21 @@ ${cursorSessionId ? `\u{1F517} Cursor Session: ${cursorSessionId}
           efficiency_score: currentEfficiency.toFixed(2),
           actual_time_minutes: totalMinutesElapsed
         }).eq("id", session.id);
-        const { data: existingEntry, error: entryError } = await supabase.from("agenda_events").select("id, tracked_duration, title, description, start_time").eq("ai_session_id", session.id).eq("status", "draft").single();
+        const { data: existingEntries, error: entryError } = await supabase.from("agenda_events").select("id, tracked_duration, title, description, start_time").eq("ai_session_id", session.id).eq("status", "draft").order("created_at", { ascending: false });
         let trackerAction = "";
         let trackerDetails = "";
-        if (existingEntry && !entryError) {
+        const existingEntry = existingEntries && existingEntries.length > 0 ? existingEntries[0] : null;
+        if (existingEntries && existingEntries.length > 1) {
+          const totalExistingDuration = existingEntries.reduce((sum, entry) => sum + (entry.tracked_duration || 0), 0);
+          const duplicateIds = existingEntries.slice(1).map((e) => e.id);
+          await supabase.from("agenda_events").delete().in("id", duplicateIds);
+          if (totalExistingDuration > (existingEntry?.tracked_duration || 0)) {
+            await supabase.from("agenda_events").update({ tracked_duration: totalExistingDuration }).eq("id", existingEntry.id);
+            existingEntry.tracked_duration = totalExistingDuration;
+          }
+          trackerAction = `Consolidated ${existingEntries.length} duplicate entries`;
+        }
+        if (existingEntry) {
           const newDuration = (existingEntry.tracked_duration || 0) + roundedFollowUpMinutes * 60;
           await supabase.from("agenda_events").update({
             tracked_duration: newDuration,
@@ -1103,7 +1152,7 @@ ${cursorSessionId ? `\u{1F517} Cursor Session: ${cursorSessionId}
             title: workDescription,
             description: workDescription
           }).eq("id", existingEntry.id);
-          trackerAction = "Updated existing tracker";
+          trackerAction = trackerAction || "Updated existing tracker";
           trackerDetails = `   \u2022 Total tracked time: ${Math.round(newDuration / 60)} minutes (+${roundedFollowUpMinutes} min)
    \u2022 Description: ${workDescription}
 `;
@@ -1526,10 +1575,17 @@ ${workDescription}`;
         const estimatedMinutes = session.ai_time_estimate_minutes || timeSpentMinutes;
         const sessionStart = new Date(session.created_at);
         const estimatedEnd = new Date(sessionStart.getTime() + estimatedMinutes * 6e4);
-        const { data: existingAgendaEntry } = await supabase.from("agenda_events").select("id, tracked_duration").eq("ai_session_id", session.id).eq("status", "draft").single();
+        const { data: existingAgendaEntries } = await supabase.from("agenda_events").select("id, tracked_duration").eq("ai_session_id", session.id).eq("status", "draft").order("created_at", { ascending: false });
         let agendaEvent = null;
         let agendaError = null;
         let wasUpdated = false;
+        let consolidatedCount = 0;
+        const existingAgendaEntry = existingAgendaEntries && existingAgendaEntries.length > 0 ? existingAgendaEntries[0] : null;
+        if (existingAgendaEntries && existingAgendaEntries.length > 1) {
+          const duplicateIds = existingAgendaEntries.slice(1).map((e) => e.id);
+          await supabase.from("agenda_events").delete().in("id", duplicateIds);
+          consolidatedCount = existingAgendaEntries.length - 1;
+        }
         if (existingAgendaEntry) {
           const { data: updated, error: updateError } = await supabase.from("agenda_events").update({
             title: ticketInfo?.title || "Development Work",
@@ -1569,6 +1625,9 @@ ${workDescription}`;
         if (agendaError) {
           console.error(`\u26A0\uFE0F Failed to ${wasUpdated ? "update" : "create"} agenda event:`, agendaError);
         }
+        if (consolidatedCount > 0) {
+          console.log(`\u{1F9F9} Cleaned up ${consolidatedCount} duplicate agenda entries for session ${aiSessionId}`);
+        }
         let responseText = `\u{1F389} **AI Session Completed Successfully!**
 
 `;
@@ -1689,29 +1748,77 @@ ${efficiencyNotes}
         }
         const durationSeconds = Math.round(estimatedHours * 3600);
         const now = /* @__PURE__ */ new Date();
-        const startTime = new Date(now.getTime() - durationSeconds * 1e3);
-        const { data: agendaEntry, error: agendaError } = await supabase.from("agenda_events").insert({
-          team_id: authContext.teamId,
-          user_id: authContext.userId,
-          project_id: project?.id || null,
-          ticket_id: ticket?.id || null,
-          ai_session_id: aiSession?.id || null,
-          title: workDescription,
-          description: chatContextSummary || workDescription,
-          start_time: startTime.toISOString(),
-          end_time: now.toISOString(),
-          type: "work",
-          status: "draft",
-          all_day: false,
-          is_tracked: true,
-          tracked_duration: durationSeconds
-        }).select("id, tracked_duration, project_id, ticket_id, ai_session_id").single();
+        let agendaEntry = null;
+        let agendaError = null;
+        let wasUpdated = false;
+        let consolidatedCount = 0;
+        if (aiSession?.id || ticket?.id) {
+          let query = supabase.from("agenda_events").select("id, tracked_duration, project_id, ticket_id, ai_session_id").eq("status", "draft").eq("user_id", authContext.userId).order("created_at", { ascending: false });
+          if (aiSession?.id) {
+            query = query.eq("ai_session_id", aiSession.id);
+          } else if (ticket?.id) {
+            query = query.eq("ticket_id", ticket.id);
+          }
+          const { data: existingEntries } = await query;
+          if (existingEntries && existingEntries.length > 0) {
+            const existingEntry = existingEntries[0];
+            if (existingEntries.length > 1) {
+              const duplicateIds = existingEntries.slice(1).map((e) => e.id);
+              await supabase.from("agenda_events").delete().in("id", duplicateIds);
+              consolidatedCount = existingEntries.length - 1;
+            }
+            const newDuration = (existingEntry.tracked_duration || 0) + durationSeconds;
+            const { data: updated, error: updateError } = await supabase.from("agenda_events").update({
+              tracked_duration: newDuration,
+              end_time: now.toISOString(),
+              title: workDescription,
+              description: chatContextSummary || workDescription,
+              project_id: project?.id || existingEntry.project_id
+            }).eq("id", existingEntry.id).select("id, tracked_duration, project_id, ticket_id, ai_session_id").single();
+            agendaEntry = updated;
+            agendaError = updateError;
+            wasUpdated = true;
+          }
+        }
+        if (!agendaEntry) {
+          const startTime = new Date(now.getTime() - durationSeconds * 1e3);
+          const { data: created, error: createError } = await supabase.from("agenda_events").insert({
+            team_id: authContext.teamId,
+            user_id: authContext.userId,
+            project_id: project?.id || null,
+            ticket_id: ticket?.id || null,
+            ai_session_id: aiSession?.id || null,
+            title: workDescription,
+            description: chatContextSummary || workDescription,
+            start_time: startTime.toISOString(),
+            end_time: now.toISOString(),
+            type: "work",
+            status: "draft",
+            all_day: false,
+            is_tracked: true,
+            tracked_duration: durationSeconds
+          }).select("id, tracked_duration, project_id, ticket_id, ai_session_id").single();
+          agendaEntry = created;
+          agendaError = createError;
+        }
         if (agendaError || !agendaEntry) {
-          throw new Error(`Failed to create time entry: ${agendaError?.message || "Unknown error"}`);
+          throw new Error(`Failed to ${wasUpdated ? "update" : "create"} time entry: ${agendaError?.message || "Unknown error"}`);
+        }
+        let responseText = `\u23F1\uFE0F **Hours ${wasUpdated ? "Added to Existing Entry" : "Logged Successfully"}!**
+
+`;
+        if (wasUpdated) {
+          responseText += `\u{1F504} **Updated existing draft entry** (avoiding duplicates)
+`;
+          responseText += `   \u2022 New total: ${Math.round((agendaEntry.tracked_duration || 0) / 3600 * 10) / 10}h
+
+`;
         }
-        let responseText = `\u23F1\uFE0F **Hours Logged Successfully!**
+        if (consolidatedCount > 0) {
+          responseText += `\u{1F9F9} **Cleaned up ${consolidatedCount} duplicate entries**
 
 `;
+        }
         responseText += `\u{1F4CB} **Entry Details:**
 `;
         if (project) {
@@ -1731,7 +1838,7 @@ ${efficiencyNotes}
         }
         responseText += `   \u2022 Description: ${workDescription}
 `;
-        responseText += `   \u2022 Estimated Hours: ${estimatedHours}h (${Math.floor(estimatedHours)}h ${Math.round(estimatedHours % 1 * 60)}m)
+        responseText += `   \u2022 ${wasUpdated ? "Added" : "Estimated"} Hours: ${estimatedHours}h (${Math.floor(estimatedHours)}h ${Math.round(estimatedHours % 1 * 60)}m)
 `;
         responseText += `   \u2022 Status: DRAFT (not billed yet)
 `;
@@ -1745,7 +1852,7 @@ ${efficiencyNotes}
 
 `;
         }
-        responseText += `\u2705 Time entry created and ready for review in the agenda!`;
+        responseText += `\u2705 Time entry ${wasUpdated ? "updated" : "created"} and ready for review in the agenda!`;
         return {
           content: [{
             type: "text",