@classic-homes/agent-chat 0.11.0 → 0.13.0

package/dist/markdown.js

@@ -10,6 +10,9 @@
 import DOMPurify from 'dompurify';
 const OWN_CLASS_RE = /^agent-[\w-]+( agent-[\w-]+)*$/;
 let hooked = false;
+// Image hosts of the parseMarkdown call currently sanitizing; undefined outside it, so the
+// hooks below never touch other DOMPurify users on the page.
+let activeImageHosts;
 function ensureHook() {
     if (hooked || typeof DOMPurify.addHook !== 'function')
         return;
@@ -18,6 +21,39 @@ function ensureHook() {
         if (data.attrName === 'class' && !OWN_CLASS_RE.test(data.attrValue))
             data.keepAttr = false;
     });
+    // Defence in depth: the parser escapes all model text, so these only ever see our own tags.
+    DOMPurify.addHook('afterSanitizeAttributes', (node) => {
+        if (!activeImageHosts)
+            return;
+        const el = node;
+        if (typeof el.tagName !== 'string')
+            return;
+        const tag = el.tagName.toLowerCase();
+        if (tag === 'input') {
+            if ((el.getAttribute('type') ?? '').toLowerCase() !== 'checkbox') {
+                el.remove();
+                return;
+            }
+            el.setAttribute('disabled', '');
+        }
+        if (tag !== 'img')
+            el.removeAttribute('src');
+        else {
+            const src = el.getAttribute('src');
+            if (src === null || !isAllowedImageUrl(src, activeImageHosts))
+                el.remove();
+        }
+        if (el.hasAttribute('role') || el.hasAttribute('tabindex')) {
+            const region = el.getAttribute('role') === 'region' && el.getAttribute('tabindex') === '0';
+            const scroller = (tag === 'div' && el.classList.contains('agent-table-wrap')) || tag === 'pre';
+            if (!region || !scroller) {
+                el.removeAttribute('role');
+                el.removeAttribute('tabindex');
+            }
+        }
+        if (el.hasAttribute('aria-label') && tag !== 'input' && tag !== 'div')
+            el.removeAttribute('aria-label');
+    });
 }
 const DOMPURIFY_CONFIG = {
     ALLOWED_TAGS: [
@@ -60,12 +96,27 @@ const DOMPURIFY_CONFIG = {
         'type',
         'checked',
         'disabled',
+        'aria-label',
+        'role',
+        'tabindex',
     ],
     ALLOWED_URI_REGEXP: /^(?:(?:https?|mailto):|[^a-z]|[a-z+.-]+(?:[^a-z+.\-:]|$))/i,
 };
 // Sentinels for the scrolling wrapper around tables (see parseMarkdown).
 const TABLE_OPEN = '\u0000TO\u0000';
 const TABLE_CLOSE = '\u0000TC\u0000';
+const TABLE_WRAP_OPEN = '<div class="agent-table-wrap" tabindex="0" role="region" aria-label="Table">';
+function tagRegistry() {
+    const trusted = [];
+    return {
+        tag: (html) => {
+            trusted.push(html);
+            return `\u0000T${trusted.length - 1}\u0000`;
+        },
+        // eslint-disable-next-line no-control-regex -- NUL delimits the sentinels on purpose
+        restore: (html) => html.replace(/\u0000T(\d+)\u0000/g, (_, i) => trusted[Number(i)]),
+    };
+}
 const DEFAULT_IMAGE_HOSTS = ['classichomes.com', '.classichomes.com'];
 export function escapeHtml(text) {
     return text.replace(/[&<>"']/g, (c) => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#039;' })[c]);
@@ -83,17 +134,18 @@ export function isSafeUrl(url) {
 function pageOrigin() {
     return typeof window !== 'undefined' ? window.location.origin : undefined;
 }
+// Base for resolving relative URLs when there is no page (SSR): only a URL that stays on it is
+// same-origin. `/\\host/x` and `//host/x` resolve to another host and fail the check.
+const NO_PAGE_ORIGIN = 'https://same-origin.invalid';
 export function isAllowedImageUrl(url, hosts = DEFAULT_IMAGE_HOSTS) {
     if (!isSafeUrl(url))
         return false;
-    if (url.startsWith('/') && !url.startsWith('//'))
-        return true;
     try {
-        const origin = pageOrigin();
-        const parsed = new URL(url, origin ?? 'https://invalid.local');
+        const origin = pageOrigin() ?? NO_PAGE_ORIGIN;
+        const parsed = new URL(url, origin);
         if (parsed.protocol !== 'https:' && parsed.protocol !== 'http:')
             return false;
-        if (origin && parsed.origin === origin)
+        if (parsed.origin === origin)
             return true;
         const host = parsed.hostname.toLowerCase();
         return hosts.some((h) => h.startsWith('.') ? host.endsWith(h) || host === h.slice(1) : host === h);
@@ -116,7 +168,10 @@ export function parseMarkdown(text, options = {}) {
     ensureHook();
     const CODE = '\u0000CB';
     const INLINE = '\u0000IC';
-    let html = text.replace(/\r\n/g, '\n');
+    // NUL is reserved for the sentinels below; model text cannot forge one.
+    // eslint-disable-next-line no-control-regex -- strips NUL so text cannot forge a sentinel
+    let html = text.replace(/\r\n/g, '\n').replace(/\u0000/g, '');
+    const { tag, restore } = tagRegistry();
     const codeBlocks = [];
     html = html.replace(/```([\w-]*)[^\n]*\n([\s\S]*?)```/g, (_, lang, code) => {
         const cls = lang
@@ -130,14 +185,13 @@ export function parseMarkdown(text, options = {}) {
         inlineCodes.push(`<code>${escapeHtml(code)}</code>`);
         return `${INLINE}${inlineCodes.length - 1}${INLINE}`;
     });
-    html = parseBlockquotes(html);
-    html = parseTables(html);
-    html = parseLists(html);
-    html = escapePreservingTags(html, [CODE, INLINE]);
-    // Table wrappers go in after escaping, so a literal `<div>` in the text is never trusted.
-    html = html
-        .replaceAll(TABLE_OPEN, '<div class="agent-table-wrap">')
-        .replaceAll(TABLE_CLOSE, '</div>');
+    html = parseBlockquotes(html, tag);
+    html = parseTables(html, tag);
+    html = parseLists(html, tag);
+    // Escape everything (sentinels contain no escapable characters), then put back only our own
+    // tags, so a literal `<input>`, `<table>` or `<div>` in the text is never trusted.
+    html = restore(escapeHtml(html));
+    html = html.replaceAll(TABLE_OPEN, TABLE_WRAP_OPEN).replaceAll(TABLE_CLOSE, '</div>');
     html = html.replace(/^[\t ]*(?:---+|\*\*\*+|___+)[\t ]*$/gm, '<hr>');
     html = html.replace(/^#### (.+)$/gm, '<h4>$1</h4>');
     html = html.replace(/^### (.+)$/gm, '<h4>$1</h4>');
@@ -170,38 +224,15 @@ export function parseMarkdown(text, options = {}) {
     if (!html.startsWith('<'))
         html = `<p>${html}</p>`;
     html = html.replace(/<p>\s*<\/p>/g, '');
-    return DOMPurify.sanitize(html, DOMPURIFY_CONFIG);
-}
-function escapePreservingTags(html, markers) {
-    const tags = [
-        'blockquote',
-        'table',
-        'thead',
-        'tbody',
-        'tr',
-        'th',
-        'td',
-        'ul',
-        'ol',
-        'li',
-        'br',
-        'input',
-    ];
-    const tagPattern = tags.map((t) => `<\\/?${t}[^>]*>`).join('|');
-    const markerPattern = markers.map((m) => `${m}\\d+${m}`).join('|');
-    const pattern = new RegExp(`(${tagPattern}|${markerPattern})`, 'gi');
-    return html
-        .split(pattern)
-        .map((part) => {
-        if (tags.some((t) => new RegExp(`^<\\/?${t}[^>]*>$`, 'i').test(part)))
-            return part;
-        if (markers.some((m) => part.startsWith(m) && part.endsWith(m)))
-            return part;
-        return escapeHtml(part);
-    })
-        .join('');
+    activeImageHosts = hosts;
+    try {
+        return DOMPurify.sanitize(html, DOMPURIFY_CONFIG);
+    }
+    finally {
+        activeImageHosts = undefined;
+    }
 }
-function parseBlockquotes(html) {
+function parseBlockquotes(html, tag) {
     const lines = html.split('\n');
     const out = [];
     let i = 0;
@@ -212,7 +243,7 @@ function parseBlockquotes(html) {
                 quote.push(lines[i].replace(/^\s*>+\s?/, ''));
                 i += 1;
             }
-            out.push(`<blockquote class="agent-blockquote">${quote.join('<br>')}</blockquote>`);
+            out.push(`${tag('<blockquote class="agent-blockquote">')}${quote.join(tag('<br>'))}${tag('</blockquote>')}`);
             continue;
         }
         out.push(lines[i]);
@@ -241,36 +272,36 @@ function parseItem(line) {
         };
     return null;
 }
-function buildList(items, start, indent) {
+function buildList(items, start, indent, tag) {
     const first = items[start];
     const startAttr = first.type === 'ol' && first.start !== 1 ? ` start="${first.start}"` : '';
-    let html = `<${first.type}${startAttr}${first.task !== undefined ? ' class="agent-tasklist"' : ''}>`;
+    let html = tag(`<${first.type}${startAttr}${first.task !== undefined ? ' class="agent-tasklist"' : ''}>`);
     let i = start;
     while (i < items.length && items[i].indent >= indent) {
         const item = items[i];
         if (item.indent > indent) {
-            const nested = buildList(items, i, item.indent);
+            const nested = buildList(items, i, item.indent, tag);
             html += nested.html;
             i = nested.end;
             continue;
         }
         const box = item.task === undefined
             ? ''
-            : `<input type="checkbox" disabled${item.task ? ' checked' : ''}> `;
+            : `${tag(`<input type="checkbox" disabled${item.task ? ' checked aria-label="Done"' : ' aria-label="Not done"'}>`)} `;
         if (i + 1 < items.length && items[i + 1].indent > indent) {
-            html += `<li>${box}${item.content}`;
-            const nested = buildList(items, i + 1, items[i + 1].indent);
-            html += `${nested.html}</li>`;
+            html += `${tag('<li>')}${box}${item.content}`;
+            const nested = buildList(items, i + 1, items[i + 1].indent, tag);
+            html += `${nested.html}${tag('</li>')}`;
             i = nested.end;
         }
         else {
-            html += `<li>${box}${item.content}</li>`;
+            html += `${tag('<li>')}${box}${item.content}${tag('</li>')}`;
             i += 1;
         }
     }
-    return { html: `${html}</${first.type}>`, end: i };
+    return { html: `${html}${tag(`</${first.type}>`)}`, end: i };
 }
-function parseLists(html) {
+function parseLists(html, tag) {
     const lines = html.split('\n');
     const out = [];
     let i = 0;
@@ -295,7 +326,7 @@ function parseLists(html) {
             else
                 break;
         }
-        out.push(buildList(items, 0, item.indent).html);
+        out.push(buildList(items, 0, item.indent, tag).html);
     }
     return out.join('\n');
 }
@@ -306,7 +337,7 @@ const cells = (line) => line
     .replace(/\|$/, '')
     .split('|')
     .map((c) => c.trim());
-function parseTables(html) {
+function parseTables(html, tag) {
     const lines = html.split('\n');
     const out = [];
     let i = 0;
@@ -320,9 +351,11 @@ function parseTables(html) {
                 rows.push(cells(lines[j]));
                 j += 1;
             }
-            out.push(`${TABLE_OPEN}<table class="agent-table"><thead><tr>${header.map((h) => `<th>${h}</th>`).join('')}</tr></thead><tbody>${rows
-                .map((r) => `<tr>${r.map((c) => `<td>${c}</td>`).join('')}</tr>`)
-                .join('')}</tbody></table>${TABLE_CLOSE}`);
+            const cell = (name, c) => `${tag(`<${name}>`)}${c}${tag(`</${name}>`)}`;
+            const row = (r, name) => `${tag('<tr>')}${r.map((c) => cell(name, c)).join('')}${tag('</tr>')}`;
+            out.push(`${TABLE_OPEN}${tag('<table class="agent-table"><thead>')}${row(header, 'th')}${tag('</thead><tbody>')}${rows
+                .map((r) => row(r, 'td'))
+                .join('')}${tag('</tbody></table>')}${TABLE_CLOSE}`);
             i = j;
             continue;
         }

package/dist/reducer.d.ts

@@ -80,6 +80,12 @@ export interface AssistantMessage {
     mode?: BackendMode;
     /** The user's rating of this answer, when given. */
     feedback?: TurnRating;
+    /**
+     * Internal: the stored turn this request was sent to replace (regenerate, edit, retry). Kept
+     * only until the runtime accepts the request (`start`); a retry of a request that never
+     * started replaces this turn instead of the never-stored request.
+     */
+    replaces?: string;
     createdAt: number;
 }
 export type ChatMessage = UserMessage | AssistantMessage;
@@ -92,6 +98,11 @@ export declare function newUserMessage(requestId: string, text: string, options?
 export declare function describeContext(context: DocumentContext): string;
 /** Fold one stream event into the assistant message it belongs to. Returns a new object. */
 export declare function applyEvent(message: AssistantMessage, event: ChatEvent): AssistantMessage;
+/**
+ * Whether Continue can carry on this answer: it was cut short (output limit) or stopped, and has
+ * text. A dropped connection or an error is retried instead.
+ */
+export declare function isContinuable(message: AssistantMessage): boolean;
 /**
  * Prepare a retry of the turn `requestId`: returns the user message to resend and the transcript
  * without that turn (its user message and the failed assistant reply), so the retried turn

package/dist/reducer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reducer.d.ts","sourceRoot":"","sources":["../src/lib/reducer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reducer.d.ts","sourceRoot":"","sources":["../src/lib/reducer.ts"],"names":[],"mappings":"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"}

package/dist/reducer.js

@@ -35,8 +35,12 @@ export function describeContext(context) {
 /** Fold one stream event into the assistant message it belongs to. Returns a new object. */
 export function applyEvent(message, event) {
     switch (event.type) {
-        case 'start':
-            return { ...message, mode: event.mode };
+        case 'start': {
+            const next = { ...message, mode: event.mode };
+            // Accepted: the runtime has removed the replaced turn and stored this one.
+            delete next.replaces;
+            return next;
+        }
         case 'delta':
             return { ...message, text: message.text + event.text };
         case 'proposal':
@@ -145,6 +149,9 @@ export function applyEvent(message, event) {
                     calls: message.usage.calls + 1,
                 },
             };
+        case 'client_call':
+            // Answered by the session against the live page; nothing to show in the transcript.
+            return message;
         case 'error':
             return {
                 ...message,
@@ -165,6 +172,15 @@ export function applyEvent(message, event) {
             };
     }
 }
+/**
+ * Whether Continue can carry on this answer: it was cut short (output limit) or stopped, and has
+ * text. A dropped connection or an error is retried instead.
+ */
+export function isContinuable(message) {
+    return ((message.status === 'incomplete' || message.status === 'cancelled') &&
+        (message.finishReason === 'length' || message.finishReason === 'cancelled') &&
+        !!message.text);
+}
 /**
  * Prepare a retry of the turn `requestId`: returns the user message to resend and the transcript
  * without that turn (its user message and the failed assistant reply), so the retried turn

package/dist/session.svelte.d.ts

@@ -22,6 +22,11 @@ export interface ChatSessionOptions {
         conversationId: string | null;
         status: string;
     }) => void;
+    /**
+     * After Stop, how long to keep reading the stream for the runtime's `done` (so text the agent
+     * produced before the cancel landed still shows) before giving up locally. Default 3000 ms.
+     */
+    cancelGraceMs?: number;
 }
 export type SessionStatus = 'idle' | 'loading' | 'streaming';
 /**
@@ -45,13 +50,35 @@ export declare class ChatSession {
         bytes: number;
         status: "uploaded" | "indexed" | "failed";
     }[];
+    /** The unsent composer text, kept here so it survives the view being remounted. */
+    draft: string;
     private controller;
     /** The request being streamed; differs from the shown answer's id while continuing it. */
     private streamRequestId;
+    /** Set once Stop was pressed for the running stream (the server cancel is on its way). */
+    private cancelling;
+    private cancelTimer;
+    /** Bumped by each load and reset, so a superseded load drops its result. */
+    private loadToken;
     private readonly options;
+    private readonly listeners;
     constructor(options: ChatSessionOptions);
+    /**
+     * Observe this session's stream events for as long as a view needs them. A session can
+     * outlive the component showing it (a host moving the chat between surfaces), so views
+     * subscribe instead of owning the `onEvent` option. Returns the unsubscribe.
+     */
+    subscribe(listener: (event: ChatEvent) => void): () => void;
     get streaming(): boolean;
     get current(): AssistantMessage | undefined;
+    /**
+     * Forget the current conversation (the host started a new chat): stops reading a running
+     * stream without cancelling it on the server (the turn finishes there and stays in its
+     * conversation) and clears the transcript.
+     */
+    reset(): void;
+    /** Stop reading the running stream, if any; its `run` then leaves the session alone. */
+    private detach;
     /** Load an existing conversation's transcript and re-attach to a running turn if any. */
     load(conversationId: string): Promise<void>;
     /**
@@ -67,6 +94,11 @@ export declare class ChatSession {
      * in the view and in the runtime's transcript, rather than duplicated.
      */
     retry(requestId: string): Promise<void>;
+    /**
+     * The stored turn a resend of `requestId` replaces: the request itself once the runtime
+     * accepted it, else the turn that request was meant to replace (the runtime never stored it).
+     */
+    private replacesFor;
     /** Ask again for a new answer to the latest question, replacing the current one. */
     regenerate(requestId: string): Promise<void>;
     /** Change the latest question and answer it again, replacing that turn. */
@@ -84,8 +116,16 @@ export declare class ChatSession {
      * runtime refuses it.
      */
     rate(requestId: string, rating: TurnRating | null, comment?: string): Promise<void>;
+    /**
+     * Stop the running answer. The runtime is asked to cancel and the stream is read on until its
+     * `done`, so text produced before the cancel landed still shows (and a later Continue appends
+     * after it); after `cancelGraceMs` the stream is dropped locally. The answer shows as stopped
+     * at once.
+     */
     cancel(): void;
     private run;
+    /** The turn's stream is over: restore a failed continuation, go idle, tell the host. */
+    private finish;
     private toolName;
     private update;
 }

package/dist/session.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.svelte.d.ts","sourceRoot":"","sources":["../src/lib/session.svelte.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.svelte.d.ts","sourceRoot":"","sources":["../src/lib/session.svelte.ts"],"names":[],"mappings":"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"}