diff --git a/.ai/contexts/ipc-bridge.md b/.ai/contexts/ipc-bridge.md index dbf5617ec..1e41492e5 100644 --- a/.ai/contexts/ipc-bridge.md +++ b/.ai/contexts/ipc-bridge.md @@ -1,6 +1,6 @@ # Context: ipc-bridge -## Archived projects manager (#863 slices 2–3, #1167) +## Archived projects manager (#863 slices 2–4, #1167, #1171) `settings-panel.js` mounts `renderArchivedProjects` from `archived-manager.js` after the shared renderer helpers, dialogs, notices and sidebar controller. @@ -9,14 +9,15 @@ hidden entries/kinds, archive timestamps, cached projects and the working remote-host list. Host edits update labels without saving. The manager groups Local first, then configured hosts in order, then unknown aliases; it never collapses a worktree entry into its repository. The filter, selections and folds -are local to the mounted list. Filtering clears selections outside the results. +are local to the mounted list. Selection survives filtering and accepted snapshots; +only entries no longer archived are removed from the checked set. Counts exclude deleted entries. Missing timestamps and unknown session counts are omitted, never invented. Names use `shortProjectPath` (last two segments). Unarchive uses the exact stored entry via `unarchiveProject` and/or `unarchiveFolder`, sequentially for a bulk action. Successful entries leave the list, reload projects and get one B8 -ten-second Undo notice for project archives only. Folder restores use an informational -notice; mixed restores explain that Undo only re-archives projects and that folders +ten-second Undo notice for project archives and sessions. Folder-only restores use an informational +notice; mixed restores explain that Undo re-archives sessions and project archives and that folders must be archived again through Archive folder. Undo calls `archiveProjectSettings(path, folderKey)` and reads the new writer timestamp. After reopening Settings, Undo refreshes the currently mounted manager; a pending action does not consume its Undo notice. @@ -63,6 +64,46 @@ Native controls provide Tab navigation; Enter/Space folds host groups and Escape clears the filter. ResizeObserver alone controls the 720px stacked layout and 480px search disclosure. New surfaces use existing dark chrome tokens. +Slice 4 adds top-level archived sessions from `cachedAllProjects`, grouped by +host-qualified project path, with twelve initially visible rows per group. +Select-all covers the entire filtered group, including its collapsed tail. +Session keys are separate from project entry keys. Names use `cleanDisplayName`; +attribute values also escape quotes. Transcript uses `showJsonlViewer` without +opening a terminal. Show in sidebar enables the archive filter, clears competing +filters and search, cancels the deferred search redraw, expands the target's +ancestors and focuses the row. The archive-filter footer uses `archivedCounts` +over the all-project snapshot and the union of hidden project entries and +`archivedProjects` folder keys, excluding deleted entries and counting combined +archives once, just like the page. `loadProjects` supplies folder records as the +fourth `hiddenSettings` value, so folder changes also invalidate the sidebar render +key. The footer uses singular session and project-or-folder labels for one item. +Project row attributes escape quotes as session rows do. Settings owns the +description above the manager, without adding a redundant section title. +Entirely empty archives show only the shared "Nothing is archived" explanation; +the per-group explanations remain for a missing group when another has items. + +The shared bulk action runs project/folder entries first, then +`persistSessionArchive(session, 0)`. Its optional error callback collects failures +for one `appAlert` rather than producing separate sidebar error notices. One +success notice reverses successful projects and sessions only; session Undo uses +`persistSessionArchive(session, 1)`. Folder-only restore still has no Undo. + +The accepted `loadProjects` snapshot calls `window.refreshArchivedManager`, which +does no manager archive read when the Settings viewer is closed or its Archived +page is hidden. A skipped refresh marks the manager dirty; selecting Archived +refreshes that mounted manager from `cachedAllProjects`, updating its rows and nav +count. Refresh consumes the dirty flag, so revisiting an unchanged page does not +read settings again. The sidebar snapshot still reads folder archives for its count. +`loadProjects` starts the global and folder-archive settings reads together, then +checks generation obsolescence before continuing to the terminal snapshot. +Refresh reads folder records and preserves filter, selection, group expansion, +working host labels and row-control focus. A version counter rejects stale reads; +refreshes during an action are deferred until the action and any error alert end. +`projects-changed` also schedules a reload when Archived is visible above another +sidebar tab. Closed settings retain the normal deferred reload behaviour. +Tests: `dom-archived-sessions.test.js`, plus the existing archived manager, +session/folder Undo, archive-all and row-action error suites. + Folder and project archives with the same exact entry share one row with both badges. Folder dates accept the stored ISO timestamp; metadata includes the number of disabled schedules. Deleted entries stay excluded. Combined restoration clears the project diff --git a/CHANGELOG.md b/CHANGELOG.md index dca6378b2..1438fd768 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ What changes for you in each release of Switchboard. How to write an entry: [doc ### Changed - Project Settings → This project shows the project's path, host and number of sessions, including archived ones, with Archive Project and Delete Project in a separate Danger zone. (#863) - After a restart, Switchboard re-reads only Claude Code transcripts changed since the previous run. Codex history is still re-read in full. (#1144) -- Settings → Archived groups project and folder archives by host, shows their paths and archive dates, and filters by name, path or host. Folder archives show their disabled schedule count and can be restored after Undo expires, keeping schedules off until you choose Turn back on. Restore one or several projects with Undo, or delete an archived project through the existing preview without restoring it first. Worktree entries whose repository is gone can be deleted; entries still grouped under a repository explain that you can delete their repository instead. (#863, #1167) +- Settings → Archived groups project and folder archives by host, shows their paths and archive dates, and filters by name, path or host. Archived sessions are listed by project: open a transcript, or restore sessions and projects together with one Undo. With the archive filter on, the sidebar links to the page. Folder archives show their disabled schedule count and can be restored after Undo expires, keeping schedules off until you choose Turn back on. Restore one or several projects with Undo, or delete an archived project through the existing preview without restoring it first. Worktree entries whose repository is gone can be deleted; entries still grouped under a repository explain that you can delete their repository instead. (#863, #1167, #1171) - Codex sessions run non-interactively by a program (`codex exec`: scripted reviews and fixes) are now left out of the sidebar and grid like Claude Agent SDK sessions, under the same **Hide SDK-launched Sessions** setting. They still count in the heatmap and are found by search; the ones you have open stay listed. Codex sessions already indexed are re-checked once at the next start. (#1145) ### Fixed diff --git a/docs/session-browser.md b/docs/session-browser.md index fc6055df1..d4dbc341b 100644 --- a/docs/session-browser.md +++ b/docs/session-browser.md @@ -225,6 +225,21 @@ succeeds. Since #815, a scan worker that fails to start shows `Scan failed: { setActivity(sessionId, busy, 'onCliBusyState'); }); +function showArchivedSessionInSidebar(session) { + window.closeSettingsViewer(); + document.querySelector('.sidebar-tab[data-tab="sessions"]')?.click(); + showArchived = true; + showStarredOnly = showRunningOnly = showTodayOnly = false; + document.getElementById('archive-toggle')?.classList.add('active'); + for (const id of ['star-toggle', 'running-toggle', 'today-toggle']) document.getElementById(id)?.classList.remove('active'); + clearSearch(); + if (clearRenderRaf) { cancelAnimationFrame(clearRenderRaf); clearRenderRaf = null; } + refreshSidebar({ resort: true, keepFocus: true }); + const row = sessionItemEl(session.sessionId, sidebarContent); + if (!row) return; + for (let el = row.parentElement; el && el !== sidebarContent; el = el.parentElement) { + if (el.classList.contains('slug-group')) el.classList.remove('collapsed'); + if (el.classList.contains('sessions-older') && el.style.display === 'none') el.previousElementSibling?.click(); + if (el.matches('.project-sessions, .worktree-sessions')) el.previousElementSibling?.classList.remove('collapsed'); + } + row.tabIndex = -1; row.focus(); row.scrollIntoView?.({ block: 'nearest' }); +} +window.showArchivedSessionInSidebar = showArchivedSessionInSidebar; + // --- Single entry point for all sidebar renders --- // resort=true: re-sort items by priority+time (use for user-initiated actions) // resort=false (default): preserve existing DOM order, new items go to top @@ -2267,7 +2288,9 @@ async function loadProjects({ resort = false } = {}) { const response = await window.api.getProjects('both'); if (obsolete()) return state.outcome; const { defaultProjects, allProjects } = response; - const globalSettings = await window.api.getSetting('global'); + const [globalSettings, folderArchives] = await Promise.all([ + window.api.getSetting('global'), window.api.getSetting('archivedProjects'), + ]); if (obsolete()) return state.outcome; let activeTerminals; try { activeTerminals = await window.api.getActiveTerminals(); } catch {} @@ -2280,6 +2303,7 @@ async function loadProjects({ resort = false } = {}) { setRemoteHostLabels(globalSettings?.remoteHosts); cachedProjects = defaultProjects; cachedAllProjects = allProjects; + window.refreshArchivedManager?.(cachedAllProjects, globalSettings)?.catch(error => console.warn('[switchboard] archived refresh failed', error)); window.clearReappearedProjectDeletionTargets?.(job.generation); const newerPending = state.latest !== job && state.latest.pending; loadingStatus.style.display = newerPending ? '' : 'none'; @@ -2359,7 +2383,7 @@ async function loadProjects({ resort = false } = {}) { } if (typeof observeSessionProjection === 'function') observeSessionProjection({ generation: job.generation, cause: 'projects', provenance: response.projection }); refreshSidebar({ resort: job.resort, skipUnchanged: true, - hiddenSettings: [globalSettings?.hiddenProjects, globalSettings?.hiddenProjectKinds, globalSettings?.hiddenProjectScopes] }); + hiddenSettings: [globalSettings?.hiddenProjects, globalSettings?.hiddenProjectKinds, globalSettings?.hiddenProjectScopes, folderArchives || {}] }); renderDefaultStatus(); return state.outcome; }; @@ -3279,7 +3303,9 @@ window.api.onProjectsChanged(payload => { if (activeTab === 'schedules' && payload?.cause?.some(cause => ['archive', 'project-added', 'project-deleted', 'project-remap', 'worktree-deleted', 'watcher', 'session-exit', 'session-attach'].includes(cause))) queueSchedulesReload(); // Debounce to avoid rapid re-renders during bulk changes if (projectsChangedTimer) clearTimeout(projectsChangedTimer); - if (activeTab !== 'sessions') { + const archivedPage = document.getElementById('settings-page-archived'); + const archivedVisible = archivedPage && !archivedPage.hidden && document.getElementById('settings-viewer')?.style.display !== 'none'; + if (activeTab !== 'sessions' && !archivedVisible) { projectsChangedWhileAway = true; return; } diff --git a/public/archived-manager.js b/public/archived-manager.js index 95628ca46..2d70976a7 100644 --- a/public/archived-manager.js +++ b/public/archived-manager.js @@ -1,21 +1,34 @@ // see .ai/contexts/ipc-bridge.md (Archived projects manager) let activeArchivedProjectsManager = null; +window.refreshArchivedManager = (projects, settings) => { + if (activeArchivedProjectsManager?.container.closest('#settings-viewer')?.style.display === 'none' + || activeArchivedProjectsManager?.container.closest('#settings-page-archived')?.hidden) { + activeArchivedProjectsManager.dirty = true; + return; + } + if (activeArchivedProjectsManager?.container.isConnected) return activeArchivedProjectsManager.refresh(projects, settings); +}; + function renderArchivedProjects(container, { entries, kinds = {}, dates = {}, folders = {}, hosts = [], projects = [], onCount }) { let projectEntries = new Set(entries.filter(entry => kinds[entry] !== 'delete')); folders = { ...folders }; let archived = [...new Set([...projectEntries, ...Object.keys(folders)])].filter(entry => kinds[entry] !== 'delete'); - const selected = new Set(), folded = new Set(); - let busy = false; + const selected = new Set(), folded = new Set(), expanded = new Set(); + let sessionEntries = new Map(), sessionGroups = new Map(), refreshVersion = 0; + let busy = false, holdingRefresh = false, pendingRefresh = null; container.innerHTML = `
- - + +
`; const list = container.querySelector('.archived-list'); const filter = container.querySelector('.archived-filter'); const bulk = container.querySelector('.archived-bulk'); const search = container.querySelector('.archived-search-toggle'); + const sessionName = session => cleanDisplayName(session.name || session.aiTitle || session.summary) || session.sessionId; + const sessionKey = session => 'session:' + session.sessionId; + const attribute = value => escapeHtml(value).replace(/"/g, '"'); const identity = entry => { const { alias: remoteAlias, folder: entryPath } = parseFolderKey(entry); const projectPath = remoteAlias && entryPath === '' ? '/' : entryPath; @@ -37,17 +50,29 @@ function renderArchivedProjects(container, { entries, kinds = {}, dates = {}, fo bulk.disabled = busy || !selected.size; list.querySelectorAll('.archived-select').forEach(box => { box.checked = selected.has(box.dataset.entry); }); list.querySelectorAll('.archived-select-all').forEach(box => { - const visible = [...box.closest('.archived-group').querySelectorAll('.archived-select')]; - box.checked = visible.length > 0 && visible.every(item => item.checked); - box.indeterminate = visible.some(item => item.checked) && !box.checked; + const keys = groupKeys(box); + box.checked = keys.length > 0 && keys.every(key => selected.has(key)); + box.indeterminate = keys.some(key => selected.has(key)) && !box.checked; }); } + function groupKeys(box) { + const group = box.closest('.archived-group'); + return group.dataset.sessionGroup ? sessionGroups.get(group.dataset.sessionGroup).map(sessionKey) + : [...group.querySelectorAll('.archived-select')].map(item => item.dataset.entry); + } function lock(value) { busy = value; + if (value) holdingRefresh = true; container.querySelectorAll('.archived-select, .archived-select-all, .archived-unarchive, .archived-delete').forEach(control => { control.disabled = busy || control.dataset.unavailable === 'true'; }); selection(); } - async function undo(restored) { + async function finishRefresh() { + holdingRefresh = false; + if (!pendingRefresh) return; + const args = pendingRefresh; pendingRefresh = null; + await manager.refresh(...args); + } + async function undo(restored, sessions = []) { if (busy) return; lock(true); const errors = []; @@ -63,14 +88,19 @@ function renderArchivedProjects(container, { entries, kinds = {}, dates = {}, fo dates = latest?.hiddenProjectArchivedAt || dates; } catch (error) { errors.push(`${project.name}: ${error.message}`); } } + for (const session of sessions) { + await window.persistSessionArchive(session, 1, false, error => errors.push(`${sessionName(session)}: ${error.message || error}`)); + } lock(false); render(); await reload(); - if (errors.length) await fail('Could not archive project', errors, filter); + if (errors.length) await fail(sessions.length ? 'Could not archive items' : 'Could not archive project', errors, filter); + await finishRefresh(); } async function restore(targets, button) { if (busy) return; lock(true); - const restored = [], restoredProjects = [], restoredFolders = [], errors = []; - for (const entry of targets) { + const restored = [], restoredProjects = [], restoredFolders = [], restoredSessions = [], errors = []; + const sessions = targets.filter(key => sessionEntries.has(key)).map(key => sessionEntries.get(key)); + for (const entry of targets.filter(key => !sessionEntries.has(key))) { try { if (projectEntries.has(entry)) { const result = await window.api.unarchiveProject(entry); @@ -89,26 +119,36 @@ function renderArchivedProjects(container, { entries, kinds = {}, dates = {}, fo archived = archived.filter(item => item !== entry); selected.delete(entry); restored.push(entry); } catch (error) { errors.push(`${identity(entry).name}: ${error.message}`); } } + for (const session of sessions) { + if (await window.persistSessionArchive(session, 0, false, error => errors.push(`${sessionName(session)}: ${error.message || error}`))) { + restoredSessions.push(session); selected.delete(sessionKey(session)); + } + } lock(false); - if (restored.length || restoredProjects.length) { + if (restored.length || restoredProjects.length || restoredSessions.length) { render(); filter.focus(); await reload(); const completed = [...new Set([...restored, ...restoredProjects])]; - const noticeId = 'archived-restored:' + completed.join('|'); - const message = completed.length === 1 + const noticeId = 'archived-restored:' + [...completed, ...restoredSessions.map(sessionKey)].join('|'); + const message = restoredSessions.length ? (completed.length + ? `${completed.length} ${restoredFolders.length ? 'projects and folders' : completed.length === 1 ? 'project' : 'projects'} and ${restoredSessions.length} session${restoredSessions.length === 1 ? '' : 's'} restored.` + : `${restoredSessions.length === 1 ? `Session "${sessionName(restoredSessions[0])}"` : `${restoredSessions.length} sessions`} restored.`) + : completed.length === 1 ? `${restoredProjects.length ? 'Project' : 'Folder'} "${identity(completed[0]).name}" restored.` : `${completed.length} ${restoredFolders.length ? 'projects and folders' : 'projects'} restored.`; - const notice = showAppNotice({ id: noticeId, kind: restoredProjects.length ? 'undo' : 'info', dismissOnAction: false, + const reversible = restoredProjects.length || restoredSessions.length; + const notice = showAppNotice({ id: noticeId, kind: reversible ? 'undo' : 'info', dismissOnAction: false, message: message + (restoredFolders.length - ? `${restoredProjects.length ? ' Undo re-archives projects only.' : ''} To archive folders again, use Archive folder.` : ''), - ...(restoredProjects.length ? { actionLabel: 'Undo', onAction: () => { + ? `${reversible ? ` Undo re-archives ${restoredSessions.length ? 'sessions and project archives' : 'projects only'}.` : ''} To archive folders again, use Archive folder.` : ''), + ...(reversible ? { actionLabel: 'Undo', onAction: () => { if (busy) return; clearAppNotice(noticeId); - return undo(restoredProjects); + return undo(restoredProjects, restoredSessions); } } : {}) }); notice.dataset.restoredEntries = JSON.stringify(restoredProjects); notice.dataset.loadGeneration = loadProjects.state?.started || 0; } - if (errors.length) await fail('Could not unarchive project', errors, button.isConnected ? button : filter); + if (errors.length) await fail(sessions.length ? 'Could not unarchive items' : 'Could not unarchive project', errors, button.isConnected ? button : filter); + await finishRefresh(); } async function remove(entry, button) { if (busy) return; @@ -136,23 +176,41 @@ function renderArchivedProjects(container, { entries, kinds = {}, dates = {}, fo if (reason.textContent === 'Checking deletion availability…') reason.textContent = ''; lock(false); if (button.isConnected) (button.disabled ? row.querySelector('summary') : button).focus(); + await finishRefresh(); } } function render() { - if (container.isConnected) onCount?.(archived.length); + const focused = document.activeElement; + const focusRow = focused?.closest('.archived-row'); + const focusEntry = list.contains(focusRow) ? focusRow.dataset.entry : null; + const focusIndex = focusEntry ? [...focusRow.querySelectorAll('input, button, summary')].indexOf(focused) : -1; + sessionEntries = new Map(projects.flatMap(project => (project.sessions || []) + .filter(session => session.archived && !session.parentSessionId).map(session => [sessionKey(session), session]))); + if (container.isConnected) onCount?.(`${archived.length} · ${sessionEntries.size}`); const query = filter.value.trim().toLowerCase(); const matches = archived.filter(entry => { const p = identity(entry); return [p.name, p.projectPath, p.remoteAlias || 'Local', p.remoteAlias && remoteHostLabel(p.remoteAlias, hosts)].join(' ').toLowerCase().includes(query); }); - for (const entry of selected) if (!matches.includes(entry)) selected.delete(entry); - if (!matches.length) { + sessionGroups = new Map(); + for (const project of projects) { + const key = JSON.stringify([project.remoteAlias || '', project.projectPath]); + const sessions = (project.sessions || []).filter(session => sessionEntries.has(sessionKey(session)) && + [sessionName(session), project.projectPath, project.remoteAlias || 'Local', project.remoteAlias && remoteHostLabel(project.remoteAlias, hosts)].join(' ').toLowerCase().includes(query)); + if (sessions.length) sessionGroups.set(key, [...(sessionGroups.get(key) || []), ...sessions]); + } + for (const entry of selected) if (!archived.includes(entry) && !sessionEntries.has(entry)) selected.delete(entry); + if (!matches.length && !sessionGroups.size && query) { list.innerHTML = `
${query ? `No archived item matches "${escapeHtml(filter.value.trim())}". ` : 'No archived project. Archive Project (a project’s settings) or Archive folder (a project header) lists it here.'}
`; list.querySelector('.archived-clear')?.addEventListener('click', clearFilter); selection(); return; } + if (!archived.length && !sessionEntries.size && !query) { + list.innerHTML = '
Nothing is archived. Archive hides a session, a folder or a project from the sidebar and keeps everything on disk; it is listed here.
'; + selection(); return; + } const aliases = [...new Set([null, ...hosts.map(h => h.alias.trim()), ...matches.map(entry => identity(entry).remoteAlias)])]; - list.innerHTML = aliases.map(alias => { + list.innerHTML = `

Projects and folders (${archived.length})

` + (matches.length ? aliases.map(alias => { const group = matches.filter(entry => identity(entry).remoteAlias === alias); if (!group.length) return ''; const label = alias === null ? 'Local' : remoteHostLabel(alias, hosts); @@ -164,19 +222,37 @@ function renderArchivedProjects(container, { entries, kinds = {}, dates = {}, fo const folder = folders[entry], hasFolder = Object.hasOwn(folders, entry), hasProject = projectEntries.has(entry); const archivedAt = folder?.archivedAt ?? dates[entry]; const date = typeof archivedAt === 'number' || typeof archivedAt === 'string' ? new Date(archivedAt) : null; - return `
- + return `
+
${escapeHtml(p.name)} ${hasProject ? 'Project' : ''}${hasFolder ? ' Folder' : ''}${hasProject && kinds[entry] === undefined ? ' legacy' : ''}${alias ? ` ${escapeHtml(alias)}` : ''}
-
${escapeHtml(p.projectPath)}
+
${escapeHtml(p.projectPath)}
${date && Number.isFinite(date.getTime()) ? `` : ''}${p.cached ? ` ${p.sessions.length} session${p.sessions.length === 1 ? '' : 's'}` : ''}${Array.isArray(folder?.disabledSchedules) && folder.disabledSchedules.length > 0 ? ` ${folder.disabledSchedules.length} schedule${folder.disabledSchedules.length === 1 ? '' : 's'} off` : ''}
-
⋯
+
⋯
`; }).join('')}`; - }).join(''); + }).join('') : '
No archived project. Archive Project (a project’s settings) or Archive folder (a project header) lists it here.
'); + list.insertAdjacentHTML('beforeend', `

Sessions (${sessionEntries.size})

${projectEntries.size ? '
Sessions of archived projects appear after Unarchive.
' : ''}`); + if (!sessionGroups.size) list.insertAdjacentHTML('beforeend', '
No archived session. The archive button on a sidebar row lists it here.
'); + for (const [key, sessions] of sessionGroups) { + const [alias, projectPath] = JSON.parse(key), label = `${alias ? remoteHostLabel(alias, hosts) + ' · ' : ''}${shortProjectPath(projectPath) || projectPath}`; + const shown = expanded.has(key) ? sessions : sessions.slice(0, 12); + list.insertAdjacentHTML('beforeend', `
+
+
${shown.map(session => { + const name = sessionName(session), date = session.modified ? new Date(session.modified) : null; + const size = Number.isFinite(session.fileSize) ? `${Math.round(session.fileSize / 1024)} KB` : ''; + const bg = session.bgJobId || (typeof bgAgentSessionIds !== 'undefined' && rowSessionIds(session).some(id => bgAgentSessionIds.has(String(id).toLowerCase()))); + return `
+ +
${escapeHtml(name)}${alias ? ` ${escapeHtml(alias)}` : ''}${bg ? ' bg' : ''}
+
${date && Number.isFinite(date.getTime()) ? `` : ''}${session.messageCount || 0} msgs${size}
+
⋯
`; + }).join('')}${shown.length < sessions.length ? `` : ''}
`); + } list.querySelectorAll('.archived-group-toggle').forEach(button => { const toggle = () => { - const alias = button.dataset.alias || null; + const alias = button.closest('.archived-group').dataset.sessionGroup || button.dataset.alias || null; if (folded.has(alias)) folded.delete(alias); else folded.add(alias); button.setAttribute('aria-expanded', String(!folded.has(alias))); button.firstElementChild.textContent = folded.has(alias) ? '▸' : '▾'; @@ -193,6 +269,14 @@ function renderArchivedProjects(container, { entries, kinds = {}, dates = {}, fo if (event.target.checked) selected.add(entry); else selected.delete(entry); selection(); }); row.querySelector('.archived-unarchive').addEventListener('click', event => restore([entry], event.currentTarget)); + if (row.classList.contains('archived-session-row')) { + row.querySelector('.archived-transcript').addEventListener('click', () => showJsonlViewer(sessionEntries.get(entry))); + row.querySelector('.archived-show-sidebar').addEventListener('click', () => window.showArchivedSessionInSidebar(sessionEntries.get(entry))); + row.querySelector('details').addEventListener('keydown', event => { + if (event.key === 'Escape') { event.currentTarget.open = false; event.currentTarget.querySelector('summary').focus(); event.stopPropagation(); } + }); + return; + } row.querySelector('.archived-delete').addEventListener('click', event => remove(entry, event.currentTarget)); row.querySelector('details').addEventListener('toggle', event => { const button = row.querySelector('.archived-delete'); @@ -211,11 +295,17 @@ function renderArchivedProjects(container, { entries, kinds = {}, dates = {}, fo }); }); list.querySelectorAll('.archived-select-all').forEach(box => box.addEventListener('change', () => { - box.closest('.archived-group').querySelectorAll('.archived-select').forEach(item => { - if (box.checked) selected.add(item.dataset.entry); else selected.delete(item.dataset.entry); + groupKeys(box).forEach(key => { + if (box.checked) selected.add(key); else selected.delete(key); }); selection(); })); + list.querySelectorAll('.archived-more').forEach(button => button.addEventListener('click', () => { + const key = button.closest('.archived-group').dataset.sessionGroup; + expanded.add(key); render(); + [...list.querySelectorAll('.archived-session-group')].find(group => group.dataset.sessionGroup === key)?.querySelectorAll('.archived-select')[12]?.focus(); + })); selection(); + if (focusEntry) [...list.querySelectorAll('.archived-row')].find(row => row.dataset.entry === focusEntry)?.querySelectorAll('input, button, summary')[focusIndex]?.focus(); } function clearFilter() { filter.value = ''; render(); filter.focus(); } filter.addEventListener('input', render); @@ -228,9 +318,15 @@ function renderArchivedProjects(container, { entries, kinds = {}, dates = {}, fo render(); const manager = { container, + dirty: false, setHosts(next) { hosts = next; render(); }, - async refresh() { - const [latest, folderArchives] = await Promise.all([window.api.getSetting('global'), window.api.getSetting('archivedProjects')]); + async refresh(nextProjects, settings) { + manager.dirty = false; + const version = ++refreshVersion; + const [latest, folderArchives] = await Promise.all([settings || window.api.getSetting('global'), window.api.getSetting('archivedProjects')]); + if (version !== refreshVersion) return; + if (holdingRefresh) { pendingRefresh = [nextProjects, settings]; return; } + projects = nextProjects || (typeof cachedAllProjects === 'undefined' ? projects : cachedAllProjects); kinds = { ...latest?.hiddenProjectKinds }; dates = latest?.hiddenProjectArchivedAt || {}; folders = { ...folderArchives }; diff --git a/public/settings-panel.js b/public/settings-panel.js index 1730c2278..5f717fc08 100644 --- a/public/settings-panel.js +++ b/public/settings-panel.js @@ -517,7 +517,6 @@ ` : ''} ${!isProject ? `
-
Projects and folders
Unarchive restores sidebar groups. Folder schedules stay off until you choose Turn back on. Actions apply immediately.
` : ''} @@ -685,6 +684,11 @@ if (!pages.has(id)) id = pageDefs[0][0]; selectedPage = id; applySettingsFilter(); + if (id === 'archived' && activeArchivedProjectsManager?.dirty + && pages.get(id).contains(activeArchivedProjectsManager.container)) { + activeArchivedProjectsManager.refresh(cachedAllProjects) + .catch(error => console.warn('[switchboard] archived refresh failed', error)); + } for (const button of navButtons) { const selected = button.dataset.section === id; button.classList.toggle('active', selected); diff --git a/public/sidebar.js b/public/sidebar.js index a85fd716e..c6e2e779e 100644 --- a/public/sidebar.js +++ b/public/sidebar.js @@ -82,7 +82,7 @@ function announceNotStopped(entries) { } } -async function persistSessionArchive(session, value, stopped = false) { +async function persistSessionArchive(session, value, stopped = false, onError) { const operation = value ? 'Archive' : 'Unarchive'; try { if (typeof window.api.archiveSession !== 'function') throw new Error('The archive backend is unavailable'); @@ -102,7 +102,8 @@ async function persistSessionArchive(session, value, stopped = false) { return true; } catch (error) { const reason = stopped ? `The process was stopped, but the row is not archived: ${error.message || error}` : error; - showSessionActionFailure(operation, session, reason, 'Check the session location and connection, then retry ' + operation + ' from the sidebar.'); + if (onError) onError(error); + else showSessionActionFailure(operation, session, reason, 'Check the session location and connection, then retry ' + operation + ' from the sidebar.'); return false; } } @@ -1291,6 +1292,13 @@ renderProjects.unchanged = projects => { return !sidebarRenderDirty && sidebarRenderKey === JSON.stringify(sidebarRenderInputs(projects)); }; +function archivedCounts(projects, entries = [], kinds = {}, folders = {}) { + return { + sessions: new Set(projects.flatMap(project => project.sessions.filter(session => session.archived && !session.parentSessionId).map(session => session.sessionId))).size, + projects: new Set([...entries, ...Object.keys(folders)].filter(entry => kinds[entry] !== 'delete')).size, + }; +} + function renderProjects(projects, resort, { keepFocus = false } = {}) { const scheduleRuns = new Map(); const changedScheduleItems = new Set(); @@ -1776,6 +1784,15 @@ function renderProjects(projects, resort, { keepFocus = false } = {}) { newSidebar.appendChild(group); } + if (typeof showArchived !== 'undefined' && showArchived) { + const [entries, kinds, , folders] = renderProjects.hiddenSettings || []; + const counts = archivedCounts(cachedAllProjects, entries, kinds, folders); + const footer = document.createElement('div'); + footer.className = 'sidebar-archived-footer'; + footer.innerHTML = `${counts.sessions} archived session${counts.sessions === 1 ? '' : 's'} · ${counts.projects} archived ${counts.projects === 1 ? 'project or folder' : 'projects and folders'} — `; + newSidebar.append(footer); + } + // Re-apply active state if (activeSessionId) { const activeItem = sessionItemEl(activeSessionId, newSidebar); @@ -1862,6 +1879,8 @@ function renderProjects(projects, resort, { keepFocus = false } = {}) { sortedOrder = newSortedOrder; rebindSidebarEvents(projects); + const manageArchived = sidebarContent.querySelector('.sidebar-archived-footer button'); + if (manageArchived) manageArchived.onclick = () => openSettingsViewer('global', null, null, { section: 'archived' }); paintProjectDeletionBusy(); if (typeof refreshGridCardMembers === 'function') refreshGridCardMembers(); diff --git a/public/style.css b/public/style.css index 5343e6acd..9755b9309 100644 --- a/public/style.css +++ b/public/style.css @@ -4272,6 +4272,10 @@ body { display: flex; flex-direction: column; } .archived-filter { flex: 1; min-width: 0; } .archived-search-toggle { display: none; } .archived-list { border: 1px solid var(--control-border); border-radius: 6px; background: var(--surface-sunken); } +.archived-list > .settings-section-title { padding: 12px; margin: 0; } +.archived-more { margin: 8px 12px; } +.sidebar-archived-footer { padding: 12px; border-top: 1px solid var(--hairline); color: var(--text-muted); font-size: 12px; overflow-wrap: anywhere; } +.settings-narrow .archived-session-row .archived-actions { flex-wrap: wrap; } .archived-group-header { display: flex; align-items: center; justify-content: space-between; gap: 8px; padding: 8px 12px; background: var(--surface-chrome); } .archived-group-header label { font-size: 11px; color: var(--text-muted); } .archived-group-toggle { border: 0; background: transparent; padding: 4px; text-align: left; overflow-wrap: anywhere; } diff --git a/test/dom-archived-manager.test.js b/test/dom-archived-manager.test.js index a50cee711..5433b3e01 100644 --- a/test/dom-archived-manager.test.js +++ b/test/dom-archived-manager.test.js @@ -122,8 +122,19 @@ test('filter matches name, path, host label and alias, clears by Escape and expo assert.equal(filter.value, ''); assert.equal(h.rows().length, 4); }); +test('settings lists projects and sessions as sibling groups with one heading each and a combined nav count', async t => { + const h = await setup(t); + h.w.cachedAllProjects = [{ projectPath: '/visible', sessions: [{ sessionId: 'archived', archived: 1, name: 'Archived session' }] }]; + await h.w.openSettingsViewer('global', null, null, { section: 'archived' }); + const headings = [...h.q('#settings-page-archived').querySelectorAll('h3')].map(el => el.textContent); + assert.deepEqual(headings, ['Projects and folders (4)', 'Sessions (1)']); + assert.equal(h.q('[data-section="archived"]').textContent, 'Archived (4 · 1)'); +}); + test('empty projects state explains both project and folder archives', async t => { const h = await setup(t, true); + h.w.cachedAllProjects = [{ projectPath: '/visible', sessions: [{ sessionId: 'archived', archived: 1 }] }]; + await h.w.openSettingsViewer('global', null, null, { section: 'archived' }); assert.match(h.q('#sv-archived-projects').textContent, /No archived project\./); assert.match(h.q('#sv-archived-projects').textContent, /Archive Project/); assert.match(h.q('#sv-archived-projects').textContent, /Archive folder/); @@ -378,6 +389,40 @@ test('opening 40 overflow menus and copying paths spends no deletion previews', assert.equal(h.calls.preview.length, 0, 'opening menus must not spend preview tokens or run discovery'); }); +test('Settings owns the archive description without rendering a redundant section title', async t => { + const h = await setup(t); + const render = h.w.renderArchivedProjects; + let title, description; + h.w.renderArchivedProjects = (container, options) => { + title = container.parentElement.querySelector(':scope > .settings-section-title'); + description = container.previousElementSibling; + return render(container, options); + }; + await h.w.openSettingsViewer('global', null, null, { section: 'archived' }); + assert.equal(title, null, 'Settings must not create a title for the manager to remove'); + assert.equal(description.className, 'settings-description'); + assert.equal(description.textContent, 'Unarchive restores sidebar groups. Folder schedules stay off until you choose Turn back on. Actions apply immediately.'); + assert.equal(description.closest('.settings-page').id, 'settings-page-archived'); + assert.equal(description.nextElementSibling.id, 'sv-archived-projects'); +}); + +test('quoted project paths retain exact row identity, accessible labels and restore target', async t => { + const h = await setup(t, true), entry = '/repo/a "b" & h.rows().length === 0); + assert.deepEqual(h.calls.restore, [entry]); +}); + for (const remembered of [false, true]) test(`one Delete click uses one preview with remembered choices=${remembered}`, async t => { const h = await setup(t), planner = plannerFor(h); if (remembered) { diff --git a/test/dom-archived-sessions.test.js b/test/dom-archived-sessions.test.js new file mode 100644 index 000000000..239e54935 --- /dev/null +++ b/test/dom-archived-sessions.test.js @@ -0,0 +1,301 @@ +'use strict'; +const test = require('node:test'); +const assert = require('node:assert/strict'); +const fs = require('node:fs'); +const path = require('node:path'); +const vm = require('node:vm'); +const { setupSidebarDom } = require('./dom-setup'); +const { loadAppFunctions } = require('./app-source'); + +async function waitFor(predicate) { + for (let i = 0; i < 150; i++) { + if (predicate()) return; + await new Promise(resolve => setTimeout(resolve, 10)); + } + assert.ok(predicate(), 'expected asynchronous UI state'); +} + +function setup(t, count = 2) { + const h = setupSidebarDom(); + t.after(() => h.destroy()); + const w = h.window, calls = []; + const sessions = Array.from({ length: count }, (_, i) => ({ sessionId: `s${i}`, name: `Session ${i}`, archived: 1, + modified: '2026-11-19T12:00:00Z', messageCount: 4, fileSize: 2048, folder: '-repo', projectPath: '/repo' })); + const projects = [{ projectPath: '/repo', folder: '-repo', sessions: [...sessions, + { sessionId: 'live', archived: 0 }, { sessionId: 'child', archived: 1, parentSessionId: 's0' }] }, + { projectPath: '/repo', folder: 'vps::-repo', remoteAlias: 'vps', sessions: [ + { sessionId: 'remote', aiTitle: 'a "b" & key === 'global' ? settings : {}; + w.api.archiveSession = async (id, value) => { calls.push(['session', id, value]); return { ok: true }; }; + w.api.unarchiveProject = async entry => { calls.push(['project', entry, 0]); settings.hiddenProjects = []; return { ok: true }; }; + w.api.archiveProjectSettings = async () => { calls.push(['project', '/hidden', 1]); settings.hiddenProjects = ['/hidden']; return { ok: true }; }; + w.showJsonlViewer = session => calls.push(['transcript', session]); + const container = h.document.createElement('div'); h.document.body.append(container); + const filename = path.join(__dirname, '../public/archived-manager.js'); + vm.runInContext(fs.readFileSync(filename, 'utf8'), h.context, { filename }); + const manager = w.renderArchivedProjects(container, { entries: settings.hiddenProjects, kinds: settings.hiddenProjectKinds, + projects, hosts: [{ alias: 'vps', label: 'Server' }] }); + const q = selector => container.querySelector(selector); + const rows = () => [...container.querySelectorAll('.archived-session-row')]; + return { ...h, w, calls, sessions, projects, settings, container, manager, q, rows }; +} + +test('archived sessions are top-level only, grouped by host-qualified project with metadata and safe names', t => { + const h = setup(t); + assert.equal(h.rows().length, 3, 'three top-level archived sessions'); + assert.deepEqual([...h.container.querySelectorAll('.archived-session-group .archived-group-toggle')].map(el => el.textContent.trim()), ['▾ repo (2)', '▾ Server · repo (1)']); + assert.match(h.rows()[0].textContent, /Session 0.*4 msgs.*2 KB/s); + assert.ok(h.rows()[0].querySelector('time[datetime]')); + const remote = h.rows()[2]; + assert.equal(remote.querySelector('.archived-name strong').textContent, 'a "b" & { + const h = setup(t, 14); + assert.equal(h.rows().length, 13, 'twelve local rows and one remote row initially'); + assert.equal(h.q('.archived-more').textContent, 'Show 2 more'); + h.q('.archived-session-group .archived-select-all').click(); + assert.equal(h.q('.archived-bulk').textContent, 'Unarchive selected (14)'); + h.q('.archived-more').click(); + assert.equal(h.rows().length, 15); + assert.equal(h.rows().filter(row => row.querySelector('input').checked).length, 14); +}); + +test('Transcript receives the session; Unarchive persists then removes the row and Undo rearchives it', async t => { + const h = setup(t); + assert.ok(h.q('.archived-transcript'), 'session Transcript action exists'); + h.q('.archived-transcript').click(); + assert.equal(h.calls[0][1], h.sessions[0]); + h.rows()[0].querySelector('.archived-unarchive').click(); + await waitFor(() => h.document.querySelector('.app-notice-action')); + assert.deepEqual(h.calls[1], ['session', 's0', 0]); + assert.equal(h.rows().length, 2); + assert.match(h.document.querySelector('.app-notice').textContent, /Session.*restored/); + h.document.querySelector('.app-notice-action').click(); + await waitFor(() => h.rows().length === 3); + assert.deepEqual(h.calls[2], ['session', 's0', 1]); +}); + +test('mixed bulk restores projects before sessions and has one combined Undo', async t => { + const h = setup(t); + assert.equal(h.rows().length, 3, 'sessions available to bulk selection'); + h.rows()[0].querySelector('input').click(); h.rows()[1].querySelector('input').click(); + h.q('.archived-row:not(.archived-session-row) input').click(); + assert.equal(h.q('.archived-bulk').textContent, 'Unarchive selected (3)'); + h.q('.archived-bulk').click(); + await waitFor(() => h.document.querySelector('.app-notice-action')); + assert.deepEqual(h.calls, [['project', '/hidden', 0], ['session', 's0', 0], ['session', 's1', 0]]); + assert.equal(h.document.querySelectorAll('.app-notice').length, 1); + assert.match(h.document.querySelector('.app-notice').textContent, /1 project.*2 sessions.*restored/s); + h.document.querySelector('.app-notice-action').click(); + await waitFor(() => h.rows().length === 3); + assert.deepEqual(h.calls.slice(3), [['project', '/hidden', 1], ['session', 's0', 1], ['session', 's1', 1]]); +}); + +test('session restore refusal keeps row, selection and focus, with an actionable error', async t => { + const h = setup(t); + assert.equal(h.rows().length, 3, 'session rows available for refusal'); + h.w.api.archiveSession = async () => ({ ok: false, error: 'Host refused' }); + h.rows()[0].querySelector('input').click(); + const button = h.rows()[0].querySelector('.archived-unarchive'); button.focus(); button.click(); + await waitFor(() => h.document.querySelector('.choice-dialog')); + assert.match(h.document.querySelector('.choice-dialog').textContent, /Could not unarchive.*Session 0.*Host refused/s); + h.document.querySelector('.choice-dialog-confirm').click(); + await waitFor(() => h.document.activeElement === button); + assert.equal(h.rows().length, 3); + assert.equal(h.q('.archived-bulk').textContent, 'Unarchive selected (1)'); +}); + +test('accepted project reload refreshes the mounted manager without losing its filter or checked set', async t => { + const h = setup(t), filter = h.q('.archived-filter'); + filter.value = 'hidden'; filter.dispatchEvent(new h.w.Event('input')); + h.q('.archived-select').click(); + h.w.loadingStatus = h.document.createElement('div'); + for (const name of ['reportActivityFocus', 'reportActivityTitles', 'refreshSidebar', 'renderDefaultStatus']) h.w[name] = () => {}; + h.w.pollActiveSessions = async () => {}; + h.settings.hiddenProjects.push('/hidden-new'); + const next = structuredClone(h.projects); next[0].sessions.push({ sessionId: 'new', name: 'hidden session', archived: 1 }); + h.w.api.getProjects = async () => ({ defaultProjects: [], allProjects: next }); + h.w.api.getActiveTerminals = async () => []; + const fns = loadAppFunctions(h.context, { functions: ['dedup', 'loadProjects'] }); + await fns.loadProjects(); + await waitFor(() => h.container.textContent.includes('hidden-new')); + assert.equal(filter.value, 'hidden'); + assert.equal(h.q('[data-entry="/hidden"] input').checked, true); + assert.equal(h.rows().length, 1); + h.rows()[0].querySelector('input').click(); + await fns.loadProjects(); + assert.equal(h.q('.archived-bulk').textContent, 'Unarchive selected (2)'); +}); + +test('archive filter footer counts top-level sessions and non-deleted project entries, then opens Archived', t => { + const h = setup(t), opened = []; + h.w.openSettingsViewer = (...args) => opened.push(args); + h.w.renderProjects.hiddenSettings = [['/hidden', '/deleted'], { '/deleted': 'delete' }]; + h.w.showArchived = false; h.w.renderProjects([]); + assert.equal(h.document.querySelector('.sidebar-archived-footer'), null); + h.w.showArchived = true; h.w.renderProjects([]); + const footer = h.document.querySelector('.sidebar-archived-footer'); + assert.ok(footer, 'archive filter exposes a management footer even with no visible project'); + assert.equal(footer.textContent, '3 archived sessions · 1 archived project or folder — Manage'); + footer.querySelector('button').click(); + assert.deepEqual(JSON.parse(JSON.stringify(opened)), [['global', null, null, { section: 'archived' }]]); + assert.equal(typeof h.w.archivedCounts, 'function', 'counts helper exported to renderer tests'); +}); + +test('session filter supports title and host, empty and no-match states, Escape and keyboard folding', t => { + const h = setup(t), filter = h.q('.archived-filter'); + filter.value = 'Server'; filter.dispatchEvent(new h.w.Event('input')); + assert.equal(h.rows().length, 1, 'host label filters sessions too'); + filter.value = 'absent'; filter.dispatchEvent(new h.w.Event('input')); + assert.match(h.q('.archived-empty').textContent, /No archived item matches "absent"/); + filter.dispatchEvent(new h.w.KeyboardEvent('keydown', { key: 'Escape', bubbles: true })); + const toggle = h.q('.archived-session-group .archived-group-toggle'); + toggle.dispatchEvent(new h.w.KeyboardEvent('keydown', { key: ' ', bubbles: true, cancelable: true })); + assert.equal(toggle.getAttribute('aria-expanded'), 'false'); + assert.equal(h.q('.archived-session-group .archived-group-rows').hidden, true); +}); + +test('Show in sidebar reveals an old archived row through conflicting filters without opening it', async t => { + const h = setup(t); + assert.ok(h.q('.archived-show-sidebar'), 'session overflow offers Show in sidebar'); + h.w.showArchived = false; h.w.showStarredOnly = h.w.showRunningOnly = h.w.showTodayOnly = true; + h.w.searchMatchIds = new Set(['other']); + h.w.searchInput = h.document.createElement('input'); h.w.searchBar = h.document.createElement('div'); + h.w.activeTab = 'sessions'; + loadAppFunctions(h.context, { functions: ['clearSearch', 'showArchivedSessionInSidebar'], declarations: ['searchGeneration', 'searchDebounceTimer', 'clearRenderRaf'] }); + h.w.closeSettingsViewer = () => h.container.remove(); + let renders = 0; + h.w.refreshSidebar = () => { renders++; h.w.renderProjects(h.w.cachedAllProjects); }; + h.w.sessionMaxAgeDays = 0; + h.q('.archived-show-sidebar').click(); + assert.equal(h.w.showArchived, true); + assert.equal(h.w.showStarredOnly || h.w.showRunningOnly || h.w.showTodayOnly, false); + const row = h.document.getElementById('si-s0'); + assert.ok(row, 'target row rendered'); + assert.equal(h.document.activeElement, row); + assert.deepEqual(h.calls, [], 'no resume or transcript is requested'); + await new Promise(resolve => h.w.requestAnimationFrame(resolve)); + assert.equal(renders, 1, 'no deferred clear-search rebuild may steal the revealed row focus'); +}); + +test('entirely empty archives show only the shared explanation', async t => { + const h = setup(t); + h.w.cachedAllProjects = []; h.settings.hiddenProjects = []; + await h.manager.refresh(); + assert.equal(h.q('.archived-list').textContent, 'Nothing is archived. Archive hides a session, a folder or a project from the sidebar and keeps everything on disk; it is listed here.'); + assert.equal(h.container.querySelectorAll('.archived-empty').length, 1); +}); + +test('mixed partial failures keep failed rows and Undo restores successful sessions only', async t => { + const h = setup(t); + h.w.api.archiveSession = async (id, value) => { + h.calls.push(['session', id, value]); return id === 's0' ? { ok: false, error: 'Refused zero' } : { ok: true }; + }; + h.rows()[0].querySelector('input').click(); h.rows()[1].querySelector('input').click(); + h.q('.archived-bulk').click(); + await waitFor(() => h.document.querySelector('.choice-dialog')); + assert.match(h.document.querySelector('.choice-dialog').textContent, /Session 0.*Refused zero/s); + assert.equal(h.document.querySelectorAll('.app-notice').length, 1); + assert.equal(h.rows().length, 2); + h.document.querySelector('.choice-dialog-confirm').click(); + h.document.querySelector('.app-notice-action').click(); + await waitFor(() => h.rows().length === 3); + assert.deepEqual(h.calls, [['session', 's0', 0], ['session', 's1', 0], ['session', 's1', 1]]); +}); + +test('a snapshot received during a refused restore is applied after the alert closes', async t => { + const h = setup(t); + let release; + h.w.api.archiveSession = () => new Promise(resolve => { release = resolve; }); + h.rows()[0].querySelector('.archived-unarchive').click(); + const next = structuredClone(h.projects); + next[0].sessions.push({ sessionId: 'later', archived: 1, name: 'Later' }); + h.w.cachedAllProjects = next; + await h.manager.refresh(next, h.settings); + assert.equal(h.rows().length, 3, 'active action retains its row'); + release({ ok: false, error: 'refused' }); + await waitFor(() => h.document.querySelector('.choice-dialog')); + h.document.querySelector('.choice-dialog-confirm').click(); + await waitFor(() => h.rows().length === 4); +}); + +test('projects-changed refreshes an open Archived page even when the sidebar tab is Memory', async t => { + const h = setup(t); + const viewer = h.document.createElement('div'); viewer.id = 'settings-viewer'; viewer.style.display = 'flex'; + const page = h.document.createElement('section'); page.id = 'settings-page-archived'; + h.document.body.append(viewer); viewer.append(page); page.append(h.container); + h.w.activeTab = 'memory'; h.w.projectsChangedTimer = null; h.w.projectsChangedWhileAway = false; + h.w.reloadProjects = async () => { h.calls.push(['reload']); await h.manager.refresh(); }; + let changed; + h.w.api.onProjectsChanged = cb => { changed = cb; }; + const filename = path.join(__dirname, '../public/app.js'), source = fs.readFileSync(filename, 'utf8'); + const start = source.indexOf('window.api.onProjectsChanged(payload => {'); + vm.runInContext(source.slice(start, source.indexOf('\n});', start) + 4), h.context, { filename }); + h.w.cachedAllProjects = [...h.projects, { projectPath: '/new', sessions: [{ sessionId: 'new', archived: 1 }] }]; + changed({ cause: ['archive'] }); + await waitFor(() => h.rows().length === 4); + assert.deepEqual(h.calls, [['reload']]); + viewer.style.display = 'none'; + changed({ cause: ['archive'] }); + assert.equal(h.w.projectsChangedWhileAway, true, 'a closed viewer keeps the existing deferred reload'); +}); + +test('accepted snapshots do not read archive settings for a closed viewer', async t => { + const h = setup(t); + const viewer = h.document.createElement('div'); viewer.id = 'settings-viewer'; viewer.style.display = 'none'; + h.document.body.append(viewer); viewer.append(h.container); + let reads = 0; + h.w.api.getSetting = async () => { reads++; return {}; }; + await h.w.refreshArchivedManager(h.projects, h.settings); + assert.equal(reads, 0, 'closed Settings must not add archive reads to every sidebar refresh'); +}); + +test('accepted snapshots leave a hidden Archived page untouched while Settings is open elsewhere', async t => { + const h = setup(t); + const viewer = h.document.createElement('div'); viewer.id = 'settings-viewer'; viewer.style.display = 'flex'; + const page = h.document.createElement('section'); page.id = 'settings-page-archived'; page.hidden = true; + h.document.body.append(viewer); viewer.append(page); page.append(h.container); + const row = h.rows()[0]; + let reads = 0; + h.w.api.getSetting = async () => { reads++; return {}; }; + await h.w.refreshArchivedManager(h.projects, h.settings); + assert.equal(reads, 0, 'hidden Archived page must not read archive settings'); + assert.equal(h.rows()[0], row, 'hidden Archived page retains its DOM'); + page.hidden = false; + await h.w.refreshArchivedManager(h.projects, h.settings); + assert.equal(reads, 1, 'visible Archived page still refreshes'); + assert.notEqual(h.rows()[0], row); +}); + +test('loadProjects footer counts folder-only and combined archives exactly like the page', async t => { + const h = setup(t, 0); + const folders = { '/folder': {}, '/hidden': {}, '/deleted': {} }; + h.settings.hiddenProjects.push('/deleted'); + h.w.api.getSetting = async key => key === 'global' ? h.settings : folders; + h.w.api.getProjects = async () => ({ defaultProjects: [], allProjects: h.projects }); + h.w.api.getActiveTerminals = async () => []; + h.w.loadingStatus = h.document.createElement('div'); + for (const name of ['reportActivityFocus', 'reportActivityTitles', 'renderDefaultStatus']) h.w[name] = () => {}; + h.w.pollActiveSessions = async () => {}; + h.w.refreshSidebar = ({ hiddenSettings }) => { + h.w.renderProjects.hiddenSettings = hiddenSettings; + h.w.renderProjects([]); + }; + h.w.showArchived = true; + await loadAppFunctions(h.context, { functions: ['dedup', 'loadProjects'] }).loadProjects(); + await h.manager.refresh(h.projects, h.settings); + assert.equal(h.q('.settings-section-title').textContent, 'Projects and folders (2)'); + assert.equal(h.document.querySelector('.sidebar-archived-footer').textContent, + '1 archived session · 2 archived projects and folders — Manage'); + assert.equal(h.w.renderProjects.unchanged([]), true); + delete folders['/folder']; + assert.equal(h.w.renderProjects.unchanged([]), false, 'folder archives participate in the sidebar render key'); +}); diff --git a/test/dom-settings-nav.test.js b/test/dom-settings-nav.test.js index 017658857..af8caf4cb 100644 --- a/test/dom-settings-nav.test.js +++ b/test/dom-settings-nav.test.js @@ -312,6 +312,28 @@ function setup(t) { return { w, q, nav, open, click, active, saved, timers, observers, ctx }; } +test('Archived shows the latest snapshot and count after refresh was skipped on General', async t => { + const h = setup(t); + await h.open(); + assert.deepEqual(h.active(), ['general']); + const nav = h.nav().find(button => button.dataset.section === 'archived'); + assert.equal(nav.textContent, 'Archived (0 · 0)'); + let reads = 0; + h.w.api.getSetting = async key => { reads++; return h.saved[key] || {}; }; + h.w.cachedAllProjects = [{ projectPath: '/repo', sessions: [ + { sessionId: 'newly-archived', name: 'New archive', archived: 1 }, + ] }]; + await h.w.refreshArchivedManager(h.w.cachedAllProjects, {}); + assert.equal(reads, 0, 'hidden Archived page does not read settings'); + assert.equal(h.q('.archived-session-row'), null); + h.click('archived'); await settle(); + assert.equal(h.q('.archived-session-row')?.dataset.entry, 'session:newly-archived', 'opening Archived renders the skipped snapshot'); + assert.equal(nav.textContent, 'Archived (0 · 1)'); + assert.equal(reads, 2, 'showing a dirty manager refreshes both settings'); + h.click('general'); h.click('archived'); await settle(); + assert.equal(reads, 2, 'a clean manager does not repeat the refresh'); +}); + test('unrelated global saves and repeated saves do not reapply Codex usage', async t => { const h = setup(t); const applied = []; diff --git a/test/projects-reload-order-719.test.js b/test/projects-reload-order-719.test.js index 17731fb5d..974db9783 100644 --- a/test/projects-reload-order-719.test.js +++ b/test/projects-reload-order-719.test.js @@ -33,7 +33,11 @@ function fixture(t) { for (const name of ['reportActivityFocus', 'reportActivityTitles', 'renderDefaultStatus', 'setRemoteHostLabels']) w[name] = () => {}; w.refreshSidebar = () => paints.push(w.cachedProjects[0]?.projectPath); w.api.getProjects = mode => { assert.equal(mode, 'both'); const d = deferred(); requests.push(d); return d.promise; }; - w.api.getSetting = () => { const d = deferred(); settings.push(d); return d.promise; }; + w.api.getSetting = key => { + if (key === 'archivedProjects') return Promise.resolve({}); + assert.equal(key, 'global'); + const d = deferred(); settings.push(d); return d.promise; + }; w.api.getActiveTerminals = async () => []; w.pollActiveSessions = () => { const d = deferred(); polls.push(d); return d.promise; }; const { loadProjects, reloadProjects } = loadAppFunctions(h.context, { functions: ['dedup', 'loadProjects', 'reloadProjects'], declarations: ['startupProjectsHandedOver'] }); @@ -41,6 +45,23 @@ function fixture(t) { return { ...h, w, requests, settings, polls, paints, loadProjects, reloadProjects, reply }; } +for (const firstKey of ['global', 'archivedProjects']) { + test(`settings reads start together and wait for both, ${firstKey} resolves first`, async t => { + const h = fixture(t), reads = [], held = { global: deferred(), archivedProjects: deferred() }; + h.w.api.getSetting = key => { reads.push(key); return held[key].promise; }; + const loaded = h.loadProjects(); + h.reply(0, 'current'); await flush(); + assert.deepEqual(reads, ['global', 'archivedProjects'], 'both settings reads start before either completes'); + held[firstKey].resolve({}); await flush(); + assert.equal(h.polls.length, 0, 'projection waits for the other settings read'); + assert.equal(h.paints.length, 0); + held[firstKey === 'global' ? 'archivedProjects' : 'global'].resolve({}); await flush(); + assert.equal(h.polls.length, 1); + h.polls[0].resolve(); await loaded; + assert.deepEqual(h.paints, ['current']); + }); +} + for (const boundary of ['projects', 'settings', 'terminals', 'poll']) { test(`T4.2 older ${boundary} completion cannot alter a newer accepted projection`, async t => { const h = fixture(t), terminals = [];