iris-chatbot 0.2.5 → 2.0.0

package/template/src/lib/memory.ts

@@ -340,6 +340,123 @@ function extractAutoCandidates(params: {
     }
   }
 
+  const calendarPatterns: RegExp[] = [
+    /\buse\s+(?:the\s+)?([a-zA-Z0-9_\s-]+?)\s*(?:calendar)?\s*[.!?]?\s*$/i,
+    /\b(?:default\s+)?calendar\s+is\s+([a-zA-Z0-9_\s-]+)/i,
+    /\balways\s+use\s+([a-zA-Z0-9_\s-]+)\s+for\s+calendar/i,
+  ];
+  for (const pattern of calendarPatterns) {
+    const m = text.match(pattern);
+    if (m?.[1]) {
+      const value = trimSentence(m[1]);
+      if (value.length >= 1 && value.length <= 80) {
+        const candidate = createCandidate({
+          kind: "preference",
+          scope,
+          conversationId,
+          key: "default calendar",
+          value,
+          source: "auto",
+          confidence: 0.75,
+        });
+        if (candidate) {
+          candidates.push(candidate);
+        }
+        break;
+      }
+    }
+  }
+
+  const timezonePatterns: RegExp[] = [
+    /\btime\s*zone\s+is\s+([a-zA-Z\s]+?)(?:\s+time)?[.!?]?\s*$/i,
+    /\btimezone\s+is\s+([a-zA-Z\s]+?)(?:\s+time)?[.!?]?\s*$/i,
+    /\bI'?m\s+in\s+([a-zA-Z\s]+?)(?:\s+time)?[.!?]?\s*$/i,
+    /\buse\s+([a-zA-Z\s]+?)\s+time[.!?]?\s*$/i,
+  ];
+  for (const pattern of timezonePatterns) {
+    const m = text.match(pattern);
+    if (m?.[1]) {
+      const value = trimSentence(m[1]);
+      if (value.length >= 2 && value.length <= 60) {
+        const candidate = createCandidate({
+          kind: "preference",
+          scope,
+          conversationId,
+          key: "timezone",
+          value,
+          source: "auto",
+          confidence: 0.75,
+        });
+        if (candidate) {
+          candidates.push(candidate);
+        }
+        break;
+      }
+    }
+  }
+
+  return candidates;
+}
+
+const CALENDAR_QUESTION_PATTERN = /\b(which|what)\s+calendar\b|calendar\s+(?:should|to)\s+use|which\s+calendar\s+should/i;
+const TIMEZONE_QUESTION_PATTERN = /\b(which|what)\s+time\s*zone|timezone|time\s+zone\s+should|which\s+timezone/i;
+
+function extractContextAwareCandidates(params: {
+  text: string;
+  lastAssistantMessageContent: string;
+  scope: MemoryScope;
+  conversationId: string;
+}): CapturedMemoryCandidate[] {
+  const { text, lastAssistantMessageContent, scope, conversationId } = params;
+  const trimmed = trimSentence(text);
+  if (!trimmed || trimmed.length > 120) {
+    return [];
+  }
+  const last = lastAssistantMessageContent.trim();
+  if (!last) {
+    return [];
+  }
+  const candidates: CapturedMemoryCandidate[] = [];
+
+  const isCalendarQuestion = CALENDAR_QUESTION_PATTERN.test(last);
+  const isTimezoneQuestion = TIMEZONE_QUESTION_PATTERN.test(last);
+
+  if (isCalendarQuestion && !isTimezoneQuestion) {
+    const value = trimmed.split(/[.!?\n]/)[0]?.trim() ?? trimmed;
+    if (value.length >= 1 && value.length <= 80) {
+      const candidate = createCandidate({
+        kind: "preference",
+        scope,
+        conversationId,
+        key: "default calendar",
+        value,
+        source: "auto",
+        confidence: 0.7,
+      });
+      if (candidate) {
+        candidates.push(candidate);
+      }
+    }
+  }
+
+  if (isTimezoneQuestion) {
+    const value = trimmed.split(/[.!?\n]/)[0]?.trim() ?? trimmed;
+    if (value.length >= 2 && value.length <= 60) {
+      const candidate = createCandidate({
+        kind: "preference",
+        scope,
+        conversationId,
+        key: "timezone",
+        value,
+        source: "auto",
+        confidence: 0.7,
+      });
+      if (candidate) {
+        candidates.push(candidate);
+      }
+    }
+  }
+
   return candidates;
 }
 
@@ -422,6 +539,7 @@ export async function captureMemoriesFromUserTurn(params: {
   text: string;
   conversationId: string;
   settingsMemory?: MemorySettings | null;
+  lastAssistantMessageContent?: string;
 }): Promise<void> {
   const rawText = params.text?.trim();
   if (!rawText) {
@@ -449,8 +567,21 @@ export async function captureMemoriesFromUserTurn(params: {
         scope,
         conversationId: params.conversationId,
       });
-
-  const candidates = dedupeCandidates([...explicitCandidates, ...autoCandidates]);
+  const contextAwareCandidates =
+    params.lastAssistantMessageContent != null && params.lastAssistantMessageContent.trim() !== ""
+      ? extractContextAwareCandidates({
+          text: rawText,
+          lastAssistantMessageContent: params.lastAssistantMessageContent,
+          scope,
+          conversationId: params.conversationId,
+        })
+      : [];
+
+  const candidates = dedupeCandidates([
+    ...explicitCandidates,
+    ...autoCandidates,
+    ...contextAwareCandidates,
+  ]);
   if (candidates.length === 0) {
     return;
   }

package/template/src/lib/tooling/tools/music.ts

@@ -247,7 +247,7 @@ function rankPlaylistCandidates(params: {
     const rawScore = textMatchScore(candidate.name, cleanedRaw);
     const exactBonus =
       normalizeLoose(candidate.name) === normalizeLoose(cleanedQuery) ||
-      normalizeLoose(candidate.name) === normalizeLoose(cleanedRaw)
+        normalizeLoose(candidate.name) === normalizeLoose(cleanedRaw)
         ? 30
         : 0;
     const playlistBonus = params.playlistRequested ? 20 : 0;
@@ -668,7 +668,9 @@ async function runMusicPlay(input: unknown, context: ToolExecutionContext) {
     title,
     artist,
   });
+  console.log("[music_play] Search queries:", searchQueries, "title:", title, "artist:", artist, "query:", query);
   const primaryLibraryCandidates = await searchLibraryTracks(searchQueries, context.signal);
+  console.log("[music_play] Primary candidates found:", primaryLibraryCandidates.length);
   let libraryCandidates = primaryLibraryCandidates;
   if (libraryCandidates.length === 0 || enforceTitleMatch || enforceArtistMatch) {
     try {
@@ -928,13 +930,22 @@ async function runMusicNowPlaying(_: unknown, context: ToolExecutionContext) {
 export const musicTools: ToolDefinition[] = [
   {
     name: "music_play",
-    description: "Play Apple Music or resume playback.",
+    description: "Play a song, album, or playlist from Apple Music. Use 'query' for general searches like song names, artist names, or any combination.",
     inputSchema: {
       type: "object",
       properties: {
-        query: { type: "string" },
-        title: { type: "string" },
-        artist: { type: "string" },
+        query: {
+          type: "string",
+          description: "The search query - can be a song name, artist name, album, or combination like 'song by artist'. This is the primary search parameter."
+        },
+        title: {
+          type: "string",
+          description: "Optional: specific track name if known exactly"
+        },
+        artist: {
+          type: "string",
+          description: "Optional: artist name to filter results"
+        },
         source: { type: "string", enum: ["apple_music", "local_library"] },
       },
       additionalProperties: false,