diff --git a/public/css/branches.css b/public/css/branches.css index 268d39e..d7bc86b 100644 --- a/public/css/branches.css +++ b/public/css/branches.css @@ -353,3 +353,242 @@ font-size: 10px; } } + +/* --- Compare Mode Styles --- */ + +/* Compare mode indicator on branches content */ +.branches-content.compare-mode .branch-item { + cursor: pointer; +} + +.branches-content.compare-mode .branch-item:hover { + border-color: var(--accent); +} + +.branches-content.compare-mode .branch-item.compare-selected { + background: var(--accent-alpha-15); + border-color: var(--accent); + box-shadow: 0 0 0 2px var(--accent-alpha-30); +} + +/* Compare overlay */ +.branches-compare { + position: absolute; + inset: 0; + background: var(--bg); + z-index: 10; + display: flex; + flex-direction: column; +} + +.branches-compare.hidden { + display: none; +} + +.compare-header { + padding: 12px 16px; + padding-top: calc(12px + var(--safe-top)); + background: var(--glass-bg); + backdrop-filter: blur(20px) saturate(1.4); + -webkit-backdrop-filter: blur(20px) saturate(1.4); + border-bottom: 1px solid var(--glass-border); + display: flex; + justify-content: space-between; + align-items: center; + font-weight: 600; + font-size: 15px; +} + +.compare-close-btn { + background: none; + border: none; + font-size: 24px; + color: var(--text-secondary); + cursor: pointer; + padding: 8px 12px; + border-radius: 8px; + line-height: 1; + transition: background 0.15s, color 0.15s; +} + +.compare-close-btn:hover { + background: var(--surface); + color: var(--text); +} + +.compare-body { + flex: 1; + overflow: auto; + -webkit-overflow-scrolling: touch; +} + +.compare-loading, +.compare-error { + display: flex; + align-items: center; + justify-content: center; + height: 100%; + color: var(--text-secondary); + padding: 24px; + text-align: center; +} + +.compare-error { + color: var(--danger); +} + +/* Side-by-side view (desktop) */ +.compare-split { + display: grid; + grid-template-columns: 1fr 1fr; + height: 100%; +} + +.compare-column { + display: flex; + flex-direction: column; + border-right: 1px solid var(--border); + min-width: 0; +} + +.compare-column:last-child { + border-right: none; +} + +.compare-column-header { + padding: 10px 12px; + background: var(--surface); + border-bottom: 1px solid var(--border); + font-weight: 600; + font-size: 13px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + flex-shrink: 0; +} + +.compare-messages { + flex: 1; + overflow-y: auto; + padding: 12px; +} + +.compare-msg { + padding: 10px 14px; + margin-bottom: 10px; + border-radius: 10px; + font-size: 13px; + line-height: 1.5; + word-break: break-word; +} + +.compare-msg.user { + background: var(--accent-alpha-15); + color: var(--text); + margin-left: 20%; +} + +.compare-msg.assistant { + background: var(--surface); + color: var(--text); + margin-right: 20%; +} + +.compare-msg.empty { + background: var(--bg-tertiary); + opacity: 0.3; + min-height: 40px; +} + +/* Unified diff view (mobile) */ +.compare-unified-header { + display: flex; + gap: 12px; + padding: 10px 12px; + background: var(--surface); + border-bottom: 1px solid var(--border); +} + +.unified-legend { + font-size: 11px; + font-weight: 600; + padding: 3px 8px; + border-radius: 4px; +} + +.unified-legend.parent { + background: var(--bg-tertiary); + color: var(--text-secondary); +} + +.unified-legend.fork { + background: var(--accent-alpha-20); + color: var(--accent); +} + +.compare-unified { + padding: 12px; +} + +.unified-row { + display: flex; + gap: 10px; + margin-bottom: 10px; + align-items: flex-start; +} + +.unified-row.fork { + padding-left: 20px; +} + +.unified-source { + width: 32px; + min-width: 32px; + padding: 4px 6px; + border-radius: 4px; + font-size: 9px; + font-weight: 600; + text-align: center; + text-transform: uppercase; + flex-shrink: 0; +} + +.unified-source.parent { + background: var(--bg-tertiary); + color: var(--text-secondary); +} + +.unified-source.fork { + background: var(--accent-alpha-20); + color: var(--accent); +} + +.unified-content { + flex: 1; + padding: 10px 14px; + background: var(--surface); + border-radius: 8px; + font-size: 13px; + line-height: 1.5; + word-break: break-word; + min-width: 0; +} + +.unified-row.fork .unified-content { + background: var(--accent-alpha-10); + border: 1px solid var(--accent-alpha-30); +} + +/* Responsive: mobile uses unified view */ +@media (max-width: 767px) { + .compare-split { + display: none; + } +} + +@media (min-width: 768px) { + .compare-unified-header, + .compare-unified { + display: none; + } +} diff --git a/public/css/layout.css b/public/css/layout.css index d064e37..b655977 100644 --- a/public/css/layout.css +++ b/public/css/layout.css @@ -191,6 +191,23 @@ color: var(--accent); } +/* Message highlight animation for jump-to-fork */ +.message-highlight, +.message-wrapper.message-highlight { + animation: message-highlight-pulse 2s ease-out; +} + +@keyframes message-highlight-pulse { + 0% { + box-shadow: 0 0 0 3px var(--accent); + background: var(--accent-alpha-15); + } + 100% { + box-shadow: 0 0 0 0 transparent; + background: transparent; + } +} + .status-dot { width: 10px; height: 10px; diff --git a/public/index.html b/public/index.html index 1debc6f..5129de5 100644 --- a/public/index.html +++ b/public/index.html @@ -416,8 +416,19 @@

Concierge

Conversation Branches
+
+ + @@ -750,6 +761,10 @@

New Conversation

Branches +
Commands & Skills diff --git a/public/js/app.js b/public/js/app.js index 54390ba..41ecce7 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -213,6 +213,10 @@ const branchesBtn = document.getElementById('branches-btn'); const branchesView = document.getElementById('branches-view'); const branchesBackBtn = document.getElementById('branches-back-btn'); const branchesContent = document.getElementById('branches-content'); +const branchesCompareBtn = document.getElementById('branches-compare-btn'); +const branchesCompare = document.getElementById('branches-compare'); +const compareCloseBtn = document.getElementById('compare-close-btn'); +const compareBody = document.getElementById('compare-body'); const filesStandaloneView = document.getElementById('files-standalone-view'); const filesStandaloneBackBtn = document.getElementById('files-standalone-back-btn'); const filesStandaloneTitle = document.getElementById('files-standalone-title'); @@ -457,6 +461,10 @@ initBranches({ branchesView, branchesBackBtn, branchesContent, + branchesCompareBtn, + branchesCompare, + compareCloseBtn, + compareBody, listView, chatView }); diff --git a/public/js/branches.js b/public/js/branches.js index 06a6b90..07740b6 100644 --- a/public/js/branches.js +++ b/public/js/branches.js @@ -1,20 +1,30 @@ // --- Conversation branches visualization --- -import { escapeHtml } from './markdown.js'; -import { haptic, apiFetch } from './utils.js'; +import { escapeHtml, renderMarkdown } from './markdown.js'; +import { haptic, apiFetch, truncate } from './utils.js'; import * as state from './state.js'; // DOM elements (set by init) let branchesView = null; let branchesBackBtn = null; let branchesContent = null; +let branchesCompareBtn = null; +let branchesCompare = null; +let compareCloseBtn = null; +let compareBody = null; // State let _currentTreeData = null; +let _compareMode = false; +let _selectedForCompare = []; export function initBranches(elements) { branchesView = elements.branchesView; branchesBackBtn = elements.branchesBackBtn; branchesContent = elements.branchesContent; + branchesCompareBtn = elements.branchesCompareBtn; + branchesCompare = elements.branchesCompare; + compareCloseBtn = elements.compareCloseBtn; + compareBody = elements.compareBody; if (branchesBackBtn) { branchesBackBtn.addEventListener('click', () => { @@ -22,6 +32,28 @@ export function initBranches(elements) { closeBranchesView(); }); } + + if (branchesCompareBtn) { + branchesCompareBtn.addEventListener('click', () => { + haptic(); + toggleCompareMode(); + }); + } + + if (compareCloseBtn) { + compareCloseBtn.addEventListener('click', () => { + haptic(); + closeCompareView(); + }); + } + + // ESC to close compare view + document.addEventListener('keydown', (e) => { + if (e.key === 'Escape' && branchesCompare && !branchesCompare.classList.contains('hidden')) { + e.stopPropagation(); + closeCompareView(); + } + }); } export async function loadBranchesTree(conversationId) { @@ -182,6 +214,15 @@ function renderTree(data) { if (e.target.closest('.branch-collapse-btn')) return; const id = item.dataset.id; + + // Handle compare mode selection + if (_compareMode) { + haptic(); + selectBranchForCompare(id); + return; + } + + // Normal navigation if (id && id !== data.currentId) { haptic(); navigateToConversation(id); @@ -249,3 +290,191 @@ export function openBranchesFromChat() { showBranchesView(); loadBranchesTree(currentId); } + +// --- Compare Mode --- + +function toggleCompareMode() { + _compareMode = !_compareMode; + _selectedForCompare = []; + + if (_compareMode) { + branchesCompareBtn?.classList.add('active'); + branchesContent?.classList.add('compare-mode'); + updateCompareHeader('Select two branches to compare'); + } else { + branchesCompareBtn?.classList.remove('active'); + branchesContent?.classList.remove('compare-mode'); + closeCompareView(); + } + + // Re-render tree with selection checkboxes + if (_currentTreeData) { + renderTree(_currentTreeData); + } +} + +function updateCompareHeader(text) { + const header = branchesCompare?.querySelector('.compare-header span'); + if (header) header.textContent = text; +} + +function selectBranchForCompare(id) { + if (_selectedForCompare.includes(id)) { + _selectedForCompare = _selectedForCompare.filter(x => x !== id); + } else if (_selectedForCompare.length < 2) { + _selectedForCompare.push(id); + } + + // Update selection UI + branchesContent?.querySelectorAll('.branch-item').forEach(item => { + const itemId = item.dataset.id; + item.classList.toggle('compare-selected', _selectedForCompare.includes(itemId)); + }); + + // Update header text + if (_selectedForCompare.length === 0) { + updateCompareHeader('Select two branches to compare'); + } else if (_selectedForCompare.length === 1) { + updateCompareHeader('Select one more branch'); + } + + // Load comparison when two selected + if (_selectedForCompare.length === 2) { + loadCompareView(_selectedForCompare[0], _selectedForCompare[1]); + } +} + +async function loadCompareView(idA, idB) { + if (!branchesCompare || !compareBody) return; + + branchesCompare.classList.remove('hidden'); + compareBody.innerHTML = '
Loading conversations...
'; + + try { + const [convA, convB] = await Promise.all([ + apiFetch(`/api/conversations/${idA}`).then(r => r?.json()), + apiFetch(`/api/conversations/${idB}`).then(r => r?.json()) + ]); + + if (!convA || !convB) { + compareBody.innerHTML = '
Failed to load conversations
'; + return; + } + + // Determine fork relationship and which is parent + let parent = convA; + let fork = convB; + let forkIndex = 0; + + if (convB.parentId === idA) { + parent = convA; + fork = convB; + forkIndex = fork.forkIndex || 0; + } else if (convA.parentId === idB) { + parent = convB; + fork = convA; + forkIndex = fork.forkIndex || 0; + } else { + // Find common ancestor - for now just compare from start + forkIndex = 0; + } + + updateCompareHeader(`Comparing from message ${forkIndex + 1}`); + + // Render based on viewport + if (window.innerWidth >= 768) { + renderSideBySide(parent, fork, forkIndex); + } else { + renderUnifiedDiff(parent, fork, forkIndex); + } + } catch (err) { + compareBody.innerHTML = `
Error: ${escapeHtml(err.message)}
`; + } +} + +function renderCompareMessage(msg) { + if (!msg) return ''; + const cls = msg.role === 'user' ? 'compare-msg user' : 'compare-msg assistant'; + const content = msg.role === 'assistant' ? renderMarkdown(msg.text) : escapeHtml(msg.text); + const preview = truncate(msg.text || '', 300); + return `
${content}
`; +} + +function renderSideBySide(parent, fork, forkIndex) { + const parentMsgs = (parent.messages || []).slice(forkIndex); + const forkMsgs = (fork.messages || []).slice(forkIndex); + const maxLen = Math.max(parentMsgs.length, forkMsgs.length); + + let parentHtml = ''; + let forkHtml = ''; + + for (let i = 0; i < maxLen; i++) { + parentHtml += renderCompareMessage(parentMsgs[i]) || '
'; + forkHtml += renderCompareMessage(forkMsgs[i]) || '
'; + } + + compareBody.innerHTML = ` +
+
+
${escapeHtml(parent.name)}
+
${parentHtml}
+
+
+
${escapeHtml(fork.name)}
+
${forkHtml}
+
+
+ `; +} + +function renderUnifiedDiff(parent, fork, forkIndex) { + const parentMsgs = (parent.messages || []).slice(forkIndex); + const forkMsgs = (fork.messages || []).slice(forkIndex); + const maxLen = Math.max(parentMsgs.length, forkMsgs.length); + + let html = ` +
+ Parent: ${escapeHtml(parent.name)} + Fork: ${escapeHtml(fork.name)} +
+
+ `; + + for (let i = 0; i < maxLen; i++) { + const pMsg = parentMsgs[i]; + const fMsg = forkMsgs[i]; + + if (pMsg) { + const content = pMsg.role === 'assistant' ? renderMarkdown(pMsg.text) : escapeHtml(pMsg.text); + html += `
+
${pMsg.role === 'user' ? 'You' : 'AI'}
+
${content}
+
`; + } + if (fMsg) { + const content = fMsg.role === 'assistant' ? renderMarkdown(fMsg.text) : escapeHtml(fMsg.text); + html += `
+
${fMsg.role === 'user' ? 'You' : 'AI'}
+
${content}
+
`; + } + } + + html += '
'; + compareBody.innerHTML = html; +} + +function closeCompareView() { + if (branchesCompare) { + branchesCompare.classList.add('hidden'); + } + _selectedForCompare = []; + _compareMode = false; + branchesCompareBtn?.classList.remove('active'); + branchesContent?.classList.remove('compare-mode'); + + // Clear selection UI + branchesContent?.querySelectorAll('.branch-item.compare-selected').forEach(item => { + item.classList.remove('compare-selected'); + }); +} diff --git a/public/js/conversations.js b/public/js/conversations.js index d7b64e5..7a1ca5b 100644 --- a/public/js/conversations.js +++ b/public/js/conversations.js @@ -121,6 +121,27 @@ function updateChatCwdIndicator(conv) { chatCwdIndicator.classList.toggle('worktree', isWorktree); } +/** + * Update the "Jump to Parent" menu item visibility and data based on conversation's fork status. + * Shows the menu item only for forked conversations. + */ +function updateChatForkLink(conv) { + const chatMoreParent = document.getElementById('chat-more-parent'); + if (!chatMoreParent) return; + + if (!conv?.parentId) { + chatMoreParent.classList.add('hidden'); + chatMoreParent.dataset.parentId = ''; + chatMoreParent.dataset.forkIndex = ''; + return; + } + + // Store fork data on the menu item for the click handler + chatMoreParent.dataset.parentId = conv.parentId; + chatMoreParent.dataset.forkIndex = conv.forkIndex ?? 0; + chatMoreParent.classList.remove('hidden'); +} + export async function loadConversations() { const conversations = state.conversations; // Show skeletons on first load when list is empty @@ -1004,6 +1025,7 @@ export async function openConversation(id) { chatName.textContent = conv.name; updateChatCwdIndicator(conv); + updateChatForkLink(conv); state.updateStatusDot(conv.status); state.setCurrentProvider(conv.provider || 'claude'); @@ -1044,6 +1066,21 @@ export async function openConversation(id) { state.setThinking(conv.status === 'thinking', conv.thinkingStartTime); } +/** + * Open a conversation and scroll to a specific message. + * Used for jumping to fork points in parent conversations. + * @param {string} id - Conversation ID + * @param {number} messageIndex - Message index to scroll to + */ +export async function openConversationAtMessage(id, messageIndex) { + await openConversation(id); + // Wait for render to complete, then scroll to the message + setTimeout(async () => { + const { scrollToMessage } = await import('./render.js'); + scrollToMessage(messageIndex); + }, 150); +} + export function showChatView() { listView.classList.add('slide-out'); chatView.classList.add('slide-in'); diff --git a/public/js/render.js b/public/js/render.js index a72d45f..51cfea5 100644 --- a/public/js/render.js +++ b/public/js/render.js @@ -762,3 +762,61 @@ export function attachMessageActions() { attachMessageActionsCallback(); } } + +/** + * Scroll to a specific message by index and highlight it. + * @param {number} index - Message index to scroll to + */ +export function scrollToMessage(index) { + const messagesContainer = state.getMessagesContainer(); + if (!messagesContainer) return; + + // Find message by data-index attribute + const target = messagesContainer.querySelector(`.message[data-index="${index}"]`); + if (!target) { + // If message not found, it might not be loaded yet (virtual scrolling) + // Load more messages until we find it + const allMessages = state.getAllMessages(); + if (index < state.getMessagesOffset() && index >= 0 && index < allMessages.length) { + // Need to load earlier messages + // Set offset to include the target message + const newOffset = Math.max(0, index - 10); // Load some context + state.setMessagesOffset(newOffset); + const visible = allMessages.slice(newOffset); + messagesContainer.innerHTML = renderMessageSlice(visible, newOffset); + enhanceCodeBlocks(messagesContainer); + attachTTSHandlers(); + attachTimestampHandlers(); + attachImageHandlers(); + attachRegenHandlers(); + attachCopyMsgHandlers(); + attachMessageActions(); + attachCompressedSectionToggle(); + renderAllReactions(); + // Hide load more button if at start + const loadMoreBtn = state.getLoadMoreBtn(); + if (loadMoreBtn) { + loadMoreBtn.classList.toggle('hidden', newOffset <= 0); + } + // Try again after re-render + setTimeout(() => scrollToMessage(index), 50); + return; + } + return; + } + + // Scroll to the message + target.scrollIntoView({ behavior: 'smooth', block: 'center' }); + + // Add highlight animation + target.classList.add('message-highlight'); + + // Also highlight the wrapper if it exists + const wrapper = target.closest('.message-wrapper'); + if (wrapper) { + wrapper.classList.add('message-highlight'); + setTimeout(() => wrapper.classList.remove('message-highlight'), 2000); + } + + setTimeout(() => target.classList.remove('message-highlight'), 2000); +} diff --git a/public/js/ui.js b/public/js/ui.js index 62efe9d..c4be373 100644 --- a/public/js/ui.js +++ b/public/js/ui.js @@ -2259,6 +2259,20 @@ export function setupEventListeners(createConversation) { }); } + const chatMoreParent = document.getElementById('chat-more-parent'); + if (chatMoreParent) { + chatMoreParent.addEventListener('click', async () => { + closeChatMoreMenu(); + haptic(); + const parentId = chatMoreParent.dataset.parentId; + if (parentId) { + const { openConversationAtMessage } = await import('./conversations.js'); + const forkIndex = parseInt(chatMoreParent.dataset.forkIndex || '0', 10); + openConversationAtMessage(parentId, forkIndex); + } + }); + } + if (chatMoreCapabilities) { chatMoreCapabilities.addEventListener('click', () => { closeChatMoreMenu(); diff --git a/public/sw.js b/public/sw.js index 249584d..3ae385e 100644 --- a/public/sw.js +++ b/public/sw.js @@ -1,4 +1,4 @@ -const CACHE_NAME = 'concierge-v123'; +const CACHE_NAME = 'concierge-v126'; const STATIC_ASSETS = [ '/', '/index.html',