iris-chatbot 5.2.0 → 5.3.1

package/template/src/lib/tooling/approvals.ts

@@ -1,9 +1,17 @@
 import { nanoid } from "nanoid";
 
-export type ApprovalDecision = "approve" | "deny" | "timeout";
+export type ApprovalDecision = "approve" | "deny" | "timeout" | "supersede";
+export type ApprovalSource = "user" | "system";
+export type ApprovalReasonCode = "user_cancel" | "internal_replace" | "timeout" | "other";
+export type ApprovalResolution = {
+  decision: ApprovalDecision;
+  args?: Record<string, unknown>;
+  source?: ApprovalSource;
+  reasonCode?: ApprovalReasonCode;
+};
 
 type PendingApproval = {
-  resolve: (decision: ApprovalDecision) => void;
+  resolve: (resolution: ApprovalResolution) => void;
   timeout: NodeJS.Timeout;
 };
 
@@ -29,8 +37,8 @@ export function createApprovalRequest(params?: { timeoutMs?: number }) {
   const approvalId = nanoid();
   const timeoutMs = params?.timeoutMs ?? 5 * 60_000;
 
-  let resolveRef: ((decision: ApprovalDecision) => void) | null = null;
-  const promise = new Promise<ApprovalDecision>((resolve) => {
+  let resolveRef: ((resolution: ApprovalResolution) => void) | null = null;
+  const promise = new Promise<ApprovalResolution>((resolve) => {
     resolveRef = resolve;
   });
 
@@ -40,13 +48,13 @@ export function createApprovalRequest(params?: { timeoutMs?: number }) {
       return;
     }
     store.pendingApprovals.delete(approvalId);
-    pending.resolve("timeout");
+    pending.resolve({ decision: "timeout", source: "system", reasonCode: "timeout" });
   }, timeoutMs);
 
   store.pendingApprovals.set(approvalId, {
-    resolve: (decision) => {
+    resolve: (resolution) => {
       clearTimeout(timeout);
-      resolveRef?.(decision);
+      resolveRef?.(resolution);
     },
     timeout,
   });
@@ -59,7 +67,9 @@ export function createApprovalRequest(params?: { timeoutMs?: number }) {
 
 export function resolveApprovalDecision(
   approvalId: string,
-  decision: "approve" | "deny",
+  decision: "approve" | "deny" | "supersede",
+  args?: Record<string, unknown>,
+  meta?: { source?: ApprovalSource; reasonCode?: ApprovalReasonCode },
 ): boolean {
   const store = getApprovalStore();
   const pending = store.pendingApprovals.get(approvalId);
@@ -69,7 +79,12 @@ export function resolveApprovalDecision(
 
   store.pendingApprovals.delete(approvalId);
   clearTimeout(pending.timeout);
-  pending.resolve(decision);
+  pending.resolve({
+    decision,
+    args,
+    source: meta?.source ?? "user",
+    reasonCode: meta?.reasonCode,
+  });
   return true;
 }
 

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

@@ -39,6 +39,20 @@ type ResolvedMessageRecipient = {
   source: "contact" | "direct";
 };
 
+type ResolvedMailRecipient = {
+  input: string;
+  name: string | null;
+  address: string;
+  source: "contact" | "direct";
+};
+
+export type ContactAutocompleteMode = "message" | "email";
+export type ContactAutocompleteSuggestion = {
+  name: string;
+  value: string;
+  detail: string;
+};
+
 const APPLESCRIPT_TIMEOUT_MS = 45_000;
 const CONTACT_RECORD_DELIMITER = String.fromCharCode(30);
 const CONTACT_FIELD_DELIMITER = String.fromCharCode(31);
@@ -214,6 +228,18 @@ function selectPreferredMessageHandle(contact: ContactRecord): string | null {
   return null;
 }
 
+function selectPreferredEmail(contact: ContactRecord): string | null {
+  const emails = dedupeList(
+    contact.emails
+      .map((value) => value.trim())
+      .filter((value) => EMAIL_REGEX.test(value)),
+  );
+  if (emails.length > 0) {
+    return emails[0];
+  }
+  return null;
+}
+
 function formatContactOption(contact: ContactRecord): string {
   const name = contactDisplayName(contact);
   const handle = selectPreferredMessageHandle(contact);
@@ -516,6 +542,51 @@ async function getContactsMatchingQuery(query: string, signal?: AbortSignal): Pr
   }
 }
 
+export async function autocompleteContacts(params: {
+  query: string;
+  mode: ContactAutocompleteMode;
+  signal?: AbortSignal;
+}): Promise<ContactAutocompleteSuggestion[]> {
+  const query = params.query.trim();
+  if (!query) {
+    return [];
+  }
+  const contacts = await getContactsMatchingQuery(query, params.signal);
+  const matches = findContactMatches(query, contacts);
+  const seen = new Set<string>();
+  const suggestions: ContactAutocompleteSuggestion[] = [];
+
+  for (const match of matches) {
+    const contact = match.contact;
+    const name = contactDisplayName(contact);
+    const phones = dedupeList(contact.phones.map(normalizePhoneHandle).filter(Boolean));
+    const emails = dedupeList(
+      contact.emails
+        .map((value) => value.trim())
+        .filter((value) => EMAIL_REGEX.test(value)),
+    );
+    const orderedHandles =
+      params.mode === "message"
+        ? [...phones, ...emails]
+        : emails;
+    const value = orderedHandles[0];
+    if (!value || seen.has(value)) {
+      continue;
+    }
+    seen.add(value);
+    suggestions.push({
+      name,
+      value,
+      detail: value,
+    });
+    if (suggestions.length >= 8) {
+      break;
+    }
+  }
+
+  return suggestions;
+}
+
 async function resolveMessageRecipients(
   requestedRecipients: string[],
   signal?: AbortSignal,
@@ -540,34 +611,7 @@ async function resolveMessageRecipients(
       continue;
     }
 
-    const queryCandidates = dedupeList([
-      entry,
-      ...normalizeNameForMatch(entry)
-        .split(" ")
-        .filter((token) => token.length >= 3),
-    ]);
-    const candidateContacts: ContactRecord[] = [];
-    const candidateFingerprints = new Set<string>();
-    for (const query of queryCandidates) {
-      const contacts = await getContactsMatchingQuery(query, signal);
-      for (const contact of contacts) {
-        const fingerprint = [
-          contact.fullName,
-          contact.firstName,
-          contact.lastName,
-          contact.phones.join("|"),
-          contact.emails.join("|"),
-        ].join("||");
-        if (candidateFingerprints.has(fingerprint)) {
-          continue;
-        }
-        candidateFingerprints.add(fingerprint);
-        candidateContacts.push(contact);
-      }
-      if (candidateContacts.length >= 24) {
-        break;
-      }
-    }
+    const candidateContacts = await collectCandidateContacts(entry, signal);
 
     const matches = findContactMatches(entry, candidateContacts);
     if (matches.length === 0) {
@@ -591,6 +635,85 @@ async function resolveMessageRecipients(
   return resolved;
 }
 
+async function collectCandidateContacts(entry: string, signal?: AbortSignal): Promise<ContactRecord[]> {
+  const queryCandidates = dedupeList([
+    entry,
+    ...normalizeNameForMatch(entry)
+      .split(" ")
+      .filter((token) => token.length >= 3),
+  ]);
+  const candidateContacts: ContactRecord[] = [];
+  const candidateFingerprints = new Set<string>();
+  for (const query of queryCandidates) {
+    const contacts = await getContactsMatchingQuery(query, signal);
+    for (const contact of contacts) {
+      const fingerprint = [
+        contact.fullName,
+        contact.firstName,
+        contact.lastName,
+        contact.phones.join("|"),
+        contact.emails.join("|"),
+      ].join("||");
+      if (candidateFingerprints.has(fingerprint)) {
+        continue;
+      }
+      candidateFingerprints.add(fingerprint);
+      candidateContacts.push(contact);
+    }
+    if (candidateContacts.length >= 24) {
+      break;
+    }
+  }
+  return candidateContacts;
+}
+
+async function resolveMailRecipients(
+  requestedRecipients: string[],
+  signal?: AbortSignal,
+): Promise<ResolvedMailRecipient[]> {
+  const recipients = requestedRecipients
+    .map((entry) => entry.trim())
+    .filter(Boolean);
+  if (recipients.length === 0) {
+    throw new Error("Missing required array field: to");
+  }
+
+  const resolved: ResolvedMailRecipient[] = [];
+  for (const entry of recipients) {
+    const direct = entry.trim();
+    if (EMAIL_REGEX.test(direct)) {
+      resolved.push({
+        input: entry,
+        name: null,
+        address: direct,
+        source: "direct",
+      });
+      continue;
+    }
+
+    const candidateContacts = await collectCandidateContacts(entry, signal);
+    const matches = findContactMatches(entry, candidateContacts);
+    if (matches.length === 0) {
+      throw notFoundContactError(entry, candidateContacts);
+    }
+
+    const matchedContact = resolveContactFromMatches(entry, matches);
+    const address = selectPreferredEmail(matchedContact);
+    if (!address) {
+      throw new Error(
+        `Contact "${contactDisplayName(matchedContact)}" has no email address available for Mail.`,
+      );
+    }
+    resolved.push({
+      input: entry,
+      name: contactDisplayName(matchedContact),
+      address,
+      source: "contact",
+    });
+  }
+  return resolved;
+}
+
 async function runMessagesSendScript(
   handles: string[],
   body: string,
@@ -674,15 +797,25 @@ async function runAppleScript(
 async function runMailCreateDraft(input: unknown, context: ToolExecutionContext) {
   ensureMacOS("Mail automation");
   const payload = asObject(input) as MailInput;
-  const to = asStringArray(payload.to, "to");
+  const requestedTo = asStringArray(payload.to, "to");
   const subject = asString(payload.subject, "subject");
   const body = asString(payload.body, "body");
-  const cc = Array.isArray(payload.cc)
+  const requestedCc = Array.isArray(payload.cc)
     ? payload.cc.filter((item): item is string => typeof item === "string" && item.trim() !== "")
     : [];
   const attachments = Array.isArray(payload.attachments)
     ? payload.attachments.filter((item): item is string => typeof item === "string" && item.trim() !== "")
     : [];
+  const resolvedTo = await resolveMailRecipients(requestedTo, context.signal);
+  const resolvedCc = requestedCc.length > 0
+    ? await resolveMailRecipients(requestedCc, context.signal)
+    : [];
+  const to = dedupeList(resolvedTo.map((recipient) => recipient.address));
+  const cc = dedupeList(
+    resolvedCc
+      .map((recipient) => recipient.address)
+      .filter((address) => !to.includes(address)),
+  );
 
   const resolvedAttachments: string[] = [];
   for (const attachment of attachments) {
@@ -703,6 +836,10 @@ async function runMailCreateDraft(input: unknown, context: ToolExecutionContext)
       cc,
       subject,
       hasBody: Boolean(body),
+      recipients: {
+        to: resolvedTo,
+        cc: resolvedCc,
+      },
       attachments: resolvedAttachments,
     };
   }
@@ -729,7 +866,17 @@ async function runMailCreateDraft(input: unknown, context: ToolExecutionContext)
     'end run';
 
   await runAppleScript(script, [to.join("\n"), cc.join("\n"), subject, body], context.signal);
-  return { drafted: true, to, cc, subject, attachments: resolvedAttachments.length };
+  return {
+    drafted: true,
+    to,
+    cc,
+    subject,
+    recipients: {
+      to: resolvedTo,
+      cc: resolvedCc,
+    },
+    attachments: resolvedAttachments.length,
+  };
 }
 
 async function runMailSend(input: unknown, context: ToolExecutionContext) {

package/template/src/lib/types.ts

@@ -56,6 +56,7 @@ export type LocalToolsSettings = {
   enabled: boolean;
   approvalMode: ApprovalMode;
   safetyProfile: SafetyProfile;
+  preSendDraftReview: boolean;
   allowedRoots: string[];
   enableNotes: boolean;
   enableApps: boolean;
@@ -81,6 +82,7 @@ export const DEFAULT_LOCAL_TOOLS_SETTINGS: LocalToolsSettings = {
   enabled: true,
   approvalMode: "trusted_auto",
   safetyProfile: "balanced",
+  preSendDraftReview: true,
   allowedRoots: [...DEFAULT_LOCAL_TOOL_ROOTS],
   enableNotes: true,
   enableApps: true,
@@ -196,7 +198,7 @@ export type ToolEvent = {
   createdAt: number;
 };
 
-export type ToolApprovalStatus = "requested" | "approved" | "denied" | "timeout";
+export type ToolApprovalStatus = "requested" | "approved" | "denied" | "timeout" | "superseded";
 
 export type ToolApproval = {
   id: string;
@@ -238,6 +240,14 @@ export type ChatRequest = {
     threadId?: string;
     conversationId?: string;
     assistantMessageId?: string;
+    forceToolRouting?: boolean;
+    draftEditContext?: {
+      toolName: "mail_send" | "messages_send";
+      to: string[];
+      cc?: string[];
+      subject?: string;
+      body: string;
+    };
   };
 };
 
@@ -281,7 +291,7 @@ export type ApprovalResolvedEvent = {
   type: "approval_resolved";
   approvalId: string;
   callId: string;
-  decision: "approve" | "deny" | "timeout";
+  decision: "approve" | "deny" | "timeout" | "supersede";
   message?: string;
 };