@happy-nut/monacori 0.1.23 → 0.1.26

package/dist/viewer.client.js

@@ -918,10 +918,18 @@ function allQuickItems() {
   }));
 }
 
+// The agent's plan file, pinned to the top of Recent so a freshly-written plan is one ⌘E away — loadRecent
+// only tracks files you've opened, so a brand-new plan would otherwise be absent until first opened.
+var PLAN_PATH = '.monacori/plan.md';
+function planQuickItem() {
+  var f = sourceByPath.get(PLAN_PATH);
+  if (!f) return null;
+  return { path: f.path, name: baseName(f.path), detail: 'plan', kind: 'source', recent: true, recentRank: -1 };
+}
 function recentItems() {
   const all = allQuickItems();
   const byPath = new Map(all.map((item) => [item.path, item]));
-  return loadRecent()
+  const items = loadRecent()
     .map((item) => byPath.get(item.path) || {
       path: item.path,
       name: baseName(item.path),
@@ -931,6 +939,9 @@ function recentItems() {
       recentRank: 0,
     })
     .map((item, index) => ({ ...item, recent: true, recentRank: index }));
+  const plan = planQuickItem();
+  if (plan) return [plan].concat(items.filter((it) => it.path !== plan.path));
+  return items;
 }
 
 function scoreQuickItem(item, query) {
@@ -1184,11 +1195,22 @@ document.addEventListener('keydown', (event) => {
     toggleHistory();
     return;
   }
+  if (typeof isHistoryOpen === 'function' && isHistoryOpen() && typeof handleHistoryKey === 'function' && handleHistoryKey(event)) return;
 
   // Settings overlay (or a focused merged/memo dock) captures keys: stand down the rest of the global
   // shortcuts (Cmd+1, F7, Cmd+[/], Cmd+B, …). Each has its own Esc + editing handlers.
   if (isFloatingModalOpen()) return;
 
+  // Cmd/Ctrl+A in the diff/source view selects ONLY that view's content (the browser default reached into
+  // the sidebar + terminal). In an editable field, let the default select-within-field stand.
+  if ((event.metaKey || event.ctrlKey) && !event.shiftKey && !event.altKey && (event.key === 'a' || event.key === 'A')) {
+    var aae = document.activeElement;
+    if (!(aae && (aae.tagName === 'INPUT' || aae.tagName === 'TEXTAREA' || aae.tagName === 'SELECT')) && selectAllInView()) {
+      event.preventDefault();
+      return;
+    }
+  }
+
   if ((event.metaKey || event.ctrlKey) && !event.shiftKey && !event.altKey && event.key === '1') {
     event.preventDefault();
     // Coming from the diff: open the file you were viewing as source so Cmd+1 lands ON it (not a stale/blank
@@ -1636,7 +1658,6 @@ window.addEventListener('beforeunload', saveUiState);
   });
   ensureDiffCursor();
 })();
-
 // ===== Side-by-side diff caret (keyboard navigation across the old/new panes) =====
 function isDiffViewVisible() {
   var d = document.getElementById('diff-view');
@@ -2078,6 +2099,19 @@ function commentsAt(path, line) {
 function commentKindLabel(kind) {
   return kind === 'q' ? t('comment.kind.q') : t('comment.kind.c');
 }
+// Monochrome inline icons for the two comment kinds: a help-circle for questions, a pencil for change
+// requests (the pencil path matches the activity-rail "c" button). No emoji, no color — stroke=currentColor
+// so the kind pill stays monotone (.mc-kind in viewer.css); the icon, not the color, distinguishes q vs c.
+function commentKindIcon(kind) {
+  var path = kind === 'q'
+    ? '<circle cx="12" cy="12" r="9"/><path d="M9.4 9.3a2.7 2.7 0 0 1 5.2 1c0 1.8-2.6 2.4-2.6 2.4"/><line x1="12" y1="16.7" x2="12.01" y2="16.7"/>'
+    : '<path d="M14.5 5.5l4 4"/><path d="M4.5 19.5l1-4 10-10 3 3-10 10z"/>';
+  return '<svg class="mc-kind-ic" viewBox="0 0 24 24" width="13" height="13" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true">' + path + '</svg>';
+}
+// Full inner HTML for a .mc-kind pill: monochrome icon + the (localized) label.
+function commentKindHtml(kind) {
+  return commentKindIcon(kind) + '<span class="mc-kind-text">' + escapeHtml(commentKindLabel(kind)) + '</span>';
+}
 function relevantLines(path) {
   var set = {};
   reviewComments.forEach(function (c) { if (c.path === path) set[c.line] = true; });
@@ -2181,14 +2215,14 @@ function threadHtml(path, line) {
   commentsAt(path, line).forEach(function (c) {
     if (composerState && composerState.editSeq === c.seq) return; // being edited -> rendered as the composer below
     html += '<div class="mc-card mc-' + c.kind + '">'
-      + '<div class="mc-card-head"><span class="mc-kind">' + commentKindLabel(c.kind) + '</span>'
+      + '<div class="mc-card-head"><span class="mc-kind">' + commentKindHtml(c.kind) + '</span>'
       + '<button type="button" class="mc-del" data-seq="' + c.seq + '" title="' + escapeHtml(t('composer.delete')) + '">×</button></div>'
       + '<div class="mc-card-body">' + escapeHtml(c.text) + '</div></div>';
   });
   if (composerState && composerState.path === path && composerState.line === line) {
     var ph = composerState.kind === 'q' ? t('composer.question') : t('composer.changeRequest');
     html += '<div class="mc-card mc-' + composerState.kind + ' mc-composer">'
-      + '<div class="mc-card-head"><span class="mc-kind">' + commentKindLabel(composerState.kind) + '</span><span class="mc-target" title="' + escapeHtml(composerState.path || '') + '">' + escapeHtml(composerTargetLabel(composerState)) + '</span></div>'
+      + '<div class="mc-card-head"><span class="mc-kind">' + commentKindHtml(composerState.kind) + '</span><span class="mc-target" title="' + escapeHtml(composerState.path || '') + '">' + escapeHtml(composerTargetLabel(composerState)) + '</span></div>'
       + '<textarea class="mc-input" rows="3" placeholder="' + escapeHtml(ph) + '">' + escapeHtml(composerState.editText || '') + '</textarea>'
       + '<div class="mc-actions"><button type="button" class="mc-btn mc-save">' + escapeHtml(t('composer.save')) + '</button>'
       + '<button type="button" class="mc-btn mc-ghost mc-cancel">' + escapeHtml(t('composer.cancel')) + '</button>'
@@ -2380,7 +2414,7 @@ function saveComposer(ta) {
 // Settings → Merge prompts (stored per browser in localStorage); buildMergedText + the textarea
 // placeholders fall back to these when the stored value is empty.
 function defaultMergePrompt(kind) {
-  return t(kind === 'q' ? 'mergePrompt.default.q' : 'mergePrompt.default.c');
+  return t(kind === 'q' ? 'mergePrompt.default.q' : kind === 'plan' ? 'plan.contract' : 'mergePrompt.default.c');
 }
 var mergePromptsKey = 'monacori-merge-prompts';
 function loadMergePrompts() {
@@ -2501,6 +2535,10 @@ function buildMergedText(kind) {
   var items = reviewComments.filter(function (c) { return c.kind === kind; });
   var nl = String.fromCharCode(10);
   var lines = [];
+  // Change requests are task instructions, so they lead with the plan contract: plan first, decompose into
+  // verifiable steps, write the plan to .monacori/plan.md (editable in Settings → Merge prompts). Questions
+  // are read-only clarifications, so they skip it.
+  if (kind === 'c') { lines.push(mergePromptFor('plan')); lines.push(''); }
   // Per-kind agent contract heading (editable in Settings → Merge prompts; default otherwise).
   lines.push(mergePromptFor(kind));
   lines.push('');
@@ -2741,9 +2779,13 @@ function openMemoView() {
     sendBtn.setAttribute('data-i18n', 'merged.sendToTerminal');
     sendBtn.textContent = t('merged.sendToTerminal');
     sendBtn.addEventListener('click', function () {
+      // The memo is a task instruction, so it leads with the plan contract (plan first, decompose into
+      // verifiable steps, write the plan to .monacori/plan.md) — same prefix change requests get. Empty memo
+      // sends nothing extra.
       var text = area.value;
+      var planned = text.trim() ? mergePromptFor('plan') + '\n\n' + text : text;
       dock.close();
-      window.__monacoriTerminal.enterSendMode(text);
+      window.__monacoriTerminal.enterSendMode(planned);
     });
     dock.bar.insertBefore(sendBtn, dock.bar.querySelector('.dock-max'));
   }
@@ -2867,6 +2909,10 @@ refreshComments();
     // Exception: keep focus for clipboard/selection combos (Cmd+C/V/X/A) so the terminal's own copy &
     // paste keep working — blurring on Cmd+V drops the textarea focus the paste event needs.
     term.attachCustomKeyEventHandler(function (e) {
+      // F7 / Shift+F7 are diff prev/next-change nav. Don't let the terminal eat them (it would send an
+      // escape sequence to the shell); return false so xterm ignores the key and it bubbles to the document
+      // handler. We DON'T blur — the diff caret is a JS cursor, so nav runs while the terminal keeps focus.
+      if (e.type === 'keydown' && e.key === 'F7' && !e.metaKey && !e.ctrlKey && !e.altKey) return false;
       if (e.type === 'keydown' && e.metaKey) {
         var k = (e.key || '').toLowerCase();
         // The bare modifier press (Cmd goes down BEFORE the letter on macOS) must not blur — blurring
@@ -2879,6 +2925,10 @@ refreshComments();
         // copy misses xterm's own selection, so Cmd+C silently did nothing. No selection -> fall through.
         if (e.code === 'KeyC' && term.hasSelection && term.hasSelection()) { copyToClipboard(term.getSelection()); return false; }
         if (e.code === 'KeyC' || e.code === 'KeyV' || e.code === 'KeyX' || e.code === 'KeyA') return true;
+        // Cmd/Ctrl+W is the close-pane menu accelerator. onCloseTab closes the FOCUSED pane only if the
+        // terminal still has focus — blurring here first made hasFocus() false, so the focused split pane
+        // never closed. Release the key WITHOUT blurring so focus stays and onCloseTab can close it.
+        if (e.code === 'KeyW') return false;
         try { term.blur(); } catch (x) {}
         return false;
       }
@@ -3193,6 +3243,7 @@ if (window.monacoriMenu && typeof window.monacoriMenu.onCloseTab === 'function')
   var gearBtn = document.getElementById('app-info-btn');
   var flag = document.getElementById('app-update-flag');
   var updateBtn = document.getElementById('app-info-update');
+  var pta = document.getElementById('settings-prompt-plan');
   var qta = document.getElementById('settings-prompt-q');
   var cta = document.getElementById('settings-prompt-c');
   var resetBtn = document.getElementById('settings-reset');
@@ -3205,6 +3256,7 @@ if (window.monacoriMenu && typeof window.monacoriMenu.onCloseTab === 'function')
   }
   function fill() {
     var s = loadMergePrompts();
+    if (pta) { pta.value = typeof s.plan === 'string' ? s.plan : ''; pta.placeholder = defaultMergePrompt('plan'); }
     if (qta) { qta.value = typeof s.q === 'string' ? s.q : ''; qta.placeholder = defaultMergePrompt('q'); }
     if (cta) { cta.value = typeof s.c === 'string' ? s.c : ''; cta.placeholder = defaultMergePrompt('c'); }
   }
@@ -3240,9 +3292,10 @@ if (window.monacoriMenu && typeof window.monacoriMenu.onCloseTab === 'function')
       }).catch(function () { updateBtn.disabled = false; if (status) status.textContent = t('settings.updateFailed'); });
     });
   }
+  if (pta) pta.addEventListener('input', function () { saveMergePrompt('plan', pta.value); flash(); });
   if (qta) qta.addEventListener('input', function () { saveMergePrompt('q', qta.value); flash(); });
   if (cta) cta.addEventListener('input', function () { saveMergePrompt('c', cta.value); flash(); });
-  if (resetBtn) resetBtn.addEventListener('click', function () { saveMergePrompt('q', ''); saveMergePrompt('c', ''); fill(); flash(); });
+  if (resetBtn) resetBtn.addEventListener('click', function () { saveMergePrompt('plan', ''); saveMergePrompt('q', ''); saveMergePrompt('c', ''); fill(); flash(); });
   // Terminal-bell notification toggle (default ON — persistRead returns undefined when never set).
   var bellCb = document.getElementById('set-bell-notify');
   if (bellCb) {
@@ -3383,15 +3436,21 @@ function restoreUiState() {
       }
       return true;
     }
-    if (state.sourcePath && sourceByPath.has(state.sourcePath)) {
-      openSourceFile(state.sourcePath);
+    // Source view. Open the saved file — or fall back to the first restored tab when that file is gone
+    // (filtered out above) or wasn't recorded. Otherwise we'd render the tab bar but leave the body on its
+    // "select a file" placeholder, which looks broken (a tab is clearly open). No openable tab → drop the
+    // stale tabs and let the init fallback pick a sensible default.
+    var openPath = (state.sourcePath && sourceByPath.has(state.sourcePath)) ? state.sourcePath : (sourceTabs[0] || '');
+    if (openPath) {
+      openSourceFile(openPath);
       // Restore the exact source caret/scroll (openSourceFile alone resets it to the top).
-      if (state.viewerCursor && state.viewerCursor.path === state.sourcePath) {
+      if (state.viewerCursor && state.viewerCursor.path === openPath) {
         var vc = state.viewerCursor;
-        setTimeout(function () { try { setSourceCursor(state.sourcePath, vc.lineIndex, vc.column, true, -1); } catch (e) {} }, 60);
+        setTimeout(function () { try { setSourceCursor(openPath, vc.lineIndex, vc.column, true, -1); } catch (e) {} }, 60);
       }
       return true;
     }
+    sourceTabs = [];
   } catch {
     sessionStorage.removeItem(uiStateKey);
   }
@@ -3412,6 +3471,45 @@ function flushPendingDiffUpdate() {
   pendingDiffUpdate = null;
   try { applyDiffUpdate(u); } catch (e) {}
 }
+// Flicker-saver for the live-watch refresh. The default path replaces the WHOLE diff DOM
+// (container.innerHTML = …), which re-renders the file you're looking at even when only an OFF-SCREEN file
+// changed. When the file set AND order are identical, reconcile per-file instead: keep every unchanged
+// wrapper's DOM node untouched (no flicker — including the visible one) and swap only the changed wrappers,
+// which are off-screen so the swap is invisible. Returns false (caller does the full innerHTML swap) for the
+// risky cases — files added/removed/reordered — so that proven path still handles index-shift correctly.
+function reconcileDiffWrappers(container, newDiffHtml, oldSigByPath, newSigByPath) {
+  var oldW = Array.prototype.slice.call(container.querySelectorAll('.d2h-file-wrapper'));
+  if (!oldW.length) return false;
+  var tmp = document.createElement('div');
+  tmp.innerHTML = newDiffHtml;
+  var newW = Array.prototype.slice.call(tmp.querySelectorAll('.d2h-file-wrapper'));
+  if (newW.length !== oldW.length) return false; // add/remove → full swap (global hunk indices shift)
+  for (var i = 0; i < oldW.length; i++) {
+    if (diffWrapperPathKey(oldW[i]) !== diffWrapperPathKey(newW[i])) return false; // reordered → full swap
+  }
+  for (var j = 0; j < oldW.length; j++) {
+    var ow = oldW[j], nw = newW[j], p = diffWrapperPathKey(ow);
+    if ((oldSigByPath.get(p) || '') !== (newSigByPath.get(p) || '')) {
+      // Changed file (off-screen): drop in the fresh shell and clear its cached body so it refetches the
+      // new content when it next scrolls into view. Replacing an off-screen node is invisible.
+      var nidx = (nw.id || '').replace('file-', '');
+      delete bodyCache[nidx];
+      delete bodyPromise[nidx];
+      ow.parentNode.replaceChild(nw, ow);
+    } else {
+      // Unchanged file: keep its DOM node (no flicker). An earlier file's changed hunk count can shift the
+      // global numbering, so sync the index attrs and renumber a materialized body's hunk ids (id/class
+      // changes only — invisible, no flicker).
+      var baseChanged = ow.getAttribute('data-first-hunk') !== nw.getAttribute('data-first-hunk');
+      ow.id = nw.id;
+      if (nw.hasAttribute('data-first-hunk')) ow.setAttribute('data-first-hunk', nw.getAttribute('data-first-hunk'));
+      if (nw.hasAttribute('data-hunk-count')) ow.setAttribute('data-hunk-count', nw.getAttribute('data-hunk-count'));
+      var body = ow.querySelector('.d2h-files-diff');
+      if (baseChanged && body && !body.hasAttribute('data-lazy')) markWrapperHunks(ow);
+    }
+  }
+  return true;
+}
 function applyDiffUpdate(u) {
   if (!u || !u.signature || u.signature === currentSignature) return false; // unchanged — nothing to do
   if (composerState) { pendingDiffUpdate = u; return false; } // composing a comment — hold the refresh until close/save
@@ -3431,11 +3529,19 @@ function applyDiffUpdate(u) {
   // open file's signature BEFORE fileSignatureByPath is rebuilt below.
   var prevOpenSig = openPath ? (fileSignatureByPath.get(openPath) || '') : '';
 
-  // Snapshot already-materialized file bodies (keyed by path + current signature) BEFORE the swap, so an
-  // UNCHANGED file can be re-filled synchronously afterwards. Without this, the swap turns every wrapper into
-  // an empty lazy shell that blanks until its body re-loads over IPC — the visible "flicker" on a watch tick.
+  // Fast-path: when the file set + order are unchanged, reconcile per-file so an off-screen change never
+  // flickers the file you're viewing. Falls back to the full swap (below) for add/remove/reorder or eager.
+  var newSigByPath = new Map((u.fileStates || []).map(function (f) { return [f.path, f.signature]; }));
+  var fastPath = false;
+  if (REVIEW_LAZY && container && u.diffContainer) {
+    fastPath = reconcileDiffWrappers(container, u.diffContainer, fileSignatureByPath, newSigByPath);
+  }
+
+  // Full-swap path only: snapshot already-materialized bodies (keyed by path + signature) BEFORE the swap so
+  // UNCHANGED files re-fill synchronously afterwards — otherwise the swap blanks every wrapper into an empty
+  // lazy shell until its body reloads over IPC (the "flicker"). The fast-path keeps those nodes, so skip it.
   var prevBodies = {};
-  if (REVIEW_LAZY && container) {
+  if (!fastPath && REVIEW_LAZY && container) {
     container.querySelectorAll('.d2h-file-wrapper').forEach(function (w) {
       var b = w.querySelector('.d2h-files-diff');
       if (!b || b.hasAttribute('data-lazy')) return; // only bodies that are actually materialized
@@ -3444,8 +3550,9 @@ function applyDiffUpdate(u) {
     });
   }
 
-  // 1) Replace the visible regions straight from the payload (no full-HTML parse).
-  if (container) container.innerHTML = u.diffContainer || '';
+  // 1) Replace the visible regions straight from the payload (no full-HTML parse) — unless the fast-path
+  // already reconciled the diff DOM in place.
+  if (container && !fastPath) container.innerHTML = u.diffContainer || '';
   var changesPanel = document.getElementById('changes-panel');
   if (changesPanel) changesPanel.innerHTML = u.changesPanel || '';
   // Files tree: keep the inert island (lazy, not yet opened) in sync, and refresh the live panel when it's
@@ -3507,7 +3614,7 @@ function applyDiffUpdate(u) {
   // flicker). Runs BEFORE setupLazyDiff so the IntersectionObserver sees them already materialized and never
   // re-fetches them. The fresh wrapper carries the correct data-first-hunk + file index, so materializeBody
   // numbers hunks exactly as a normal lazy load would. Changed/new files stay shells and lazy-load as usual.
-  if (REVIEW_LAZY && container) {
+  if (!fastPath && REVIEW_LAZY && container) {
     container.querySelectorAll('.d2h-file-wrapper').forEach(function (w) {
       var p = diffWrapperPathKey(w);
       var prev = p ? prevBodies[p] : null;
@@ -3894,6 +4001,26 @@ function isSourceViewerVisible() {
   return Boolean(viewer && !viewer.classList.contains('hidden'));
 }
 
+// Cmd/Ctrl+A scoped to the current view: select the source body, or the active diff file's content —
+// NOT the whole page (the browser default reached into the sidebar/terminal). Returns false if there's
+// no view target so the caller can fall back to the default.
+function selectAllInView() {
+  var target = null;
+  if (isSourceViewerVisible()) target = document.getElementById('source-body');
+  else if (typeof isDiffViewVisible === 'function' && isDiffViewVisible()) {
+    target = document.querySelector('#diff2html-container .d2h-file-wrapper:not(.df-inactive)') || document.getElementById('diff2html-container');
+  }
+  if (!target) return false;
+  try {
+    var sel = window.getSelection();
+    var range = document.createRange();
+    range.selectNodeContents(target);
+    sel.removeAllRanges();
+    sel.addRange(range);
+  } catch (e) { return false; }
+  return true;
+}
+
 function openDiffFileAtCaret() {
   if (diffCursor && isDiffViewVisible()) {
     const dwrap = diffWrapperByPath(diffCursor.path);
@@ -5221,6 +5348,8 @@ var historyGraph = [];
 var historyMaxLane = 0;
 var historyActiveSha = '';
 var historyLoading = false;
+var historyFocus = 'commits'; // commits | files | diff
+var historyDiffState = null;
 
 // Lane layout. Walks commits newest-first, tracking open edges (lanes) by the hash each expects next.
 // Returns per-row { hash, myLane, color, topEdges, bottomEdges } using LANE INDICES + COLOR INDICES (px-free,
@@ -5334,6 +5463,33 @@ function renderHistoryList() {
   }).join('');
 }
 
+function historyVisibleRows() {
+  var list = document.getElementById('history-list');
+  return list ? Array.prototype.slice.call(list.querySelectorAll('.hrow')).filter(function (r) { return !r.classList.contains('hidden'); }) : [];
+}
+function selectHistoryCommit(sha, shouldScroll) {
+  if (!sha) return;
+  historyActiveSha = sha;
+  var list = document.getElementById('history-list');
+  if (!list) return;
+  var active = null;
+  list.querySelectorAll('.hrow').forEach(function (r) {
+    var on = r.dataset.sha === sha;
+    r.classList.toggle('active', on);
+    if (on) active = r;
+  });
+  if (shouldScroll !== false && active && active.scrollIntoView) active.scrollIntoView({ block: 'nearest' });
+}
+function moveHistoryCommit(delta) {
+  var rows = historyVisibleRows();
+  if (!rows.length) return;
+  var idx = rows.findIndex(function (r) { return r.dataset.sha === historyActiveSha; });
+  if (idx < 0) idx = delta > 0 ? -1 : 0;
+  idx = Math.max(0, Math.min(rows.length - 1, idx + delta));
+  historyFocus = 'commits';
+  selectHistoryCommit(rows[idx].dataset.sha, true);
+}
+
 // Text filter (subject / author). The graph only reads right on the full contiguous history, so filtering
 // hides the graph column (IntelliJ does the same) and just shows matching rows.
 function applyHistoryFilter() {
@@ -5348,13 +5504,15 @@ function applyHistoryFilter() {
     var hit = !q || (c.subject + '\n' + c.author + '\n' + c.hash).toLowerCase().indexOf(q) !== -1;
     rows[i].classList.toggle('hidden', !hit);
   }
+  var visible = historyVisibleRows();
+  if (visible.length && !visible.some(function (r) { return r.dataset.sha === historyActiveSha; })) {
+    selectHistoryCommit(visible[0].dataset.sha, false);
+  }
 }
 
 function openHistoryCommit(sha) {
   if (!sha || !window.monacoriGit) return;
-  historyActiveSha = sha;
-  var list = document.getElementById('history-list');
-  if (list) list.querySelectorAll('.hrow').forEach(function (r) { r.classList.toggle('active', r.dataset.sha === sha); });
+  selectHistoryCommit(sha, true);
   var detail = document.getElementById('history-detail');
   if (detail) detail.innerHTML = '<div class="quick-open-empty">' + escapeHtml(t('history.loading')) + '</div>';
   Promise.resolve(window.monacoriGit.commitDiff(sha)).then(function (d) {
@@ -5373,9 +5531,335 @@ function renderHistoryDetail(d) {
     + '<span class="hd-date">' + escapeHtml(historyShortDate(d.date)) + '</span>'
     + historyRefBadges(d.refs) + '</div></div>';
   var body = (d.diffHtml && d.diffHtml.trim())
-    ? '<div class="history-diff diff2html-container">' + d.diffHtml + '</div>'
+    ? '<div class="history-workspace"><aside id="history-files" class="history-files"></aside><div id="history-diff-container" class="history-diff diff2html-container" tabindex="0" aria-readonly="true">' + d.diffHtml + '</div></div>'
     : '<div class="quick-open-empty">' + escapeHtml(t(d.isMerge ? 'history.merge' : 'history.noDiff')) + '</div>';
   detail.innerHTML = head + body;
+  setupHistoryDiffWorkspace(d.hash || historyActiveSha);
+}
+
+function historyWrapperPathKey(w) {
+  return (w.dataset && w.dataset.path) || ((w.querySelector('.d2h-file-name') || {}).textContent || '').trim();
+}
+function historyWrapperByPath(path) {
+  if (!historyDiffState || !path) return null;
+  for (var i = 0; i < historyDiffState.wrappers.length; i++) {
+    if (historyWrapperPathKey(historyDiffState.wrappers[i]) === path) return historyDiffState.wrappers[i];
+  }
+  return null;
+}
+function historySideTables(wrapper) {
+  var sides = wrapper ? wrapper.querySelectorAll('.d2h-file-side-diff') : [];
+  return { left: sides[0] || null, right: sides[sides.length - 1] || null };
+}
+function historySideTable(wrapper, side) {
+  var t = historySideTables(wrapper);
+  return side === 'old' ? t.left : t.right;
+}
+function historyRowsOf(sideTable) {
+  return diffRowsOf(sideTable);
+}
+function historyRowAt(wrapper, side, rowIndex) {
+  return historyRowsOf(historySideTable(wrapper, side))[rowIndex] || null;
+}
+function historyDiffRowInfoFromNode(node) {
+  var el = node ? (node.nodeType === 1 ? node : node.parentElement) : null;
+  if (!el || !el.closest) return null;
+  var wrapper = el.closest('.d2h-file-wrapper');
+  var sideEl = el.closest('.d2h-file-side-diff');
+  var row = el.closest('tr');
+  if (!wrapper || !sideEl || !row || !isDiffCodeRow(row)) return null;
+  var path = historyWrapperPathKey(wrapper);
+  var t = historySideTables(wrapper);
+  var rowIndex = historyRowsOf(sideEl).indexOf(row);
+  if (!path || rowIndex < 0) return null;
+  return { path: path, side: sideEl === t.left ? 'old' : 'new', rowIndex: rowIndex };
+}
+function historyFirstDiffCodeRow(wrapper, side) {
+  var rows = historyRowsOf(historySideTable(wrapper, side));
+  for (var i = 0; i < rows.length; i++) if (isDiffCodeRow(rows[i])) return i;
+  return -1;
+}
+function historyFirstCodeRowOfHunk(hunkRow) {
+  var row = hunkRow.nextElementSibling;
+  var firstRow = null;
+  while (row && !row.classList.contains('history-hunk') && !row.classList.contains('history-hunk-peer')) {
+    if (row.querySelector && row.querySelector('.d2h-code-side-line')) {
+      if (!firstRow) firstRow = row;
+      if (isChangeCodeRow(row)) return row;
+    }
+    row = row.nextElementSibling;
+  }
+  return firstRow || hunkRow;
+}
+function historyFirstChangeRowForCaret(hunkRow) {
+  var wrapper = hunkRow.closest('.d2h-file-wrapper');
+  var sides = wrapper ? wrapper.querySelectorAll('.d2h-file-side-diff') : [];
+  var hunkSideEl = hunkRow.closest('.d2h-file-side-diff');
+  if (sides.length >= 2 && hunkSideEl) {
+    var hunkRows = Array.prototype.slice.call(hunkSideEl.querySelectorAll('tr'));
+    var otherEl = hunkSideEl === sides[0] ? sides[1] : sides[0];
+    var otherRows = Array.prototype.slice.call(otherEl.querySelectorAll('tr'));
+    var fallbackOld = null;
+    for (var i = hunkRows.indexOf(hunkRow) + 1; i < hunkRows.length; i++) {
+      var hr = hunkRows[i];
+      if (hr.classList.contains('history-hunk') || hr.classList.contains('history-hunk-peer')) break;
+      if (isChangeCodeRow(otherRows[i])) return otherRows[i];
+      if (fallbackOld === null && isChangeCodeRow(hr)) fallbackOld = hr;
+    }
+    if (fallbackOld) return fallbackOld;
+  }
+  return historyFirstCodeRowOfHunk(hunkRow);
+}
+function setupHistoryDiffWorkspace(sha) {
+  var container = document.getElementById('history-diff-container');
+  var filesEl = document.getElementById('history-files');
+  if (!container || !filesEl) { historyDiffState = null; return; }
+  container.querySelectorAll('.d2h-code-side-linenumber, .d2h-code-linenumber, .d2h-code-line-prefix').forEach(function (el) { el.setAttribute('contenteditable', 'false'); });
+  var wrappers = Array.prototype.slice.call(container.querySelectorAll('.d2h-file-wrapper'));
+  var files = [], hunks = [];
+  var hunkIndex = 0;
+  wrappers.forEach(function (wrapper, fileIndex) {
+    var path = historyWrapperPathKey(wrapper);
+    if (path) wrapper.dataset.path = path;
+    wrapper.dataset.historyFileIndex = String(fileIndex);
+    var first = hunkIndex;
+    var headerToIndex = new Map();
+    Array.prototype.forEach.call(wrapper.querySelectorAll('tr'), function (row) {
+      var header = (row.textContent || '').trim();
+      if (header.indexOf('@@') !== 0) return;
+      var idx = headerToIndex.get(header);
+      if (idx === undefined) {
+        idx = hunkIndex++;
+        headerToIndex.set(header, idx);
+        row.classList.add('history-hunk');
+        hunks[idx] = { path: path, row: row };
+      } else {
+        row.classList.add('history-hunk-peer');
+      }
+      row.dataset.historyHunkIndex = String(idx);
+      row.dataset.historyFile = path;
+    });
+    files.push({ path: path, hunk: first, count: hunkIndex - first });
+  });
+  historyDiffState = { sha: sha, container: container, filesEl: filesEl, wrappers: wrappers, files: files, hunks: hunks, currentHunk: -1, cursor: null, fileFocusIndex: 0 };
+  filesEl.innerHTML = files.map(function (file, i) {
+    var slash = file.path.lastIndexOf('/');
+    var name = slash >= 0 ? file.path.slice(slash + 1) : file.path;
+    var dir = slash >= 0 ? file.path.slice(0, slash) : '';
+    return '<button type="button" class="file-link history-file" data-index="' + i + '" data-file="' + escapeHtml(file.path) + '" data-hunk="' + file.hunk + '">'
+      + '<span class="status status-modified">M</span><span class="change-name"><span class="path" title="' + escapeHtml(file.path) + '">' + escapeHtml(name) + '</span>'
+      + (dir ? '<span class="change-dir">' + escapeHtml(dir) + '</span>' : '') + '</span></button>';
+  }).join('');
+  container.addEventListener('click', function (event) {
+    var info = historyDiffRowInfoFromNode(event.target);
+    if (info && info.path) {
+      historyFocus = 'diff';
+      historySetDiffCursor(info.path, info.side, info.rowIndex, 0, false);
+    }
+  });
+  if (files[0]) historyShowFile(files[0].path, files[0].hunk, false);
+  focusHistoryDiff();
+}
+function historySetFileFocus(index) {
+  if (!historyDiffState || !historyDiffState.files.length) return;
+  var max = historyDiffState.files.length - 1;
+  historyDiffState.fileFocusIndex = Math.max(0, Math.min(max, index));
+  historyFocus = 'files';
+  var btns = historyDiffState.filesEl.querySelectorAll('.history-file');
+  btns.forEach(function (b, i) {
+    b.classList.toggle('tree-focus', i === historyDiffState.fileFocusIndex);
+    if (i === historyDiffState.fileFocusIndex && b.scrollIntoView) b.scrollIntoView({ block: 'nearest' });
+  });
+}
+function focusHistoryFiles() {
+  if (!historyDiffState) return;
+  var active = historyDiffState.files.findIndex(function (f) { return f.path === historyCurrentFile(); });
+  historySetFileFocus(active >= 0 ? active : 0);
+}
+function focusHistoryDiff() {
+  if (!historyDiffState) return;
+  historyFocus = 'diff';
+  historyDiffState.filesEl.querySelectorAll('.history-file').forEach(function (b) { b.classList.remove('tree-focus'); });
+  try { historyDiffState.container.focus(); } catch (e) {}
+}
+function historyCurrentFile() {
+  if (!historyDiffState) return '';
+  var active = historyDiffState.filesEl.querySelector('.history-file.active');
+  return active ? active.dataset.file || '' : '';
+}
+function historyShowFile(path, hunkIndex, shouldScroll) {
+  if (!historyDiffState || !path) return;
+  historyDiffState.wrappers.forEach(function (wrapper) {
+    wrapper.classList.toggle('df-inactive', historyWrapperPathKey(wrapper) !== path);
+  });
+  historyDiffState.filesEl.querySelectorAll('.history-file').forEach(function (button, i) {
+    var on = button.dataset.file === path;
+    button.classList.toggle('active', on);
+    if (on) historyDiffState.fileFocusIndex = i;
+  });
+  var file = historyDiffState.files.find(function (f) { return f.path === path; });
+  var target = typeof hunkIndex === 'number' && hunkIndex >= 0 ? hunkIndex : (file ? file.hunk : -1);
+  if (target >= 0 && historyDiffState.hunks[target]) historySetActiveHunk(target, shouldScroll !== false);
+  else historyEnsureDiffCursor(path, shouldScroll !== false);
+}
+function historyHunkPathAt(index) {
+  return historyDiffState && historyDiffState.hunks[index] ? historyDiffState.hunks[index].path : '';
+}
+function historySetActiveHunk(index, shouldScroll) {
+  if (!historyDiffState || !historyDiffState.hunks.length) return;
+  var len = historyDiffState.hunks.length;
+  var idx = ((index % len) + len) % len;
+  var h = historyDiffState.hunks[idx];
+  if (!h || !h.path) return;
+  historyDiffState.currentHunk = idx;
+  historyDiffState.wrappers.forEach(function (wrapper) {
+    wrapper.classList.toggle('df-inactive', historyWrapperPathKey(wrapper) !== h.path);
+  });
+  historyDiffState.filesEl.querySelectorAll('.history-file').forEach(function (button, i) {
+    var on = button.dataset.file === h.path;
+    button.classList.toggle('active', on);
+    if (on) historyDiffState.fileFocusIndex = i;
+  });
+  historyDiffState.container.querySelectorAll('.history-hunk.active, .history-hunk-peer.active').forEach(function (row) { row.classList.remove('active'); });
+  historyDiffState.container.querySelectorAll('[data-history-hunk-index="' + idx + '"]').forEach(function (row) { row.classList.add('active'); });
+  var targetRow = historyFirstChangeRowForCaret(h.row);
+  if (targetRow) {
+    var info = historyDiffRowInfoFromNode(targetRow);
+    if (info) historySetDiffCursor(info.path, info.side, info.rowIndex, 0, shouldScroll);
+  }
+}
+function historyEnsureDiffCursor(path, reveal) {
+  var wrapper = historyWrapperByPath(path);
+  var ri = historyFirstDiffCodeRow(wrapper, 'new');
+  if (ri >= 0) historySetDiffCursor(path, 'new', ri, 0, reveal);
+}
+function historyClearDiffCaret() {
+  if (!historyDiffState) return;
+  historyDiffState.container.querySelectorAll('.mc-diff-cursor-row').forEach(function (r) { r.classList.remove('mc-diff-cursor-row'); });
+  historyDiffState.container.querySelectorAll('.code-cursor').forEach(function (s) { var p = s.parentNode; if (p) { p.removeChild(s); if (p.normalize) p.normalize(); } });
+}
+function historyRenderDiffCaret() {
+  historyClearDiffCaret();
+  if (!historyDiffState || !historyDiffState.cursor) return;
+  var c = historyDiffState.cursor;
+  var wrapper = historyWrapperByPath(c.path);
+  var row = wrapper ? historyRowAt(wrapper, c.side, c.rowIndex) : null;
+  if (!row) return;
+  row.classList.add('mc-diff-cursor-row');
+  var ctn = diffCellCtn(row);
+  if (!ctn) return;
+  if ((ctn.textContent || '').length === 0) {
+    var emptySpan = document.createElement('span');
+    emptySpan.className = 'code-cursor';
+    emptySpan.setAttribute('aria-hidden', 'true');
+    emptySpan.style.position = 'absolute';
+    ctn.appendChild(emptySpan);
+    return;
+  }
+  var pos = diffCaretDomPosition(ctn, c.column);
+  if (!pos) return;
+  var span = document.createElement('span');
+  span.className = 'code-cursor';
+  span.setAttribute('aria-hidden', 'true');
+  try {
+    var off = pos.node.nodeType === 3 ? Math.min(pos.offset, (pos.node.textContent || '').length) : pos.offset;
+    var range = document.createRange();
+    range.setStart(pos.node, off);
+    range.collapse(true);
+    range.insertNode(span);
+  } catch (e) {}
+}
+function historySetDiffCursor(path, side, rowIndex, column, reveal) {
+  if (!historyDiffState) return;
+  var wrapper = historyWrapperByPath(path);
+  if (!wrapper) return;
+  var rows = historyRowsOf(historySideTable(wrapper, side));
+  if (!rows.length) return;
+  var ri = Math.max(0, Math.min(rowIndex, rows.length - 1));
+  var col = Math.max(0, Math.min(column, diffLineText(rows[ri]).length));
+  historyDiffState.cursor = { path: path, side: side, rowIndex: ri, column: col };
+  historyRenderDiffCaret();
+  if (reveal) scrolloffReveal(rows[ri], historyDiffState.container, 0.15);
+}
+function historyMoveDiffCursor(dLine, dColumn) {
+  if (!historyDiffState || !historyDiffState.cursor) return;
+  var c = historyDiffState.cursor;
+  var wrapper = historyWrapperByPath(c.path);
+  if (!wrapper) return;
+  var rows = historyRowsOf(historySideTable(wrapper, c.side));
+  var ri = c.rowIndex, col = c.column;
+  var text = diffLineText(rows[ri]);
+  if (dColumn < 0) {
+    if (col > 0) col -= 1;
+    else { var p = ri - 1; while (p >= 0 && !isDiffCodeRow(rows[p])) p -= 1; if (p >= 0) { ri = p; col = diffLineText(rows[p]).length; } }
+  } else if (dColumn > 0) {
+    if (col < text.length) col += 1;
+    else { var n = ri + 1; while (n < rows.length && !isDiffCodeRow(rows[n])) n += 1; if (n < rows.length) { ri = n; col = 0; } }
+  }
+  if (dLine !== 0) {
+    var step = dLine > 0 ? 1 : -1;
+    var cand = ri + step;
+    while (cand >= 0 && cand < rows.length && !isDiffCodeRow(rows[cand])) cand += step;
+    if (cand >= 0 && cand < rows.length) { ri = cand; col = Math.min(col, diffLineText(rows[ri]).length); }
+  }
+  historySetDiffCursor(c.path, c.side, ri, col, true);
+}
+function historyNextHunk(delta) {
+  if (!historyDiffState || !historyDiffState.hunks.length) return;
+  var base = historyDiffState.currentHunk >= 0 ? historyDiffState.currentHunk : 0;
+  historySetActiveHunk(base + delta, true);
+  focusHistoryDiff();
+}
+function historySelectAllDiff() {
+  if (!historyDiffState) return;
+  var sel = window.getSelection();
+  if (!sel) return;
+  var range = document.createRange();
+  range.selectNodeContents(historyDiffState.container);
+  sel.removeAllRanges();
+  sel.addRange(range);
+}
+function handleHistoryDiffKey(event) {
+  if (!historyDiffState || !historyDiffState.cursor) return false;
+  if (event.key === 'Tab' && event.shiftKey && !event.metaKey && !event.ctrlKey && !event.altKey) {
+    var tc = historyDiffState.cursor;
+    var tw = historyWrapperByPath(tc.path);
+    var otherSide = tc.side === 'new' ? 'old' : 'new';
+    var otherRow = tw ? historyRowAt(tw, otherSide, tc.rowIndex) : null;
+    if (isDiffCodeRow(otherRow)) historySetDiffCursor(tc.path, otherSide, tc.rowIndex, Math.min(tc.column, diffLineText(otherRow).length), true);
+    return true;
+  }
+  if (!event.metaKey && !event.ctrlKey && !event.altKey) {
+    if (event.key === 'ArrowDown') { historyMoveDiffCursor(1, 0); return true; }
+    if (event.key === 'ArrowUp') { historyMoveDiffCursor(-1, 0); return true; }
+    if (event.key === 'ArrowLeft') { historyMoveDiffCursor(0, -1); return true; }
+    if (event.key === 'ArrowRight') { historyMoveDiffCursor(0, 1); return true; }
+  }
+  if (event.altKey && !event.metaKey && !event.ctrlKey && (event.key === 'ArrowLeft' || event.key === 'ArrowRight')) {
+    var wc = historyDiffState.cursor;
+    var ww = historyWrapperByPath(wc.path);
+    var wr = ww ? historyRowAt(ww, wc.side, wc.rowIndex) : null;
+    var nextCol = typeof nextWordBoundary === 'function'
+      ? nextWordBoundary(diffLineText(wr), wc.column, event.key === 'ArrowRight' ? 1 : -1)
+      : wc.column;
+    historySetDiffCursor(wc.path, wc.side, wc.rowIndex, nextCol, true);
+    return true;
+  }
+  if ((event.metaKey || event.ctrlKey) && !event.altKey && (event.key === 'ArrowLeft' || event.key === 'ArrowRight')) {
+    var c = historyDiffState.cursor;
+    var wrapper = historyWrapperByPath(c.path);
+    var row = wrapper ? historyRowAt(wrapper, c.side, c.rowIndex) : null;
+    var len = diffLineText(row).length;
+    if (event.key === 'ArrowLeft') {
+      if (c.column > 0) historySetDiffCursor(c.path, c.side, c.rowIndex, 0, true);
+      else if (c.side === 'new') { var oldRow = historyRowAt(wrapper, 'old', c.rowIndex); if (isDiffCodeRow(oldRow)) historySetDiffCursor(c.path, 'old', c.rowIndex, diffLineText(oldRow).length, true); }
+    } else {
+      if (c.column < len) historySetDiffCursor(c.path, c.side, c.rowIndex, len, true);
+      else if (c.side === 'old') { var newRow = historyRowAt(wrapper, 'new', c.rowIndex); if (isDiffCodeRow(newRow)) historySetDiffCursor(c.path, 'new', c.rowIndex, 0, true); }
+    }
+    return true;
+  }
+  return false;
 }
 
 function isHistoryOpen() {
@@ -5385,6 +5869,7 @@ function isHistoryOpen() {
 function closeHistory() {
   var v = document.getElementById('history-view');
   if (v) v.classList.add('hidden');
+  historyFocus = 'commits';
   if (typeof syncRail === 'function') syncRail();
 }
 function openHistory() {
@@ -5397,6 +5882,8 @@ function openHistory() {
   if (search) { search.value = ''; }
   applyHistoryFilter();
   historyLoading = true;
+  historyFocus = 'commits';
+  historyDiffState = null;
   renderHistoryList();
   Promise.resolve(window.monacoriGit.log({ limit: 300 })).then(function (commits) {
     historyLoading = false;
@@ -5406,13 +5893,64 @@ function openHistory() {
     renderHistoryList();
     var detail = document.getElementById('history-detail');
     if (detail) detail.innerHTML = '<div class="quick-open-empty">' + escapeHtml(t('history.selectCommit')) + '</div>';
-    if (historyCommits[0]) openHistoryCommit(historyCommits[0].hash); // preview the newest commit
-    if (search) setTimeout(function () { try { search.focus(); } catch (e) {} }, 0);
+    if (historyCommits[0]) selectHistoryCommit(historyCommits[0].hash, false);
+    setTimeout(function () { try { v.focus(); } catch (e) {} }, 0);
   }, function () { historyLoading = false; renderHistoryList(); });
 }
 function toggleHistory() { if (isHistoryOpen()) closeHistory(); else openHistory(); }
 if (typeof window !== 'undefined') window.__monacoriHistory = { open: openHistory, close: closeHistory, toggle: toggleHistory, isOpen: isHistoryOpen };
 
+function handleHistoryKey(e) {
+  if (!isHistoryOpen()) return false;
+  var ae = document.activeElement;
+  var inSearch = ae && ae.id === 'history-search';
+  if ((e.metaKey || e.ctrlKey) && !e.shiftKey && !e.altKey && (e.code === 'Digit9' || e.key === '9')) {
+    e.preventDefault(); e.stopPropagation(); closeHistory(); return true;
+  }
+  if (e.key === 'Escape') { e.preventDefault(); e.stopPropagation(); closeHistory(); return true; }
+  if ((e.metaKey || e.ctrlKey) && !e.shiftKey && !e.altKey && e.key === '0') {
+    if (historyDiffState) { e.preventDefault(); e.stopPropagation(); focusHistoryFiles(); return true; }
+  }
+  if ((e.metaKey || e.ctrlKey) && !e.shiftKey && !e.altKey && (e.key === 'a' || e.key === 'A') && historyFocus === 'diff') {
+    e.preventDefault(); e.stopPropagation(); historySelectAllDiff(); return true;
+  }
+  if (e.key === 'PageDown' || e.key === 'PageUp') {
+    var scroller = historyFocus === 'diff' && historyDiffState ? historyDiffState.container : document.getElementById('history-list');
+    if (scroller) { e.preventDefault(); e.stopPropagation(); scroller.scrollTop += (e.key === 'PageDown' ? 0.9 : -0.9) * scroller.clientHeight; return true; }
+  }
+  if (e.key === 'F7' && !e.metaKey && !e.ctrlKey && !e.altKey) {
+    e.preventDefault(); e.stopPropagation(); historyNextHunk(e.shiftKey ? -1 : 1); return true;
+  }
+  if (!e.metaKey && !e.ctrlKey && !e.altKey && (e.key === 'ArrowUp' || e.key === 'ArrowDown')) {
+    e.preventDefault(); e.stopPropagation();
+    var delta = e.key === 'ArrowDown' ? 1 : -1;
+    if (historyFocus === 'files') historySetFileFocus((historyDiffState ? historyDiffState.fileFocusIndex : 0) + delta);
+    else if (historyFocus === 'diff' && historyDiffState) historyMoveDiffCursor(delta, 0);
+    else moveHistoryCommit(delta);
+    return true;
+  }
+  if (!e.metaKey && !e.ctrlKey && !e.altKey && (e.key === 'ArrowLeft' || e.key === 'ArrowRight') && historyFocus === 'diff') {
+    e.preventDefault(); e.stopPropagation(); historyMoveDiffCursor(0, e.key === 'ArrowRight' ? 1 : -1); return true;
+  }
+  if (!e.metaKey && !e.ctrlKey && !e.altKey && e.key === 'Enter') {
+    e.preventDefault(); e.stopPropagation();
+    if (historyFocus === 'diff') {
+      return true;
+    } else if (historyFocus === 'files' && historyDiffState) {
+      var file = historyDiffState.files[historyDiffState.fileFocusIndex];
+      if (file) historyShowFile(file.path, file.hunk, true);
+      focusHistoryDiff();
+    } else {
+      var rows = historyVisibleRows();
+      var row = rows.find(function (r) { return r.dataset.sha === historyActiveSha; }) || rows[0];
+      if (row) openHistoryCommit(row.dataset.sha);
+    }
+    return true;
+  }
+  if (historyFocus === 'diff' && handleHistoryDiffKey(e)) { e.preventDefault(); e.stopPropagation(); return true; }
+  return !inSearch && historyFocus !== 'commits';
+}
+
 (function wireHistory() {
   var list = document.getElementById('history-list');
   if (list) list.addEventListener('click', function (e) {
@@ -5424,8 +5962,18 @@ if (typeof window !== 'undefined') window.__monacoriHistory = { open: openHistor
   var closeBtn = document.getElementById('history-close');
   if (closeBtn) closeBtn.addEventListener('click', closeHistory);
   var view = document.getElementById('history-view');
+  if (view) view.setAttribute('tabindex', '-1');
   if (view) view.addEventListener('keydown', function (e) {
-    if (e.key === 'Escape') { e.preventDefault(); e.stopPropagation(); closeHistory(); }
+    handleHistoryKey(e);
+  });
+  var detail = document.getElementById('history-detail');
+  if (detail) detail.addEventListener('click', function (e) {
+    var file = e.target.closest && e.target.closest('.history-file[data-file]');
+    if (file && historyDiffState) {
+      e.preventDefault();
+      historyShowFile(file.dataset.file, Number(file.dataset.hunk), true);
+      focusHistoryDiff();
+    }
   });
 })();
 // ===== Go-to-line (Cmd/Ctrl+L), copy caret location (Cmd/Ctrl+K), and the sidebar row action menu. =====