@leftoff/cli 0.9.17 → 0.9.18-beta.10

package/ui/what-it-did.js

@@ -5,6 +5,7 @@
 // app.js) so they can be checked without a browser.
 import { icon } from './icons.js'
 import { diffBlocks, splitPath } from './diff-view.js'
+import { fileScopeSegHtml, scopeTagHtml, unreadableLines } from './semdiff.js' // 2026-11-03 This session · Whole folder, the walkthrough's own rule
 
 const esc = (s) => String(s == null ? '' : s).replace(/[&<>"']/g, (c) => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c]))
 const plural = (n, w) => n + ' ' + w + (n === 1 ? '' : 's')
@@ -63,12 +64,12 @@ export function fileRowHtml(f, ui, sid) {
   const bodyId = 'wid-f-' + esc(encodeURIComponent(f.path).replace(/%/g, '_'))
   const bar = '<span class="gd-bar" aria-hidden="true">' + diffBlocks(f.add, f.del).map((b) => '<i class="gd-b' + b + '"></i>').join('') + '</span>'
   const counts = f.binary ? '<span class="wid-n">binary</span>' : f.big ? '<span class="wid-n">big</span>' : '<span class="wid-add">+' + esc(f.add) + '</span> <span class="wid-del">−' + esc(f.del) + '</span>' + bar
-  let h = '<li class="wid-item' + (open ? ' open' : '') + '">'
+  let h = '<li class="wid-item' + (open ? ' open' : '') + (f.notSession ? ' nots' : '') + '">'
   h += '<button type="button" class="wid-row wid-file" data-action="wid-file" data-id="' + esc(sid) + '" data-path="' + esc(f.path) + '" aria-expanded="' + open + '" aria-controls="' + bodyId + '">'
   h += '<span class="wid-chev" aria-hidden="true">' + icon(open ? 'chevron-down' : 'chevron-right') + '</span>'
   h += '<span class="wid-st st-' + esc(f.status) + '" data-tip="' + esc(word) + '" aria-label="' + esc(word) + '">' + letter + '</span>'
   const [dir, base] = splitPath(f.path)
-  h += '<span class="wid-path mono">' + (dir ? '<span class="wid-dir">' + esc(dir) + '</span>' : '') + '<b class="wid-base">' + esc(base) + '</b></span><span class="wid-counts">' + counts + '</span></button>'
+  h += '<span class="wid-path mono">' + (dir ? '<span class="wid-dir">' + esc(dir) + '</span>' : '') + '<b class="wid-base">' + esc(base) + '</b>' + scopeTagHtml(f, { esc }) + '</span><span class="wid-counts">' + counts + '</span></button>'
   if (open) {
     const v = ui.files[f.path]
     h += '<div class="wid-out" id="' + bodyId + '">'
@@ -91,16 +92,22 @@ export function fileRowHtml(f, ui, sid) {
 
 function diffHtml(ui, sid) {
   const d = ui.diff
-  let h = '<div class="wid-sub"><h3>This folder’s changes</h3>'
+  // 2026-11-03 scoped like the walkthrough: This session (the default) or Whole folder, counts on both
+  const fsc = d && d.fileScope && d.fileScope.session != null ? d.fileScope : null
+  const title = fsc && fsc.key !== 'folder' ? 'This session’s changes' : 'This folder’s changes'
+  let h = '<div class="wid-sub"><h3>' + title + '</h3>'
   if (d && d.folder && !d.tooBig && !d.noRepo) h += '<span class="wid-meta">' + esc(d.folder) + (d.totals && d.totals.files ? ' · ' + plural(d.totals.files, 'file') + ' · <span class="wid-add">+' + esc(d.totals.add) + '</span> <span class="wid-del">−' + esc(d.totals.del) + '</span>' : '') + '</span>'
   h += '</div>'
+  if (fsc) h += '<div class="wid-scope">' + fileScopeSegHtml(fsc, { esc, icon, action: 'wid-files', busy: !!ui.loading }) + '</div>'
   if (ui.diffError) return h + '<p class="wid-note">' + esc(ui.diffError) + '</p>'
   if (!d) return h + '<p class="wid-note">Loading…</p>'
   if (d.tooBig) return h + '<p class="wid-note">Too big to show here.</p>'
   if (d.noRepo) return h + '<p class="wid-note">' + (d.noRepo === 'not_a_repo' ? 'This folder isn’t a git repository.' : d.noRepo === 'no_git' ? 'git isn’t installed on that Mac.' : 'This session’s folder isn’t there any more.') + '</p>'
-  if (!d.files || !d.files.length) return h + '<p class="wid-note">No uncommitted changes.</p>'
-  h += '<ul class="wid-list">' + d.files.map((f) => fileRowHtml(f, ui, sid)).join('') + '</ul>'
+  const notes = unreadableLines({ baseNotes: d.baseNotes }).map((l) => '<p class="wid-note wid-scope-n">' + icon('info') + '<span>' + esc(l) + '</span></p>').join('')
+  if (!d.files || !d.files.length) return h + notes + '<p class="wid-note">' + (fsc && fsc.key !== 'folder' ? (fsc.folder ? 'No uncommitted changes from this session (' + plural(fsc.folder, 'file') + ' in the whole folder).' : 'No uncommitted changes from this session.') : 'No uncommitted changes.') + '</p>'
+  h += notes + '<ul class="wid-list">' + d.files.map((f) => fileRowHtml(f, ui, sid)).join('') + '</ul>'
   if (d.truncated) h += '<p class="wid-note">Showing the first ' + d.files.length + ' of ' + esc(d.totals.files) + ' files.</p>'
+  if (fsc && fsc.key !== 'folder') return h + '<p class="wid-foot">Uncommitted changes this session made in its folder. Whole folder shows everything, other sessions’ changes too.</p>'
   return h + '<p class="wid-foot">Uncommitted changes in the session’s folder (staged, unstaged and new files). Other sessions in this folder show the same changes.</p>'
 }