tags; the default Turndown rule emits - // \n\n around each paragraph which then required a destructive - // replaceAll('\n\n','\n') that also wiped blank lines inside code blocks. - // This rule eliminates that hack so
content is untouched. + // Emit one newline per paragraph; global newline collapsing would damage code-block spacing. turndownService.addRule('singleNewlineParagraphs', { filter: 'p', replacement: function (content) { @@ -55,7 +51,7 @@ // Use turndown-plugin-gfm for proper GFM table support turndownService.use(gfm); - // Add custom table header rule before using GFM plugin + // Keep header text intact; the table rule will handle the scaffolding. turndownService.addRule('tableHeaders', { filter: 'th', replacement: function (content, node) { @@ -63,7 +59,7 @@ } }); - // Add custom table rule to handle headers properly + // Rebuild tables as Markdown; the columns still need to stay in their lanes. turndownService.addRule('tables', { filter: 'table', replacement: function (content, node) { @@ -78,7 +74,7 @@ const cellContents = cells.map((cell) => { // Get the text content and clean it up let cellContent = turndownService.turndown(cell.innerHTML).trim(); - // Remove extra paragraph tags that might be added + // Trim edge newlines; a table cell does not need its own front lawn. cellContent = cellContent.replace(/^\n+|\n+$/g, ''); cellContent = cellContent.replace(/\n/g, ''); return cellContent; @@ -87,7 +83,7 @@ // Add the row markdown += '| ' + cellContents.join(' | ') + ' |\n'; - // Add separator after first row (which should be headers) + // Give the first row its Markdown header underline. Tiny table bureaucracy. if (rowIndex === 0) { const separator = cells.map(() => '---').join(' | '); markdown += '| ' + separator + ' |\n'; @@ -241,10 +237,7 @@ } }); - // WORKAROUND: TipTap's default Code mark input rule regex captures the - // character before the opening backtick, causing it to be deleted. - // This uses a lookbehind assertion instead so the preceding character is - // matched for position but not captured/deleted. + // Use lookbehind so the backtick rule does not capture and delete the preceding character. // Upstream fix: https://github.com/ueberdosis/tiptap/pull/7124 const backtickInputRegex = /(?<=\s|^)`([^`]+)`(?!`)$/; const FixedCode = Code.extend({ @@ -566,20 +559,20 @@ .trim() ); - // Create a temporary div to parse HTML + // Give the sanitized HTML a temporary home while the parser unpacks it. const tempDiv = document.createElement('div'); tempDiv.innerHTML = htmlContent; // Convert HTML to ProseMirror nodes const fragment = DOMParser.fromSchema(state.schema).parse(tempDiv); - // Extract just the content, not the wrapper paragraphs + // Unpack the fragment; paragraph wrappers come off in the loop below. const content = fragment.content; let nodesToInsert = []; content.forEach((node) => { if (node.type.name === 'paragraph') { - // If it's a paragraph, extract its content + // Keep the paragraph contents; leave the packing material behind. nodesToInsert.push(...node.content.content); } else { nodesToInsert.push(node); @@ -587,12 +580,12 @@ }); tr = tr.replaceWith(start, end, nodesToInsert); - // Calculate new position + // Park the caret after the inserted nodes, not back at the loading dock. const newPos = start + nodesToInsert.reduce((sum, node) => sum + node.nodeSize, 0); tr = tr.setSelection(Selection.near(tr.doc.resolve(newPos))); } else { if (text.includes('\n')) { - // Split the text into lines and create a node for each line + // Keep the first line inline and wrap subsequent lines in paragraphs. const lines = text.split('\n'); const nodes = lines.map( (line, index) => @@ -601,17 +594,17 @@ : state.schema.nodes.paragraph.create({}, line ? state.schema.text(line) : undefined) // Subsequent lines are paragraphs ); - // Build and dispatch the transaction to replace the word at cursor + // Replace the current word in the pending transaction; dispatch after setting the selection. tr = tr.replaceWith(start, end, nodes); let newSelectionPos; - // +1 because the insert happens at start, so last para starts at (start + sum of all previous nodes' sizes) + // Sum node sizes from the insertion point to locate the end of the inserted content. let lastPos = start; for (let i = 0; i < nodes.length; i++) { lastPos += nodes[i].nodeSize; } - // Place cursor inside the last paragraph at its end + // Use that boundary to find the nearest valid text selection below. newSelectionPos = lastPos; tr = tr.setSelection(TextSelection.near(tr.doc.resolve(newSelectionPos))); @@ -758,7 +751,7 @@ export const focus = (options: FocusOptions = {}) => { if (editor && editor.view) { - // Check if the editor is destroyed + // Retired editors do not take focus requests. if (editor.isDestroyed) { return; } @@ -768,7 +761,7 @@ editor.view.dom.focus(options); } else { editor.view.focus(); - // Scroll to the current selection + // Bring the selection into view; the caret should not play hide-and-seek. editor.view.dispatch(editor.view.state.tr.scrollIntoView()); } } catch (e) { diff --git a/src/lib/components/common/RichTextInput/AutoCompletion.js b/src/lib/components/common/RichTextInput/AutoCompletion.js index 025ee554cc..b8828157d1 100644 --- a/src/lib/components/common/RichTextInput/AutoCompletion.js +++ b/src/lib/components/common/RichTextInput/AutoCompletion.js @@ -187,26 +187,6 @@ export const AIAutocompletion = Extension.create({ if (event.key === 'Tab') { if (acceptFollowUpSuggestion(view)) return true; - // if (!node.attrs['data-suggestion']) { - // // Generate completion - // if (loading) return true - // loading = true - // const prompt = node.textContent - // this.options.generateCompletion(prompt).then(suggestion => { - // if (suggestion && suggestion.trim() !== '') { - // dispatch(state.tr.setNodeMarkup($head.before(), null, { - // ...node.attrs, - // class: 'ai-autocompletion', - // 'data-prompt': prompt, - // 'data-suggestion': suggestion, - // })) - // } - // // If suggestion is empty or null, do nothing - // }).finally(() => { - // loading = false - // }) - // } - if (node.attrs['data-suggestion']) { // Accept suggestion const suggestion = node.attrs['data-suggestion']; @@ -283,34 +263,6 @@ export const AIAutocompletion = Extension.create({ } return false; }, - // Add mousedown behavior - // mouseup: (view, event) => { - // const { state, dispatch } = view; - // const { selection } = state; - // const { $head } = selection; - // const node = $head.parent; - - // // Reset debounce timer on mouse click - // clearTimeout(debounceTimer); - - // // If a suggestion exists and the cursor moves, remove the suggestion - // if ( - // node.type.name === 'paragraph' && - // node.attrs['data-suggestion'] && - // view.state.selection.$head.pos !== view.state.selection.$head.end() - // ) { - // dispatch( - // state.tr.setNodeMarkup($head.before(), null, { - // ...node.attrs, - // class: null, - // 'data-prompt': null, - // 'data-suggestion': null - // }) - // ); - // } - - // return false; - // } mouseup: (view, event) => { const { state, dispatch } = view; diff --git a/src/lib/components/common/RichTextInput/listDragHandlePlugin.js b/src/lib/components/common/RichTextInput/listDragHandlePlugin.js index d0ce93f380..ac78b1ff39 100644 --- a/src/lib/components/common/RichTextInput/listDragHandlePlugin.js +++ b/src/lib/components/common/RichTextInput/listDragHandlePlugin.js @@ -192,7 +192,7 @@ export function listDragHandlePlugin(options = {}) { return wantedType.create(newAttrs, Fragment.from(normalizedContent), itemNode.marks); } - // ---------- decorations ---------- + // Decorations function buildHandleDecos(doc) { const decos = []; doc.descendants((node, pos) => { @@ -269,7 +269,7 @@ export function listDragHandlePlugin(options = {}) { return { ...li, dom, mode }; } - // ---------- state ---------- + // State const init = (state) => ({ decorations: buildHandleDecos(state.doc), dragging: null, // {fromStart, startMouse:{x,y}, ghostEl, active} @@ -312,7 +312,7 @@ export function listDragHandlePlugin(options = {}) { return deco; }; - // ---------- helpers ---------- + // Helpers const setDrag = (view, dragging) => view.dispatch(view.state.tr.setMeta(listPointerDragKey, { type: 'set-drag', dragging })); const setDrop = (view, drop) => @@ -422,7 +422,7 @@ export function listDragHandlePlugin(options = {}) { if (ghost) ghost.style.transform = `translate(${Math.round(dx)}px, ${Math.round(dy)}px)`; }; - // ---------- plugin ---------- + // Plugin return new Plugin({ key: listPointerDragKey, state: { init: (_, state) => init(state), apply }, diff --git a/src/lib/components/common/Textarea.svelte b/src/lib/components/common/Textarea.svelte index 2eb32e84cf..48a58e1e95 100644 --- a/src/lib/components/common/Textarea.svelte +++ b/src/lib/components/common/Textarea.svelte @@ -33,9 +33,7 @@ const resize = () => { if (textareaElement) { - // Find all ancestors that currently have an active scroll offset. - // This is extremely fast because reading `scrollTop` on a clean layout doesn't trigger reflow, - // and it makes the fix 100% robust without relying on hardcoded CSS classes. + // Remember scrolled ancestors before resizing; typing should not rearrange the scenery. const activeScrollParents: { el: HTMLElement; top: number }[] = []; let p = textareaElement.parentNode; while (p && p !== document.body) { @@ -58,8 +56,7 @@ textareaElement.style.height = `${height}px`; - // Only restore scroll for elements that were actually scrolled. - // This prevents layout thrashing that happens if we blindly set `.scrollTop` on every parent. + // Restore only changed offsets; the rest of the page can stay seated. activeScrollParents.forEach((p) => { if (p.el.scrollTop !== p.top) p.el.scrollTop = p.top; }); diff --git a/src/lib/components/layout/Sidebar.svelte b/src/lib/components/layout/Sidebar.svelte index 21937582a9..d8576f759b 100644 --- a/src/lib/components/layout/Sidebar.svelte +++ b/src/lib/components/layout/Sidebar.svelte @@ -226,12 +226,7 @@ } }; - // Keep the optimistic sidebar highlight in sync with the active chat. Leaving the - // chat view (e.g. navigating to an admin page) clears chatId, and programmatic - // navigation such as cloning moves chatId to a different chat — in both cases the - // previously-selected item must not stay highlighted. The optimistic on-click - // highlight is preserved because a click sets selectedChatId without changing - // chatId, so this reactive only re-runs once chatId catches up to the same value. + // Follow chatId changes on navigation; preserve the click's optimistic highlight until chatId catches up. $: selectedChatId = $chatId || null; let showCreateChannel = false; @@ -410,7 +405,7 @@ ? [...folderMap[folder.parent_id].childrenIds, folder.id] : [folder.id]; - // Sort the children by updated_at field + // Recently updated folders get the front seats. folderMap[folder.parent_id].childrenIds.sort((a, b) => { return folderMap[b].updated_at - folderMap[a].updated_at; }); @@ -445,10 +440,10 @@ return; } - // Check for duplicate names in the same parent + // Check sibling names before adding another folder called "New folder". const siblings = Object.values(folders).filter((folder) => folder.parent_id === parent_id); if (siblings.find((folder) => folder.name.toLowerCase() === name.toLowerCase())) { - // If a folder with the same name already exists, append a number to the name + // Same name? Issue a numbered sequel. let i = 1; while ( siblings.find((folder) => folder.name.toLowerCase() === `${name} ${i}`.toLowerCase()) @@ -500,7 +495,7 @@ }; const initChatList = async () => { - // Reset pagination variables + // Mark the chat list as loading while tags, pinned notes, and chats refresh. console.log('initChatList'); chatListReady = false; diff --git a/src/lib/components/workspace/Knowledge/KnowledgeBase.svelte b/src/lib/components/workspace/Knowledge/KnowledgeBase.svelte index 70a4fbddb6..a6dc3e5dc8 100644 --- a/src/lib/components/workspace/Knowledge/KnowledgeBase.svelte +++ b/src/lib/components/workspace/Knowledge/KnowledgeBase.svelte @@ -632,14 +632,14 @@ if (!pendingSyncFiles?.length) return; try { - // ── 2. Compute checksums ── + // 2. Compute checksums syncing = $i18n.t('Computing checksums ({{count}} files)', { count: pendingSyncFiles.length }); const manifest = await buildDirectoryManifest(pendingSyncFiles); pendingSyncFiles = null; - // ── 3. Diff against knowledge base ── + // 3. Diff against knowledge base syncing = $i18n.t('Comparing with knowledge base...'); const diff = await syncKnowledgeDiff( localStorage.token, @@ -652,7 +652,7 @@ return; } - // ── 4. Cleanup — remove deleted + stale modified files first ── + // 4. Cleanup — remove deleted + stale modified files first const staleFileIds = [ ...diff.deleted.map((d: any) => d.file_id), ...diff.modified.map((m: any) => m.stale_file_id) @@ -665,10 +665,10 @@ browser?.clearRemovedSelection(staleFileIds); } - // ── 5. mkdir — create missing directories (parents first) ── + // 5. Mkdir — create missing directories (parents first) const directoryIdByPath = await createMissingDirectories(diff); - // ── 6. Upload added + modified files ── + // 6. Upload added + modified files const filesToUpload = manifest.filter( (entry) => diff.added.some((a: any) => a.filename === entry.filename && a.path === entry.path) || @@ -679,7 +679,7 @@ entry.path ? directoryIdByPath[entry.path] : null ); - // ── 7. Report ── + // 7. Report if (failedCount === 0) { toast.success( $i18n.t( diff --git a/src/lib/stores/index.ts b/src/lib/stores/index.ts index e730f224fc..c7791ca92b 100644 --- a/src/lib/stores/index.ts +++ b/src/lib/stores/index.ts @@ -15,9 +15,7 @@ import type { I18nOverrides } from '$lib/utils/translationDictionary'; import emojiShortCodes from '$lib/emoji-shortcodes.json'; -// What is held here is the only truth the house knows. -// When it changes, let every room hear at once. -// Backend +// Backend identity and session state export const WEBUI_NAME = writable(APP_NAME); export const WEBUI_VERSION = writable(null); diff --git a/src/lib/utils/codeHighlight.ts b/src/lib/utils/codeHighlight.ts index c77f717d6d..b7f065273b 100644 --- a/src/lib/utils/codeHighlight.ts +++ b/src/lib/utils/codeHighlight.ts @@ -57,10 +57,7 @@ const EXT_OVERRIDE: Record = { jsonl: 'jsonl' }; -// Common extensions that exactly match their Shiki language ID. -// This replaces the runtime `bundledLanguages` import from shiki, which -// pulled ~5-10MB of JavaScript into the initial page load just so -// isCodeFile() could check extension support. +// Keep extension IDs local to avoid loading Shiki's full language bundle just to recognize files. const KNOWN_LANG_IDS = new Set([ 'ada', 'awk', diff --git a/src/lib/utils/connections.ts b/src/lib/utils/connections.ts index f7c7a6aed7..9b4441ac9c 100644 --- a/src/lib/utils/connections.ts +++ b/src/lib/utils/connections.ts @@ -7,7 +7,7 @@ import { getOpenAIConfig, updateOpenAIConfig } from '$lib/apis/openai'; import { getTerminalServerConnections, setTerminalServerConnections } from '$lib/apis/configs'; -// ─── OpenAI Connections ───────────────────────────────── +// OpenAI connections /** * Add an OpenAI-compatible API connection at the system level. @@ -74,7 +74,7 @@ export const removeOpenAIConnection = async (token: string, url: string) => { }); }; -// ─── Terminal Server Connections ──────────────────────── +// Terminal server connections /** * Add a terminal server connection at the system level. diff --git a/src/lib/utils/hash.ts b/src/lib/utils/hash.ts index f71bc2e3ab..1b1940aaa3 100644 --- a/src/lib/utils/hash.ts +++ b/src/lib/utils/hash.ts @@ -26,7 +26,7 @@ function hexEncode(bytes: Uint8Array): string { return hex.join(''); } -// ── Pure-JS SHA-256 (RFC 6234) ────────────────────────────────────────────── +// Pure-JS SHA-256 (RFC 6234) // Used only when crypto.subtle is unavailable (HTTP deployments). const K: Uint32Array = new Uint32Array([ diff --git a/src/lib/utils/index.ts b/src/lib/utils/index.ts index a69a505bb2..23c440d090 100644 --- a/src/lib/utils/index.ts +++ b/src/lib/utils/index.ts @@ -29,11 +29,9 @@ import markedKatexExtension from '$lib/utils/marked/katex-extension'; import hljs from 'highlight.js'; import { decode } from 'html-entities'; -////////////////////////// // Helper functions // No one thanks the foundation, but without it the // house falls. Let the quiet work here hold. -////////////////////////// export const resolveDefaultModelIds = ( models: { id: string; info?: { meta?: { hidden?: boolean } } }[], @@ -245,10 +243,7 @@ export const convertMessagesToHistory = (messages) => { return history; }; -// Repair structurally-malformed history nodes from failed regenerations. -// A lost assistant placeholder may exist under its map key with only -// completion fields (content/done/error), missing id/role/parentId. -// Reconstruct graph fields so already-corrupted chats recover on open. +// Rebuild missing graph fields so chats with incomplete regeneration placeholders can reopen. export const sanitizeHistory = (history) => { if (!history?.messages || typeof history.messages !== 'object') return; @@ -703,32 +698,27 @@ export const extractCurlyBraceWords = (text) => { export const removeLastWordFromString = (inputString, wordString) => { console.log('inputString', inputString); - // Split the string by newline characters to handle lines separately + // Only edit the final line; preserve earlier lines verbatim. const lines = inputString.split('\n'); - // Take the last line to operate only on it const lastLine = lines.pop(); - // Split the last line into an array of words const words = lastLine.split(' '); - // Conditional to check for the last word removal + // Remove the final token if it matches, or the escaped hash marker when wordString is empty. if (words.at(-1) === wordString || (wordString === '' && words.at(-1) === '\\#')) { - words.pop(); // Remove last word if condition is satisfied + words.pop(); } - // Join the remaining words back into a string and handle space correctly let updatedLastLine = words.join(' '); - // Add a trailing space to the updated last line if there are still words + // Append a space to any nonempty result, even when no token was removed. if (updatedLastLine !== '') { updatedLastLine += ' '; } - // Combine the lines together again, placing the updated last line back in const resultString = [...lines, updatedLastLine].join('\n'); - // Return the final string console.log('resultString', resultString); return resultString; @@ -741,7 +731,7 @@ export const removeFirstHashWord = (inputString) => { // Find the index of the first word that starts with # const index = words.findIndex((word) => word.startsWith('#')); - // Remove the first word with # + // Retire the first hashtag; the rest of the sentence keeps its job. if (index !== -1) { words.splice(index, 1); } @@ -753,13 +743,13 @@ export const removeFirstHashWord = (inputString) => { }; export const transformFileName = (fileName) => { - // Convert to lowercase + // Lowercase the filename; shouting does not help us find it. const lowerCaseFileName = fileName.toLowerCase(); - // Remove special characters using regular expression + // Strip punctuation; word characters and whitespace make the guest list. const sanitizedFileName = lowerCaseFileName.replace(/[^\w\s]/g, ''); - // Replace spaces with dashes + // Give each whitespace run one dash, regardless of its enthusiasm. const finalFileName = sanitizedFileName.replace(/\s+/g, '-'); return finalFileName; @@ -779,7 +769,7 @@ export const calculateSHA256 = async (file) => { reader.readAsArrayBuffer(file); try { - // Wait for the FileReader to finish reading the file + // Wait for the bytes; hashing an IOU would be optimistic. const buffer = await readFile; // Convert the ArrayBuffer to a Uint8Array @@ -788,7 +778,7 @@ export const calculateSHA256 = async (file) => { // Calculate the SHA-256 hash using Web Crypto API const hashBuffer = await crypto.subtle.digest('SHA-256', uint8Array); - // Convert the hash to a hexadecimal string + // Dress the hash in hex: two characters per byte, no exceptions. const hashArray = Array.from(new Uint8Array(hashBuffer)); const hashHex = hashArray.map((byte) => byte.toString(16).padStart(2, '0')).join(''); @@ -800,7 +790,7 @@ export const calculateSHA256 = async (file) => { }; export const getImportOrigin = (_chats) => { - // Check what external service chat imports are from + // Check the import paperwork to see which chat service sent this. // ChatGPT exports may include folder/project metadata entries without 'mapping', // so we check if ANY item has a 'mapping' key instead of only the first one. if (_chats.some((chat) => 'mapping' in chat)) { @@ -810,7 +800,7 @@ export const getImportOrigin = (_chats) => { }; export const getUserPosition = async (raw = false) => { - // Get the user's location using the Geolocation API + // Ask the browser for coordinates; we have not installed a crystal ball. const position = await new Promise((resolve, reject) => { navigator.geolocation.getCurrentPosition(resolve, reject); }).catch((error) => { @@ -848,7 +838,7 @@ const extractOpenAIMessageContent = (message): string => { }; const convertOpenAIMessages = (convo) => { - // Parse OpenAI chat messages and create chat dictionary for creating new chats + // Unpack the OpenAI message map into our chat shape. Moving day for conversations. const mapping = convo['mapping']; const messages = []; let currentId = ''; @@ -930,12 +920,12 @@ const validateChat = (chat) => { // Because ChatGPT sometimes has features we can't use like DALL-E or might have corrupted messages, need to validate const messages = chat.messages; - // Check if messages array is empty + // An empty conversation has nothing to bring to the import party. if (messages.length === 0) { return false; } - // Every message's content should be a string + // Every message needs string content; mystery objects must use another entrance. for (const message of messages) { if (typeof message.content !== 'string') { return false; @@ -946,7 +936,7 @@ const validateChat = (chat) => { }; export const convertOpenAIChats = (_chats) => { - // Create a list of dictionaries with each conversation from import + // Give each imported conversation its own seat in the chat list. const chats = []; let failed = 0; let skipped = 0; @@ -1028,11 +1018,7 @@ export const isYoutubeUrl = (url: string) => { }; export const removeEmojis = (str: string) => { - // Use Unicode property escape with the 'v' flag (ES2024) to match all - // standardised emoji sequences, including text-presentation emoji + variation - // selector (e.g. ❤️, ☀️, ✅), keycap sequences (e.g. 1️⃣), ZWJ families - // (e.g. 👨👩👧👦) and flag sequences (e.g. 🏳️🌈). - // The previous surrogate-pair regex missed the entire BMP emoji category. + // Match complete emoji sequences with RGI_Emoji, including variation selectors, keycaps, and ZWJ groups. const emojiRegex = /\p{RGI_Emoji}/gv; // Replace emojis with an empty string @@ -1085,10 +1071,7 @@ export const removeDetails = (content, types) => { }; export const removeAllDetails = (content) => { - // First pass: strip blocks on the full string before code-fence - // splitting, so blocks whose body contains triple backticks are caught. - // (replaceOutsideCode splits on ``` fences, which breaks the - // regex when the opening and closing tags land in different segments.) + // Strip details before splitting code fences, which can separate opening and closing tags. content = content.replace(/]*>[\s\S]*?<\/details>/gi, ''); // Second pass: catch any remaining blocks that live outside code fences return replaceOutsideCode(content, (segment) => { @@ -1200,14 +1183,7 @@ export const extractSentencesForAudio = (text: string) => { }; export const getMessageContentParts = (content: string, splitOn: string = 'punctuation') => { - // Strip blocks directly on the full string before any - // code-block-aware processing. removeAllDetails (which callers use) - // applies the regex via replaceOutsideCode, which splits on triple- - // backtick code fences first. If a block contains code - // fences (e.g. reasoning with code examples), the opening and - // closing tags land in separate segments and the regex fails, - // leaking thinking content into TTS. Applying the strip here on - // the full string catches those cases. (Fixes #22197) + // Strip details before splitting code fences, which can separate their tags and leak reasoning into TTS (#22197). content = content.replace(/]*>[\s\S]*?<\/details>/gi, ''); const messageContentParts: string[] = []; @@ -1229,7 +1205,7 @@ export const getMessageContentParts = (content: string, splitOn: string = 'punct }; export const blobToFile = (blob, fileName) => { - // Create a new File object from the Blob + // Give the Blob a filename; it is ready to introduce itself as a File. const file = new File([blob], fileName, { type: blob.type }); return file; }; @@ -2387,11 +2363,7 @@ export const getCodeBlockContents = (content: string): object => { let codeBlocks = []; - // Groups of related HTML/CSS/JS blocks. Each HTML block starts a new group; - // CSS and JS blocks attach to the current (most recent) group. - // This preserves the existing behaviour for "dumb" models that output - // separate html/css/js blocks meant to form a single page, while also - // allowing multiple distinct HTML blocks to produce separate artifacts. + // Each HTML block starts an artifact; subsequent CSS and JS join the most recent group. let htmlGroups: Array<{ html: string; css: string; js: string }> = []; const initDefaultGroup = () => { diff --git a/src/lib/utils/marked/katex-extension.ts b/src/lib/utils/marked/katex-extension.ts index 81425e5fe2..0ee31aeb63 100644 --- a/src/lib/utils/marked/katex-extension.ts +++ b/src/lib/utils/marked/katex-extension.ts @@ -19,11 +19,6 @@ const ALLOWED_SURROUNDING_CHARS = // markdown rendering time to be spent in KaTeX regex compilation. const ALLOWED_SURROUNDING_CHARS_REGEX = new RegExp(`[${ALLOWED_SURROUNDING_CHARS}]`, 'u'); -// const DELIMITER_LIST = [ -// { left: '$$', right: '$$', display: false }, -// { left: '$', right: '$', display: false }, -// ]; - // const inlineRule = /^(\${1,2})(?!\$)((?:\\.|[^\\\n])*?(?:\\.|[^\\\n\$]))\1(?=[\s?!\.,:？！。，：]|$)/; // const blockRule = /^(\${1,2})\n((?:\\[^]|[^\\])+?)\n\1(?:\n|$)/; diff --git a/src/lib/utils/pptxToHtml.ts b/src/lib/utils/pptxToHtml.ts index a4f786e294..7497490f87 100644 --- a/src/lib/utils/pptxToHtml.ts +++ b/src/lib/utils/pptxToHtml.ts @@ -1120,7 +1120,7 @@ export async function pptxToImages( const zip = (await JSZip.loadAsync(buffer)) as ZipLike; activeThemeColors = await readThemeColors(zip); - // ── Read slide dimensions from presentation.xml ────────────────── + // Read slide dimensions from presentation.xml let slideW = 960; let slideH = 540; const presXml = zip.file('ppt/presentation.xml'); @@ -1134,7 +1134,7 @@ export async function pptxToImages( } } - // ── Collect media files (images) as base64 data URIs ───────────── + // Collect media files (images) as base64 data URIs const media: Record = {}; const mediaFiles = Object.keys(zip.files).filter((f) => f.startsWith('ppt/media/')); await Promise.all( @@ -1157,7 +1157,7 @@ export async function pptxToImages( }) ); - // ── Discover slide files ───────────────────────────────────────── + // Discover slide files const slideFiles = await presentationSlides(new OfficePackage(zip as import('jszip'))); const images: string[] = []; @@ -1174,7 +1174,7 @@ export async function pptxToImages( const masterDoc = masterPath ? await readXml(zip, masterPath) : null; const placeholderSources = [collectPlaceholders(layoutDoc), collectPlaceholders(masterDoc)]; - // ── Create canvas and render slide ─────────────────────────── + // Create canvas and render slide const canvas = document.createElement('canvas'); canvas.width = slideW; canvas.height = slideH; @@ -1228,7 +1228,7 @@ export async function pptxToImages( renderFill(ctx, shape.getElementsByTagName('p:spPr')[0], rect); } - // ── Picture ────────────────────────────────────────────── + // Picture const blipFill = shape.getElementsByTagName('p:blipFill')[0]; if (blipFill) { const blip = blipFill.getElementsByTagName('a:blip')[0]; @@ -1248,7 +1248,7 @@ export async function pptxToImages( continue; } - // ── Text shape ─────────────────────────────────────────── + // Text shape const txBody = shape.getElementsByTagName('p:txBody')[0]; if (!txBody) continue; diff --git a/src/lib/workers/KokoroWorker.ts b/src/lib/workers/KokoroWorker.ts index 78a8663634..62b683d7b5 100644 --- a/src/lib/workers/KokoroWorker.ts +++ b/src/lib/workers/KokoroWorker.ts @@ -24,7 +24,7 @@ export class KokoroWorker { this.worker = new WorkerInstance(); - // Handle worker messages + // Listen for news from the voice booth. this.worker.onmessage = (event) => { const { status, error, audioUrl } = event.data; @@ -34,7 +34,7 @@ export class KokoroWorker { console.error(error); this.initialized = false; } else if (status === 'generate:complete') { - // Resolve promise from queue + // The clip is ready; hand it to the request at the front of the queue. const request = this.requestQueue.shift(); if (request) { request.resolve(audioUrl); diff --git a/src/lib/workers/kokoro.worker.ts b/src/lib/workers/kokoro.worker.ts index e91f55b335..63723dafa4 100644 --- a/src/lib/workers/kokoro.worker.ts +++ b/src/lib/workers/kokoro.worker.ts @@ -33,7 +33,7 @@ self.onmessage = async (event) => { if (type === 'generate') { if (!isInitialized || !tts) { - // Ensure model is initialized + // No model, no monologue. Report that before asking it to speak. self.postMessage({ status: 'generate:error', error: 'TTS model not initialized' }); return; } diff --git a/src/lib/workers/pyodide.worker.ts b/src/lib/workers/pyodide.worker.ts index 9318d15425..55bcc62c99 100644 --- a/src/lib/workers/pyodide.worker.ts +++ b/src/lib/workers/pyodide.worker.ts @@ -13,9 +13,7 @@ declare global { } } -// --------------------------------------------------------------------------- // Pyodide bootstrap -// --------------------------------------------------------------------------- let pyodideReady: Promise | null = null; @@ -46,23 +44,23 @@ async function loadPyodideAndPackages(packages: string[] = []) { packages: ['micropip'] }); - // Create the upload directory and mount IDBFS for persistence + // Give uploads an IDBFS home; RAM is a short-term rental. const uploadDir = '/mnt/uploads'; self.pyodide.FS.mkdirTree(uploadDir); self.pyodide.FS.mount(self.pyodide.FS.filesystems.IDBFS, {}, '/mnt'); - // Load persisted files from IndexedDB + // Unpack the files IndexedDB kept between visits. await new Promise((resolve) => { (self.pyodide.FS as any).syncfs(true, (err: Error | null) => { if (err) { console.error('Error syncing from IndexedDB:', err); } - // Always resolve — missing data is fine on first run + // Continue startup even if restoring persisted files failed; the error is logged above. resolve(); }); }); - // Ensure /mnt/uploads still exists after sync (first-time init) + // First visit? Make sure /mnt/uploads has actually moved in. try { self.pyodide.FS.stat(uploadDir); } catch { @@ -104,9 +102,7 @@ function persistFS() { }); } -// --------------------------------------------------------------------------- // FS operations -// --------------------------------------------------------------------------- function fsUploadFiles(files: { name: string; data: ArrayBuffer }[], dir = '/mnt/uploads') { try { @@ -170,9 +166,7 @@ function fsMkdir(path: string) { self.pyodide.FS.mkdirTree(path); } -// --------------------------------------------------------------------------- // Code execution -// --------------------------------------------------------------------------- async function executeCode( id: string, @@ -190,9 +184,9 @@ async function executeCode( } try { - // check if matplotlib is imported in the code + // Install the plotting hook when the source mentions matplotlib and the package is loaded. if (code.includes('matplotlib') && 'matplotlib' in self.pyodide.loadedPackages) { - // Override plt.show() to return base64 image + // Override plt.show() to print a PNG data URL to stdout and clear the current figure. await self.pyodide.runPythonAsync(`import base64 import os from io import BytesIO @@ -235,9 +229,7 @@ matplotlib.pyplot.show = show`); self.postMessage({ id, result: self.result, stdout: self.stdout, stderr: self.stderr }); } -// --------------------------------------------------------------------------- // Message handler -// --------------------------------------------------------------------------- self.onmessage = async (event) => { const data = event.data; @@ -321,23 +313,21 @@ self.onmessage = async (event) => { } }; -// --------------------------------------------------------------------------- // Helpers -// --------------------------------------------------------------------------- function processResult(result: any): any { - // Catch and always return JSON-safe string representations + // Convert proxies and nested values to JavaScript data; report conversion failures as text. try { if (result == null) { - // Handle null and undefined + // Null and undefined share one JSON address: null. return null; } if (typeof result === 'string' || typeof result === 'number' || typeof result === 'boolean') { - // Handle primitive types directly + // Strings, numbers, and booleans already speak JSON. return result; } if (typeof result === 'bigint') { - // Convert BigInt to a string for JSON-safe representation + // BigInt needs a string disguise to get past JSON. return result.toString(); } if (Array.isArray(result)) { @@ -345,7 +335,7 @@ function processResult(result: any): any { return result.map((item) => processResult(item)); } if (typeof result.toJs === 'function') { - // If it's a Pyodide proxy object (e.g., Pandas DF, Numpy Array), convert to JS and process recursively + // Convert Python proxies; stringify if conversion still yields a proxy, otherwise recurse. const converted = result.toJs(); return typeof converted?.toJs === 'function' ? converted.toString() diff --git a/src/routes/+layout.js b/src/routes/+layout.js index 4f284f1335..d63a297013 100644 --- a/src/routes/+layout.js +++ b/src/routes/+layout.js @@ -1,16 +1,5 @@ -// if you want to generate a static html file -// for your page. -// Documentation: https://kit.svelte.dev/docs/page-options#prerender -// export const prerender = true; - -// if you want to Generate a SPA -// you have to set ssr to false. -// This is not the case (so set as true or comment the line) -// Documentation: https://kit.svelte.dev/docs/page-options#ssr +// Render in the browser; server-side rendering is disabled. export const ssr = false; -// How to manage the trailing slashes in the URLs -// the URL for about page will be /about with 'ignore' (default) -// the URL for about page will be /about/ with 'always' -// https://kit.svelte.dev/docs/page-options#trailingslash +// Accept URLs with or without a trailing slash. export const trailingSlash = 'ignore'; diff --git a/src/routes/s/[id]/+page.svelte b/src/routes/s/[id]/+page.svelte index 40f7c4ea86..9563c2c74f 100644 --- a/src/routes/s/[id]/+page.svelte +++ b/src/routes/s/[id]/+page.svelte @@ -53,9 +53,7 @@ loadAndScroll(); } - ////////////////////////// // Web functions - ////////////////////////// const loadAndScroll = async () => { if (await loadSharedChat()) {
node for each line + // Keep the first line inline and wrap subsequent lines in paragraphs. const lines = text.split('\n'); const nodes = lines.map( (line, index) => @@ -601,17 +594,17 @@ : state.schema.nodes.paragraph.create({}, line ? state.schema.text(line) : undefined) // Subsequent lines are paragraphs ); - // Build and dispatch the transaction to replace the word at cursor + // Replace the current word in the pending transaction; dispatch after setting the selection. tr = tr.replaceWith(start, end, nodes); let newSelectionPos; - // +1 because the insert happens at start, so last para starts at (start + sum of all previous nodes' sizes) + // Sum node sizes from the insertion point to locate the end of the inserted content. let lastPos = start; for (let i = 0; i < nodes.length; i++) { lastPos += nodes[i].nodeSize; } - // Place cursor inside the last paragraph at its end + // Use that boundary to find the nearest valid text selection below. newSelectionPos = lastPos; tr = tr.setSelection(TextSelection.near(tr.doc.resolve(newSelectionPos))); @@ -758,7 +751,7 @@ export const focus = (options: FocusOptions = {}) => { if (editor && editor.view) { - // Check if the editor is destroyed + // Retired editors do not take focus requests. if (editor.isDestroyed) { return; } @@ -768,7 +761,7 @@ editor.view.dom.focus(options); } else { editor.view.focus(); - // Scroll to the current selection + // Bring the selection into view; the caret should not play hide-and-seek. editor.view.dispatch(editor.view.state.tr.scrollIntoView()); } } catch (e) { diff --git a/src/lib/components/common/RichTextInput/AutoCompletion.js b/src/lib/components/common/RichTextInput/AutoCompletion.js index 025ee554cc..b8828157d1 100644 --- a/src/lib/components/common/RichTextInput/AutoCompletion.js +++ b/src/lib/components/common/RichTextInput/AutoCompletion.js @@ -187,26 +187,6 @@ export const AIAutocompletion = Extension.create({ if (event.key === 'Tab') { if (acceptFollowUpSuggestion(view)) return true; - // if (!node.attrs['data-suggestion']) { - // // Generate completion - // if (loading) return true - // loading = true - // const prompt = node.textContent - // this.options.generateCompletion(prompt).then(suggestion => { - // if (suggestion && suggestion.trim() !== '') { - // dispatch(state.tr.setNodeMarkup($head.before(), null, { - // ...node.attrs, - // class: 'ai-autocompletion', - // 'data-prompt': prompt, - // 'data-suggestion': suggestion, - // })) - // } - // // If suggestion is empty or null, do nothing - // }).finally(() => { - // loading = false - // }) - // } - if (node.attrs['data-suggestion']) { // Accept suggestion const suggestion = node.attrs['data-suggestion']; @@ -283,34 +263,6 @@ export const AIAutocompletion = Extension.create({ } return false; }, - // Add mousedown behavior - // mouseup: (view, event) => { - // const { state, dispatch } = view; - // const { selection } = state; - // const { $head } = selection; - // const node = $head.parent; - - // // Reset debounce timer on mouse click - // clearTimeout(debounceTimer); - - // // If a suggestion exists and the cursor moves, remove the suggestion - // if ( - // node.type.name === 'paragraph' && - // node.attrs['data-suggestion'] && - // view.state.selection.$head.pos !== view.state.selection.$head.end() - // ) { - // dispatch( - // state.tr.setNodeMarkup($head.before(), null, { - // ...node.attrs, - // class: null, - // 'data-prompt': null, - // 'data-suggestion': null - // }) - // ); - // } - - // return false; - // } mouseup: (view, event) => { const { state, dispatch } = view; diff --git a/src/lib/components/common/RichTextInput/listDragHandlePlugin.js b/src/lib/components/common/RichTextInput/listDragHandlePlugin.js index d0ce93f380..ac78b1ff39 100644 --- a/src/lib/components/common/RichTextInput/listDragHandlePlugin.js +++ b/src/lib/components/common/RichTextInput/listDragHandlePlugin.js @@ -192,7 +192,7 @@ export function listDragHandlePlugin(options = {}) { return wantedType.create(newAttrs, Fragment.from(normalizedContent), itemNode.marks); } - // ---------- decorations ---------- + // Decorations function buildHandleDecos(doc) { const decos = []; doc.descendants((node, pos) => { @@ -269,7 +269,7 @@ export function listDragHandlePlugin(options = {}) { return { ...li, dom, mode }; } - // ---------- state ---------- + // State const init = (state) => ({ decorations: buildHandleDecos(state.doc), dragging: null, // {fromStart, startMouse:{x,y}, ghostEl, active} @@ -312,7 +312,7 @@ export function listDragHandlePlugin(options = {}) { return deco; }; - // ---------- helpers ---------- + // Helpers const setDrag = (view, dragging) => view.dispatch(view.state.tr.setMeta(listPointerDragKey, { type: 'set-drag', dragging })); const setDrop = (view, drop) => @@ -422,7 +422,7 @@ export function listDragHandlePlugin(options = {}) { if (ghost) ghost.style.transform = `translate(${Math.round(dx)}px, ${Math.round(dy)}px)`; }; - // ---------- plugin ---------- + // Plugin return new Plugin({ key: listPointerDragKey, state: { init: (_, state) => init(state), apply }, diff --git a/src/lib/components/common/Textarea.svelte b/src/lib/components/common/Textarea.svelte index 2eb32e84cf..48a58e1e95 100644 --- a/src/lib/components/common/Textarea.svelte +++ b/src/lib/components/common/Textarea.svelte @@ -33,9 +33,7 @@ const resize = () => { if (textareaElement) { - // Find all ancestors that currently have an active scroll offset. - // This is extremely fast because reading `scrollTop` on a clean layout doesn't trigger reflow, - // and it makes the fix 100% robust without relying on hardcoded CSS classes. + // Remember scrolled ancestors before resizing; typing should not rearrange the scenery. const activeScrollParents: { el: HTMLElement; top: number }[] = []; let p = textareaElement.parentNode; while (p && p !== document.body) { @@ -58,8 +56,7 @@ textareaElement.style.height = `${height}px`; - // Only restore scroll for elements that were actually scrolled. - // This prevents layout thrashing that happens if we blindly set `.scrollTop` on every parent. + // Restore only changed offsets; the rest of the page can stay seated. activeScrollParents.forEach((p) => { if (p.el.scrollTop !== p.top) p.el.scrollTop = p.top; }); diff --git a/src/lib/components/layout/Sidebar.svelte b/src/lib/components/layout/Sidebar.svelte index 21937582a9..d8576f759b 100644 --- a/src/lib/components/layout/Sidebar.svelte +++ b/src/lib/components/layout/Sidebar.svelte @@ -226,12 +226,7 @@ } }; - // Keep the optimistic sidebar highlight in sync with the active chat. Leaving the - // chat view (e.g. navigating to an admin page) clears chatId, and programmatic - // navigation such as cloning moves chatId to a different chat — in both cases the - // previously-selected item must not stay highlighted. The optimistic on-click - // highlight is preserved because a click sets selectedChatId without changing - // chatId, so this reactive only re-runs once chatId catches up to the same value. + // Follow chatId changes on navigation; preserve the click's optimistic highlight until chatId catches up. $: selectedChatId = $chatId || null; let showCreateChannel = false; @@ -410,7 +405,7 @@ ? [...folderMap[folder.parent_id].childrenIds, folder.id] : [folder.id]; - // Sort the children by updated_at field + // Recently updated folders get the front seats. folderMap[folder.parent_id].childrenIds.sort((a, b) => { return folderMap[b].updated_at - folderMap[a].updated_at; }); @@ -445,10 +440,10 @@ return; } - // Check for duplicate names in the same parent + // Check sibling names before adding another folder called "New folder". const siblings = Object.values(folders).filter((folder) => folder.parent_id === parent_id); if (siblings.find((folder) => folder.name.toLowerCase() === name.toLowerCase())) { - // If a folder with the same name already exists, append a number to the name + // Same name? Issue a numbered sequel. let i = 1; while ( siblings.find((folder) => folder.name.toLowerCase() === `${name} ${i}`.toLowerCase()) @@ -500,7 +495,7 @@ }; const initChatList = async () => { - // Reset pagination variables + // Mark the chat list as loading while tags, pinned notes, and chats refresh. console.log('initChatList'); chatListReady = false; diff --git a/src/lib/components/workspace/Knowledge/KnowledgeBase.svelte b/src/lib/components/workspace/Knowledge/KnowledgeBase.svelte index 70a4fbddb6..a6dc3e5dc8 100644 --- a/src/lib/components/workspace/Knowledge/KnowledgeBase.svelte +++ b/src/lib/components/workspace/Knowledge/KnowledgeBase.svelte @@ -632,14 +632,14 @@ if (!pendingSyncFiles?.length) return; try { - // ── 2. Compute checksums ── + // 2. Compute checksums syncing = $i18n.t('Computing checksums ({{count}} files)', { count: pendingSyncFiles.length }); const manifest = await buildDirectoryManifest(pendingSyncFiles); pendingSyncFiles = null; - // ── 3. Diff against knowledge base ── + // 3. Diff against knowledge base syncing = $i18n.t('Comparing with knowledge base...'); const diff = await syncKnowledgeDiff( localStorage.token, @@ -652,7 +652,7 @@ return; } - // ── 4. Cleanup — remove deleted + stale modified files first ── + // 4. Cleanup — remove deleted + stale modified files first const staleFileIds = [ ...diff.deleted.map((d: any) => d.file_id), ...diff.modified.map((m: any) => m.stale_file_id) @@ -665,10 +665,10 @@ browser?.clearRemovedSelection(staleFileIds); } - // ── 5. mkdir — create missing directories (parents first) ── + // 5. Mkdir — create missing directories (parents first) const directoryIdByPath = await createMissingDirectories(diff); - // ── 6. Upload added + modified files ── + // 6. Upload added + modified files const filesToUpload = manifest.filter( (entry) => diff.added.some((a: any) => a.filename === entry.filename && a.path === entry.path) || @@ -679,7 +679,7 @@ entry.path ? directoryIdByPath[entry.path] : null ); - // ── 7. Report ── + // 7. Report if (failedCount === 0) { toast.success( $i18n.t( diff --git a/src/lib/stores/index.ts b/src/lib/stores/index.ts index e730f224fc..c7791ca92b 100644 --- a/src/lib/stores/index.ts +++ b/src/lib/stores/index.ts @@ -15,9 +15,7 @@ import type { I18nOverrides } from '$lib/utils/translationDictionary'; import emojiShortCodes from '$lib/emoji-shortcodes.json'; -// What is held here is the only truth the house knows. -// When it changes, let every room hear at once. -// Backend +// Backend identity and session state export const WEBUI_NAME = writable(APP_NAME); export const WEBUI_VERSION = writable(null); diff --git a/src/lib/utils/codeHighlight.ts b/src/lib/utils/codeHighlight.ts index c77f717d6d..b7f065273b 100644 --- a/src/lib/utils/codeHighlight.ts +++ b/src/lib/utils/codeHighlight.ts @@ -57,10 +57,7 @@ const EXT_OVERRIDE: Record = { jsonl: 'jsonl' }; -// Common extensions that exactly match their Shiki language ID. -// This replaces the runtime `bundledLanguages` import from shiki, which -// pulled ~5-10MB of JavaScript into the initial page load just so -// isCodeFile() could check extension support. +// Keep extension IDs local to avoid loading Shiki's full language bundle just to recognize files. const KNOWN_LANG_IDS = new Set([ 'ada', 'awk', diff --git a/src/lib/utils/connections.ts b/src/lib/utils/connections.ts index f7c7a6aed7..9b4441ac9c 100644 --- a/src/lib/utils/connections.ts +++ b/src/lib/utils/connections.ts @@ -7,7 +7,7 @@ import { getOpenAIConfig, updateOpenAIConfig } from '$lib/apis/openai'; import { getTerminalServerConnections, setTerminalServerConnections } from '$lib/apis/configs'; -// ─── OpenAI Connections ───────────────────────────────── +// OpenAI connections /** * Add an OpenAI-compatible API connection at the system level. @@ -74,7 +74,7 @@ export const removeOpenAIConnection = async (token: string, url: string) => { }); }; -// ─── Terminal Server Connections ──────────────────────── +// Terminal server connections /** * Add a terminal server connection at the system level. diff --git a/src/lib/utils/hash.ts b/src/lib/utils/hash.ts index f71bc2e3ab..1b1940aaa3 100644 --- a/src/lib/utils/hash.ts +++ b/src/lib/utils/hash.ts @@ -26,7 +26,7 @@ function hexEncode(bytes: Uint8Array): string { return hex.join(''); } -// ── Pure-JS SHA-256 (RFC 6234) ────────────────────────────────────────────── +// Pure-JS SHA-256 (RFC 6234) // Used only when crypto.subtle is unavailable (HTTP deployments). const K: Uint32Array = new Uint32Array([ diff --git a/src/lib/utils/index.ts b/src/lib/utils/index.ts index a69a505bb2..23c440d090 100644 --- a/src/lib/utils/index.ts +++ b/src/lib/utils/index.ts @@ -29,11 +29,9 @@ import markedKatexExtension from '$lib/utils/marked/katex-extension'; import hljs from 'highlight.js'; import { decode } from 'html-entities'; -////////////////////////// // Helper functions // No one thanks the foundation, but without it the // house falls. Let the quiet work here hold. -////////////////////////// export const resolveDefaultModelIds = ( models: { id: string; info?: { meta?: { hidden?: boolean } } }[], @@ -245,10 +243,7 @@ export const convertMessagesToHistory = (messages) => { return history; }; -// Repair structurally-malformed history nodes from failed regenerations. -// A lost assistant placeholder may exist under its map key with only -// completion fields (content/done/error), missing id/role/parentId. -// Reconstruct graph fields so already-corrupted chats recover on open. +// Rebuild missing graph fields so chats with incomplete regeneration placeholders can reopen. export const sanitizeHistory = (history) => { if (!history?.messages || typeof history.messages !== 'object') return; @@ -703,32 +698,27 @@ export const extractCurlyBraceWords = (text) => { export const removeLastWordFromString = (inputString, wordString) => { console.log('inputString', inputString); - // Split the string by newline characters to handle lines separately + // Only edit the final line; preserve earlier lines verbatim. const lines = inputString.split('\n'); - // Take the last line to operate only on it const lastLine = lines.pop(); - // Split the last line into an array of words const words = lastLine.split(' '); - // Conditional to check for the last word removal + // Remove the final token if it matches, or the escaped hash marker when wordString is empty. if (words.at(-1) === wordString || (wordString === '' && words.at(-1) === '\\#')) { - words.pop(); // Remove last word if condition is satisfied + words.pop(); } - // Join the remaining words back into a string and handle space correctly let updatedLastLine = words.join(' '); - // Add a trailing space to the updated last line if there are still words + // Append a space to any nonempty result, even when no token was removed. if (updatedLastLine !== '') { updatedLastLine += ' '; } - // Combine the lines together again, placing the updated last line back in const resultString = [...lines, updatedLastLine].join('\n'); - // Return the final string console.log('resultString', resultString); return resultString; @@ -741,7 +731,7 @@ export const removeFirstHashWord = (inputString) => { // Find the index of the first word that starts with # const index = words.findIndex((word) => word.startsWith('#')); - // Remove the first word with # + // Retire the first hashtag; the rest of the sentence keeps its job. if (index !== -1) { words.splice(index, 1); } @@ -753,13 +743,13 @@ export const removeFirstHashWord = (inputString) => { }; export const transformFileName = (fileName) => { - // Convert to lowercase + // Lowercase the filename; shouting does not help us find it. const lowerCaseFileName = fileName.toLowerCase(); - // Remove special characters using regular expression + // Strip punctuation; word characters and whitespace make the guest list. const sanitizedFileName = lowerCaseFileName.replace(/[^\w\s]/g, ''); - // Replace spaces with dashes + // Give each whitespace run one dash, regardless of its enthusiasm. const finalFileName = sanitizedFileName.replace(/\s+/g, '-'); return finalFileName; @@ -779,7 +769,7 @@ export const calculateSHA256 = async (file) => { reader.readAsArrayBuffer(file); try { - // Wait for the FileReader to finish reading the file + // Wait for the bytes; hashing an IOU would be optimistic. const buffer = await readFile; // Convert the ArrayBuffer to a Uint8Array @@ -788,7 +778,7 @@ export const calculateSHA256 = async (file) => { // Calculate the SHA-256 hash using Web Crypto API const hashBuffer = await crypto.subtle.digest('SHA-256', uint8Array); - // Convert the hash to a hexadecimal string + // Dress the hash in hex: two characters per byte, no exceptions. const hashArray = Array.from(new Uint8Array(hashBuffer)); const hashHex = hashArray.map((byte) => byte.toString(16).padStart(2, '0')).join(''); @@ -800,7 +790,7 @@ export const calculateSHA256 = async (file) => { }; export const getImportOrigin = (_chats) => { - // Check what external service chat imports are from + // Check the import paperwork to see which chat service sent this. // ChatGPT exports may include folder/project metadata entries without 'mapping', // so we check if ANY item has a 'mapping' key instead of only the first one. if (_chats.some((chat) => 'mapping' in chat)) { @@ -810,7 +800,7 @@ export const getImportOrigin = (_chats) => { }; export const getUserPosition = async (raw = false) => { - // Get the user's location using the Geolocation API + // Ask the browser for coordinates; we have not installed a crystal ball. const position = await new Promise((resolve, reject) => { navigator.geolocation.getCurrentPosition(resolve, reject); }).catch((error) => { @@ -848,7 +838,7 @@ const extractOpenAIMessageContent = (message): string => { }; const convertOpenAIMessages = (convo) => { - // Parse OpenAI chat messages and create chat dictionary for creating new chats + // Unpack the OpenAI message map into our chat shape. Moving day for conversations. const mapping = convo['mapping']; const messages = []; let currentId = ''; @@ -930,12 +920,12 @@ const validateChat = (chat) => { // Because ChatGPT sometimes has features we can't use like DALL-E or might have corrupted messages, need to validate const messages = chat.messages; - // Check if messages array is empty + // An empty conversation has nothing to bring to the import party. if (messages.length === 0) { return false; } - // Every message's content should be a string + // Every message needs string content; mystery objects must use another entrance. for (const message of messages) { if (typeof message.content !== 'string') { return false; @@ -946,7 +936,7 @@ const validateChat = (chat) => { }; export const convertOpenAIChats = (_chats) => { - // Create a list of dictionaries with each conversation from import + // Give each imported conversation its own seat in the chat list. const chats = []; let failed = 0; let skipped = 0; @@ -1028,11 +1018,7 @@ export const isYoutubeUrl = (url: string) => { }; export const removeEmojis = (str: string) => { - // Use Unicode property escape with the 'v' flag (ES2024) to match all - // standardised emoji sequences, including text-presentation emoji + variation - // selector (e.g. ❤️, ☀️, ✅), keycap sequences (e.g. 1️⃣), ZWJ families - // (e.g. 👨👩👧👦) and flag sequences (e.g. 🏳️🌈). - // The previous surrogate-pair regex missed the entire BMP emoji category. + // Match complete emoji sequences with RGI_Emoji, including variation selectors, keycaps, and ZWJ groups. const emojiRegex = /\p{RGI_Emoji}/gv; // Replace emojis with an empty string @@ -1085,10 +1071,7 @@ export const removeDetails = (content, types) => { }; export const removeAllDetails = (content) => { - // First pass: strip blocks on the full string before code-fence - // splitting, so blocks whose body contains triple backticks are caught. - // (replaceOutsideCode splits on ``` fences, which breaks the - // regex when the opening and closing tags land in different segments.) + // Strip details before splitting code fences, which can separate opening and closing tags. content = content.replace(/]*>[\s\S]*?<\/details>/gi, ''); // Second pass: catch any remaining blocks that live outside code fences return replaceOutsideCode(content, (segment) => { @@ -1200,14 +1183,7 @@ export const extractSentencesForAudio = (text: string) => { }; export const getMessageContentParts = (content: string, splitOn: string = 'punctuation') => { - // Strip blocks directly on the full string before any - // code-block-aware processing. removeAllDetails (which callers use) - // applies the regex via replaceOutsideCode, which splits on triple- - // backtick code fences first. If a block contains code - // fences (e.g. reasoning with code examples), the opening and - // closing tags land in separate segments and the regex fails, - // leaking thinking content into TTS. Applying the strip here on - // the full string catches those cases. (Fixes #22197) + // Strip details before splitting code fences, which can separate their tags and leak reasoning into TTS (#22197). content = content.replace(/]*>[\s\S]*?<\/details>/gi, ''); const messageContentParts: string[] = []; @@ -1229,7 +1205,7 @@ export const getMessageContentParts = (content: string, splitOn: string = 'punct }; export const blobToFile = (blob, fileName) => { - // Create a new File object from the Blob + // Give the Blob a filename; it is ready to introduce itself as a File. const file = new File([blob], fileName, { type: blob.type }); return file; }; @@ -2387,11 +2363,7 @@ export const getCodeBlockContents = (content: string): object => { let codeBlocks = []; - // Groups of related HTML/CSS/JS blocks. Each HTML block starts a new group; - // CSS and JS blocks attach to the current (most recent) group. - // This preserves the existing behaviour for "dumb" models that output - // separate html/css/js blocks meant to form a single page, while also - // allowing multiple distinct HTML blocks to produce separate artifacts. + // Each HTML block starts an artifact; subsequent CSS and JS join the most recent group. let htmlGroups: Array<{ html: string; css: string; js: string }> = []; const initDefaultGroup = () => { diff --git a/src/lib/utils/marked/katex-extension.ts b/src/lib/utils/marked/katex-extension.ts index 81425e5fe2..0ee31aeb63 100644 --- a/src/lib/utils/marked/katex-extension.ts +++ b/src/lib/utils/marked/katex-extension.ts @@ -19,11 +19,6 @@ const ALLOWED_SURROUNDING_CHARS = // markdown rendering time to be spent in KaTeX regex compilation. const ALLOWED_SURROUNDING_CHARS_REGEX = new RegExp(`[${ALLOWED_SURROUNDING_CHARS}]`, 'u'); -// const DELIMITER_LIST = [ -// { left: '$$', right: '$$', display: false }, -// { left: '$', right: '$', display: false }, -// ]; - // const inlineRule = /^(\${1,2})(?!\$)((?:\\.|[^\\\n])*?(?:\\.|[^\\\n\$]))\1(?=[\s?!\.,:？！。，：]|$)/; // const blockRule = /^(\${1,2})\n((?:\\[^]|[^\\])+?)\n\1(?:\n|$)/; diff --git a/src/lib/utils/pptxToHtml.ts b/src/lib/utils/pptxToHtml.ts index a4f786e294..7497490f87 100644 --- a/src/lib/utils/pptxToHtml.ts +++ b/src/lib/utils/pptxToHtml.ts @@ -1120,7 +1120,7 @@ export async function pptxToImages( const zip = (await JSZip.loadAsync(buffer)) as ZipLike; activeThemeColors = await readThemeColors(zip); - // ── Read slide dimensions from presentation.xml ────────────────── + // Read slide dimensions from presentation.xml let slideW = 960; let slideH = 540; const presXml = zip.file('ppt/presentation.xml'); @@ -1134,7 +1134,7 @@ export async function pptxToImages( } } - // ── Collect media files (images) as base64 data URIs ───────────── + // Collect media files (images) as base64 data URIs const media: Record = {}; const mediaFiles = Object.keys(zip.files).filter((f) => f.startsWith('ppt/media/')); await Promise.all( @@ -1157,7 +1157,7 @@ export async function pptxToImages( }) ); - // ── Discover slide files ───────────────────────────────────────── + // Discover slide files const slideFiles = await presentationSlides(new OfficePackage(zip as import('jszip'))); const images: string[] = []; @@ -1174,7 +1174,7 @@ export async function pptxToImages( const masterDoc = masterPath ? await readXml(zip, masterPath) : null; const placeholderSources = [collectPlaceholders(layoutDoc), collectPlaceholders(masterDoc)]; - // ── Create canvas and render slide ─────────────────────────── + // Create canvas and render slide const canvas = document.createElement('canvas'); canvas.width = slideW; canvas.height = slideH; @@ -1228,7 +1228,7 @@ export async function pptxToImages( renderFill(ctx, shape.getElementsByTagName('p:spPr')[0], rect); } - // ── Picture ────────────────────────────────────────────── + // Picture const blipFill = shape.getElementsByTagName('p:blipFill')[0]; if (blipFill) { const blip = blipFill.getElementsByTagName('a:blip')[0]; @@ -1248,7 +1248,7 @@ export async function pptxToImages( continue; } - // ── Text shape ─────────────────────────────────────────── + // Text shape const txBody = shape.getElementsByTagName('p:txBody')[0]; if (!txBody) continue; diff --git a/src/lib/workers/KokoroWorker.ts b/src/lib/workers/KokoroWorker.ts index 78a8663634..62b683d7b5 100644 --- a/src/lib/workers/KokoroWorker.ts +++ b/src/lib/workers/KokoroWorker.ts @@ -24,7 +24,7 @@ export class KokoroWorker { this.worker = new WorkerInstance(); - // Handle worker messages + // Listen for news from the voice booth. this.worker.onmessage = (event) => { const { status, error, audioUrl } = event.data; @@ -34,7 +34,7 @@ export class KokoroWorker { console.error(error); this.initialized = false; } else if (status === 'generate:complete') { - // Resolve promise from queue + // The clip is ready; hand it to the request at the front of the queue. const request = this.requestQueue.shift(); if (request) { request.resolve(audioUrl); diff --git a/src/lib/workers/kokoro.worker.ts b/src/lib/workers/kokoro.worker.ts index e91f55b335..63723dafa4 100644 --- a/src/lib/workers/kokoro.worker.ts +++ b/src/lib/workers/kokoro.worker.ts @@ -33,7 +33,7 @@ self.onmessage = async (event) => { if (type === 'generate') { if (!isInitialized || !tts) { - // Ensure model is initialized + // No model, no monologue. Report that before asking it to speak. self.postMessage({ status: 'generate:error', error: 'TTS model not initialized' }); return; } diff --git a/src/lib/workers/pyodide.worker.ts b/src/lib/workers/pyodide.worker.ts index 9318d15425..55bcc62c99 100644 --- a/src/lib/workers/pyodide.worker.ts +++ b/src/lib/workers/pyodide.worker.ts @@ -13,9 +13,7 @@ declare global { } } -// --------------------------------------------------------------------------- // Pyodide bootstrap -// --------------------------------------------------------------------------- let pyodideReady: Promise | null = null; @@ -46,23 +44,23 @@ async function loadPyodideAndPackages(packages: string[] = []) { packages: ['micropip'] }); - // Create the upload directory and mount IDBFS for persistence + // Give uploads an IDBFS home; RAM is a short-term rental. const uploadDir = '/mnt/uploads'; self.pyodide.FS.mkdirTree(uploadDir); self.pyodide.FS.mount(self.pyodide.FS.filesystems.IDBFS, {}, '/mnt'); - // Load persisted files from IndexedDB + // Unpack the files IndexedDB kept between visits. await new Promise((resolve) => { (self.pyodide.FS as any).syncfs(true, (err: Error | null) => { if (err) { console.error('Error syncing from IndexedDB:', err); } - // Always resolve — missing data is fine on first run + // Continue startup even if restoring persisted files failed; the error is logged above. resolve(); }); }); - // Ensure /mnt/uploads still exists after sync (first-time init) + // First visit? Make sure /mnt/uploads has actually moved in. try { self.pyodide.FS.stat(uploadDir); } catch { @@ -104,9 +102,7 @@ function persistFS() { }); } -// --------------------------------------------------------------------------- // FS operations -// --------------------------------------------------------------------------- function fsUploadFiles(files: { name: string; data: ArrayBuffer }[], dir = '/mnt/uploads') { try { @@ -170,9 +166,7 @@ function fsMkdir(path: string) { self.pyodide.FS.mkdirTree(path); } -// --------------------------------------------------------------------------- // Code execution -// --------------------------------------------------------------------------- async function executeCode( id: string, @@ -190,9 +184,9 @@ async function executeCode( } try { - // check if matplotlib is imported in the code + // Install the plotting hook when the source mentions matplotlib and the package is loaded. if (code.includes('matplotlib') && 'matplotlib' in self.pyodide.loadedPackages) { - // Override plt.show() to return base64 image + // Override plt.show() to print a PNG data URL to stdout and clear the current figure. await self.pyodide.runPythonAsync(`import base64 import os from io import BytesIO @@ -235,9 +229,7 @@ matplotlib.pyplot.show = show`); self.postMessage({ id, result: self.result, stdout: self.stdout, stderr: self.stderr }); } -// --------------------------------------------------------------------------- // Message handler -// --------------------------------------------------------------------------- self.onmessage = async (event) => { const data = event.data; @@ -321,23 +313,21 @@ self.onmessage = async (event) => { } }; -// --------------------------------------------------------------------------- // Helpers -// --------------------------------------------------------------------------- function processResult(result: any): any { - // Catch and always return JSON-safe string representations + // Convert proxies and nested values to JavaScript data; report conversion failures as text. try { if (result == null) { - // Handle null and undefined + // Null and undefined share one JSON address: null. return null; } if (typeof result === 'string' || typeof result === 'number' || typeof result === 'boolean') { - // Handle primitive types directly + // Strings, numbers, and booleans already speak JSON. return result; } if (typeof result === 'bigint') { - // Convert BigInt to a string for JSON-safe representation + // BigInt needs a string disguise to get past JSON. return result.toString(); } if (Array.isArray(result)) { @@ -345,7 +335,7 @@ function processResult(result: any): any { return result.map((item) => processResult(item)); } if (typeof result.toJs === 'function') { - // If it's a Pyodide proxy object (e.g., Pandas DF, Numpy Array), convert to JS and process recursively + // Convert Python proxies; stringify if conversion still yields a proxy, otherwise recurse. const converted = result.toJs(); return typeof converted?.toJs === 'function' ? converted.toString() diff --git a/src/routes/+layout.js b/src/routes/+layout.js index 4f284f1335..d63a297013 100644 --- a/src/routes/+layout.js +++ b/src/routes/+layout.js @@ -1,16 +1,5 @@ -// if you want to generate a static html file -// for your page. -// Documentation: https://kit.svelte.dev/docs/page-options#prerender -// export const prerender = true; - -// if you want to Generate a SPA -// you have to set ssr to false. -// This is not the case (so set as true or comment the line) -// Documentation: https://kit.svelte.dev/docs/page-options#ssr +// Render in the browser; server-side rendering is disabled. export const ssr = false; -// How to manage the trailing slashes in the URLs -// the URL for about page will be /about with 'ignore' (default) -// the URL for about page will be /about/ with 'always' -// https://kit.svelte.dev/docs/page-options#trailingslash +// Accept URLs with or without a trailing slash. export const trailingSlash = 'ignore'; diff --git a/src/routes/s/[id]/+page.svelte b/src/routes/s/[id]/+page.svelte index 40f7c4ea86..9563c2c74f 100644 --- a/src/routes/s/[id]/+page.svelte +++ b/src/routes/s/[id]/+page.svelte @@ -53,9 +53,7 @@ loadAndScroll(); } - ////////////////////////// // Web functions - ////////////////////////// const loadAndScroll = async () => { if (await loadSharedChat()) {