iris-chatbot 5.0.3 → 5.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iris-chatbot",
-  "version": "5.0.3",
+  "version": "5.1.0",
   "private": false,
   "description": "One-command installer for the Iris project template.",
   "bin": {

package/template/next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
+import "./.next/dev/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

package/template/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "iris",
-  "version": "5.0.3",
+  "version": "5.1.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "iris",
-      "version": "5.0.3",
+      "version": "5.1.0",
       "dependencies": {
         "@anthropic-ai/sdk": "^0.72.1",
         "clsx": "^2.1.1",

package/template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iris",
-  "version": "5.0.3",
+  "version": "5.1.0",
   "private": true,
   "description": "One-command installer for the Iris project template.",
   "engines": {

package/template/src/app/api/chat/route.ts

@@ -41,7 +41,7 @@ const LOCAL_TOOL_SYSTEM_INSTRUCTIONS = [
   "You can access the user's local computer through provided tools.",
   "When the user asks for file, app, notes, music, web, calendar, or system actions, call tools directly.",
   "Default to execution instead of clarification. Ask at most one question only when a truly required value is missing.",
-  "Calendar: You have direct access to the user's Apple Calendar via calendar_list_events and related tools. You CAN see their events—call the tools; do not say you cannot access or see their calendar. Never ask the user to paste their calendar, export it, or send a screenshot; you already have access. When they ask what's on the calendar, what's happening this/next weekend/month, or say 'check' or 'you can see', call calendar_list_events immediately with from/to for the range (e.g. next month → from: 'today', to: 'end of next month'; specific day → YYYY-MM-DD for both). Always pass calendar: 'all'. from/to support 'today', 'tomorrow', 'next week', 'end of next week', 'next month', 'end of next month'. Report the exact queried range from the tool result. For move/delete/reschedule: call calendar_list_events first to get uids. For rescheduling to a new time on the same calendar use calendar_update_event (preserves recurrence); for delete use calendar_delete_event; use calendar_move_event only when update is not sufficient (e.g. user says move and you need delete+recreate).",
+  "Calendar: You have direct access to the user's Apple Calendar via calendar_list_events and related tools. You CAN see their events—call the tools; do not say you cannot access or see their calendar. Never ask the user to paste their calendar, export it, or send a screenshot; you already have access. When they ask what's on the calendar, what's happening this/next weekend/month, or say 'check' or 'you can see', call calendar_list_events immediately with from/to for the range (e.g. next month → from: 'today', to: 'end of next month'; specific day → YYYY-MM-DD for both). Always pass calendar: 'all'. from/to support 'today', 'tomorrow', 'next week', 'end of next week', 'next month', 'end of next month'. Report the exact queried range from the tool result. For move/delete/reschedule: call calendar_list_events first to get uids. For rescheduling to a new time on the same calendar use calendar_update_event (preserves recurrence); for delete use calendar_delete_event; use calendar_move_event only when update is not sufficient (e.g. user says move and you need delete+recreate). When the user says to add or put something on their calendar (e.g. 'Add 1:1 with Alex for Thursday at 9am to my calendar', 'Put team standup on Friday at 10', 'Schedule meeting with John next Monday at 2pm'), use calendar_create_event with title = only the event name (e.g. '1:1 with Alex', 'team standup', 'meeting with John') and start = the date/time phrase (e.g. 'Thursday at 9am', 'Friday at 10', 'next Monday at 2pm'). Do not put the date/time in the title.",
   "Files and Folders: You HAVE direct access to the user's files via file_list and file_find. Never say you cannot see, access, or list their files—call the tools. When the user asks 'what files do I have,' 'files from the last 7 days,' 'recent files,' or similar: call file_list immediately with path set to a folder (e.g. ~/Downloads, ~/Desktop, ~/Documents—or call once per root if you want all) and modifiedInLastDays: 7 (or the number of days they said). You have full file system access via file_list, file_mkdir, file_move, file_copy, file_delete_to_trash, file_batch_move, and file_find. When the user gives a folder or file name (e.g. 'us debt clock'), use file_find with searchPath '~' and the name as given. When moving MULTIPLE files, use file_batch_move with { operations: [ ... ] } or { destination, sources }. For organizing: file_find if location unknown, then file_list (use modifiedInLastDays for 'recent'), then file_mkdir/file_batch_move as needed. Never refuse file tasks or ask the user to use Finder manually—you have the tools.",
   "For iMessage/text requests, use messages_send; if contact matching is ambiguous, ask one concise clarification with candidate names.",
   "For media requests, assume Apple Music unless the user specifies otherwise.",
@@ -69,7 +69,7 @@ const TOOL_INTENT_NOTES_PATTERN =
 const TOOL_INTENT_MUSIC_PATTERN =
   /\b(music|song|track|album|playlist|apple music)\b[\s\S]{0,80}\b(play|pause|resume|skip|next|previous|volume|set|stop)\b|\b(play|pause|resume|skip|next|previous|volume|set|stop)\b[\s\S]{0,80}\b(music|song|track|album|playlist|apple music)\b/i;
 const TOOL_INTENT_SCHEDULE_PATTERN =
-  /\b(calendar|event|reminder|schedule|events)\b[\s\S]{0,80}\b(create|add|list|show|set|remind|schedule|move|change|delete|reschedule|update|cancel|have|get|check)\b|\b(create|add|list|show|set|remind|schedule|move|change|delete|reschedule|update|cancel|have|get|check)\b[\s\S]{0,80}\b(calendar|event|reminder|schedule|events)\b|\b(move|reschedule|change|delete)\b[\s\S]{0,80}\b(event|meeting|appointment)\b|\b(what's happening|whats happening|what's on|whats on|next weekend|this weekend|you can see|just check)\b/i;
+  /\b(calendar|event|reminder|schedule|events|meeting|appointment|1:1|one-on-one)\b[\s\S]{0,120}\b(create|add|list|show|set|remind|schedule|move|change|delete|reschedule|update|cancel|have|get|check|put)\b|\b(create|add|list|show|set|remind|schedule|move|change|delete|reschedule|update|cancel|have|get|check|put)\b[\s\S]{0,120}\b(calendar|event|reminder|schedule|events|meeting|appointment|1:1|one-on-one)\b|\b(add|put|create|schedule)\b[\s\S]{0,100}\b(to my calendar|on my calendar|to the calendar|for (?:this |next )?(?:mon|tue|wed|thu|fri|sat|sun|monday|tuesday|wednesday|thursday|friday|saturday|sunday))\b|\b(move|reschedule|change|delete)\b[\s\S]{0,80}\b(event|meeting|appointment)\b|\b(what's happening|whats happening|what's on|whats on|next weekend|this weekend|you can see|just check)\b/i;
 const TOOL_INTENT_FILES_PATTERN =
   /\b(file|folder|directory|path|document|subfolder|subfolders)\b[\s\S]{0,80}\b(list|find|search|move|copy|rename|delete|trash|create|make|mkdir|open|organize|reorganize|restructure|split|separate|sort|categorize|put|place|have|show|see|get)\b|\b(list|find|search|move|copy|rename|delete|trash|create|make|mkdir|open|organize|reorganize|restructure|split|separate|sort|categorize|put|place|have|show|see|get)\b[\s\S]{0,80}\b(file|folder|directory|path|document|subfolder|subfolders)\b|\b(organize|reorganize|restructure|split|separate)\b[\s\S]{0,80}\b(into|by|by type|by date|by name)\b|\b(put|move|place)\b[\s\S]{0,40}\b(into|in|inside)\b[\s\S]{0,40}\b(folder|directory)\b|\b(create|make)\b[\s\S]{0,40}\b(folders?|directories?)\b[\s\S]{0,40}\b(for|called|named)\b|\b(recent|last \d+|past \d+)\b[\s\S]{0,40}\b(files?|days?|weeks?)\b|\b(files?)\b[\s\S]{0,40}\b(from|in|within|during)\b[\s\S]{0,40}\b(last|past|recent|\d+)\b|\b(what|which|show|list|my)\b[\s\S]{0,40}\b(files?|documents?)\b/i;
 const TOOL_INTENT_APPS_PATTERN =
@@ -1132,7 +1132,8 @@ function shouldBypassDirectFastPathForCompoundRequest(input: string): boolean {
   const domainPatterns: RegExp[] = [
     /\b(play|music|song|track|volume)\b/i,
     /\b(note|notes|apple notes|write down|jot)\b/i,
-    /\b(remind|reminder|calendar|event|schedule)\b/i,
+    /\b(remind|reminder)\b/i,
+    /\b(calendar|event|schedule|meeting|appointment|1:1|one-on-one)\b/i,
     /\b(open|launch|focus app|application)\b/i,
     /\b(email|mail|message|text)\b/i,
     /\b(file|folder|directory|move|copy|delete|trash)\b/i,

package/template/src/app/globals.css

@@ -524,6 +524,12 @@ button:focus-visible {
   text-underline-offset: 2px;
 }
 
+.message-content a.message-content-link-badge {
+  margin: 0 2px;
+  vertical-align: baseline;
+  text-decoration: none;
+}
+
 .source-badge-row {
   margin-top: 10px;
   display: flex;
@@ -531,6 +537,10 @@ button:focus-visible {
   gap: 8px;
 }
 
+.message-content a.source-badge {
+  text-decoration: none;
+}
+
 .source-badge {
   display: inline-flex;
   align-items: center;
@@ -539,18 +549,19 @@ button:focus-visible {
   border-radius: 999px;
   border: 1px solid var(--border);
   background: var(--panel-2);
-  color: var(--text-secondary);
+  color: rgba(255, 255, 255, 0.88);
   text-decoration: none;
   font-size: 12px;
   line-height: 1;
   max-width: 220px;
-  transition: border-color 0.18s ease, color 0.18s ease, background 0.18s ease;
+  transition: border-color 0.18s ease, color 0.18s ease, background 0.18s ease, box-shadow 0.18s ease;
 }
 
 .source-badge:hover {
   border-color: var(--border-strong);
-  color: var(--text-primary);
+  color: #ffffff;
   background: var(--panel-3);
+  box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.35);
 }
 
 .source-badge-index {
@@ -561,15 +572,46 @@ button:focus-visible {
   height: 16px;
   border-radius: 999px;
   border: 1px solid var(--border-strong);
-  color: var(--text-muted);
+  color: rgba(255, 255, 255, 0.78);
   font-size: 10px;
   font-weight: 700;
+  text-decoration: none;
+}
+
+[data-theme="light"] .source-badge {
+  color: #2d2d2d;
+}
+
+[data-theme="light"] .source-badge:hover {
+  color: #111111;
+  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.2);
+}
+
+[data-theme="light"] .source-badge-index {
+  color: #4a4a4a;
+}
+
+[data-theme="light"] .source-badge:hover .source-badge-index {
+  color: #333333;
 }
 
 .source-badge-title {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  color: rgba(255, 255, 255, 0.88);
+}
+
+.source-badge:hover .source-badge-title {
+  color: #ffffff;
+}
+
+[data-theme="light"] .source-badge-title {
+  color: #1a1a1a;
+}
+
+[data-theme="light"] .source-badge:hover .source-badge-title {
+  color: #111111;
 }
 
 .message-content hr {

package/template/src/components/MessageCard.tsx

@@ -14,7 +14,13 @@ import {
   X,
 } from "lucide-react";
 import { memo, useMemo, useState } from "react";
-import type { MessageNode, Thread, ToolApproval, ToolEvent } from "../lib/types";
+import type {
+  ChatCitationSource,
+  MessageNode,
+  Thread,
+  ToolApproval,
+  ToolEvent,
+} from "../lib/types";
 import { splitContentAndSources } from "../lib/utils";
 
 const MAX_VISIBLE_TOOL_ITEMS = 8;
@@ -45,6 +51,11 @@ function MarkdownTable({
   );
 }
 
+/** Remove parentheses that wrap a single markdown link so the badge is not shown inside (). */
+function stripParenthesesAroundLinks(content: string): string {
+  return content.replace(/\s*\(\s*(\[[^\]]*\]\([^)]+\))\s*\)/g, " $1 ");
+}
+
 function normalizeMathDelimiters(content: string) {
   // Convert TeX delimiters to remark-math compatible delimiters.
   return content
@@ -640,6 +651,47 @@ function sourceBadgeLabel(url: string, title?: string): string {
   }
 }
 
+function normUrl(u: string): string {
+  try {
+    const p = new URL(u);
+    return p.origin + p.pathname.replace(/\/$/, "");
+  } catch {
+    return u;
+  }
+}
+
+/** Extract markdown link URLs from content in order of first appearance (deduped by normalized URL). */
+function extractCitationOrderFromContent(content: string): string[] {
+  const ordered: string[] = [];
+  const seen = new Set<string>();
+  const re = /\[([^\]]*)\]\(([^)]+)\)/g;
+  let m;
+  while ((m = re.exec(content)) !== null) {
+    const url = m[2].trim();
+    const n = normUrl(url);
+    if (!seen.has(n)) {
+      seen.add(n);
+      ordered.push(n);
+    }
+  }
+  return ordered;
+}
+
+/** Reorder sources so their order matches first appearance of each URL in the content. */
+function reorderSourcesByCitationOrder(
+  content: string,
+  sources: ChatCitationSource[],
+): ChatCitationSource[] {
+  const order = extractCitationOrderFromContent(content);
+  if (order.length === 0) return sources;
+  const orderIndex = (url: string) => {
+    const n = normUrl(url);
+    const i = order.indexOf(n);
+    return i >= 0 ? i : 1e9;
+  };
+  return [...sources].sort((a, b) => orderIndex(a.url) - orderIndex(b.url));
+}
+
 function getTimelineVisual(event: ToolEvent): {
   chipLabel: string;
   chipClassName: string;
@@ -726,9 +778,16 @@ function MessageCard({
     () => splitContentAndSources(message.content || ""),
     [message.content],
   );
+  const sourcesOrderedByCitation = useMemo(
+    () => reorderSourcesByCitationOrder(messageTextContent, messageSources),
+    [messageTextContent, messageSources],
+  );
   const isStreamingPlaceholder = isAssistant && isStreaming && !messageTextContent;
   const assistantContent = useMemo(
-    () => normalizeMathDelimiters(normalizeMarkdownStructure(messageTextContent)),
+    () =>
+      stripParenthesesAroundLinks(
+        normalizeMathDelimiters(normalizeMarkdownStructure(messageTextContent)),
+      ),
     [messageTextContent],
   );
   const renderedAssistantContent = isStreaming
@@ -825,6 +884,30 @@ function MessageCard({
                 rehypePlugins={[rehypeKatex]}
                 components={{
                   table: ({ children }) => <MarkdownTable>{children}</MarkdownTable>,
+                  a: ({ href, children }) => {
+                    if (!href) return <a>{children}</a>;
+                    const idx = sourcesOrderedByCitation.findIndex((s) =>
+                      normUrl(s.url) === normUrl(href)
+                    );
+                    const matchedSource = idx >= 0 ? sourcesOrderedByCitation[idx] : null;
+                    const rawLabel = sourceBadgeLabel(href, matchedSource?.title);
+                    const label = rawLabel.replace(/^[\s(]+|[\s)]+$/g, "").trim() || rawLabel;
+                    const index = idx >= 0 ? idx + 1 : 0;
+                    return (
+                      <a
+                        className="source-badge message-content-link-badge"
+                        href={href}
+                        target="_blank"
+                        rel="noreferrer noopener"
+                        title={href}
+                      >
+                        {index > 0 ? (
+                          <span className="source-badge-index">{index}</span>
+                        ) : null}
+                        <span className="source-badge-title">{label}</span>
+                      </a>
+                    );
+                  },
                 }}
               >
                 {renderedAssistantContent}
@@ -834,9 +917,9 @@ function MessageCard({
             <p>{messageTextContent}</p>
           )}
 
-          {message.role === "assistant" && !assistantCollapsed && messageSources.length > 0 ? (
+          {message.role === "assistant" && !assistantCollapsed && sourcesOrderedByCitation.length > 0 ? (
             <div className="source-badge-row" aria-label="Sources">
-              {messageSources.map((source, index) => (
+              {sourcesOrderedByCitation.map((source, index) => (
                 <a
                   key={`${source.url}-${index}`}
                   className="source-badge"

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

@@ -89,6 +89,36 @@ function asString(input: unknown, field: string): string {
   return input.trim();
 }
 
+/**
+ * Minor words that stay lowercase in title case unless first/last word.
+ * Matches common style: articles, short conjunctions, short prepositions, etc.
+ */
+const TITLE_CASE_MINOR_WORDS = new Set([
+  "a", "an", "the",
+  "and", "but", "or", "nor", "so", "yet",
+  "in", "on", "at", "to", "for", "of", "with", "by", "from", "as", "into", "through", "during", "per", "up", "out", "off", "down",
+  "if", "than", "when", "is", "it", "this", "that", "be", "are", "was", "were",
+]);
+
+/** Smart title case for calendar/reminder titles (e.g. "pay rent this friday" → "Pay Rent this Friday"). */
+function toTitleCase(s: string): string {
+  const words = s.split(/\s+/).filter(Boolean);
+  if (words.length === 0) return s;
+  return words
+    .map((word, i) => {
+      const lower = word.toLowerCase();
+      const isFirst = i === 0;
+      const isLast = i === words.length - 1;
+      const isMinor = TITLE_CASE_MINOR_WORDS.has(lower);
+      if (word.length === 0) return word;
+      if (isFirst || isLast || !isMinor) {
+        return word.slice(0, 1).toUpperCase() + word.slice(1).toLowerCase();
+      }
+      return lower;
+    })
+    .join(" ");
+}
+
 function toDueParts(date: Date): DateTimeParts {
   return {
     year: date.getFullYear(),
@@ -602,7 +632,7 @@ const GET_CALENDAR_NAMES_SCRIPT =
 async function runCalendarCreateEvent(input: unknown, context: ToolExecutionContext) {
   ensureMacOS("Calendar automation");
   const payload = asObject(input) as CalendarCreateInput;
-  const title = asString(payload.title, "title");
+  const title = toTitleCase(asString(payload.title, "title"));
   const start = asString(payload.start, "start");
   const endInput = typeof payload.end === "string" && payload.end.trim() ? payload.end.trim() : "";
   const end = endInput || start;
@@ -1134,7 +1164,7 @@ async function runCalendarMoveEvent(input: unknown, context: ToolExecutionContex
 async function runReminderCreate(input: unknown, context: ToolExecutionContext) {
   ensureMacOS("Reminders automation");
   const payload = asObject(input) as ReminderCreateInput;
-  const title = asString(payload.title, "title");
+  const title = toTitleCase(asString(payload.title, "title"));
   const list = typeof payload.list === "string" && payload.list.trim() ? payload.list.trim() : "Reminders";
   const due = typeof payload.due === "string" ? payload.due.trim() : "";
   const notes = typeof payload.notes === "string" ? payload.notes.trim() : "";
@@ -1265,7 +1295,7 @@ export const scheduleTools: ToolDefinition[] = [
   },
   {
     name: "calendar_create_event",
-    description: "Create a Calendar event. Use explicit dates/times (e.g. YYYY-MM-DD or 'Friday at 2pm') so the event is created on the correct day. Specify calendar name (e.g. 'Personal', 'Work') to target a specific calendar.",
+    description: "Create a Calendar event. For phrases like 'Add [event name] for [day/time] to my calendar' or 'Put [event name] on [day] at [time]', set title to only the event name (e.g. '1:1 with Alex', 'team standup') and start to the date/time (e.g. 'Thursday at 9am', 'Friday at 10'). Do not include the date/time in the title. start supports natural language: 'Thursday at 9am', 'next Monday at 2pm', YYYY-MM-DD, etc. Optional: calendar name (e.g. 'Personal', 'Work'), end time, location, notes.",
     inputSchema: {
       type: "object",
       required: ["title", "start"],