@hienlh/ppm 0.9.86 → 0.9.88

package/packages/ext-git-graph/src/webview-html.ts

@@ -27,6 +27,16 @@ ${getStyles()}
         <button id="btn-fetch" title="Fetch from remotes"></button>
       </div>
       <div class="toolbar-right">
+        <div class="stash-dropdown">
+          <button id="btn-stash" title="Stashes"></button>
+          <div id="stash-popover" class="stash-popover hidden">
+            <div class="stash-popover-header"><span>Stashes</span></div>
+            <div id="stash-list" class="stash-list"></div>
+            <div class="stash-popover-footer">
+              <button id="stash-save" class="btn-sm">+ Stash Changes</button>
+            </div>
+          </div>
+        </div>
         <div class="worktree-dropdown">
           <button id="btn-worktree" title="Worktrees"></button>
           <div id="worktree-popover" class="worktree-popover hidden">
@@ -146,33 +156,33 @@ function getStyles(): string {
     --border: #27272a; --border2: #3f3f46; --selected: #1e293b; --surface-hover: #27272a;
   }
 }
-body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; background: var(--bg); color: var(--text); font-size: 13px; overflow: hidden; height: 100vh; display: flex; flex-direction: column; }
+body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; background: var(--bg); color: var(--text); font-size: 12px; overflow: hidden; height: 100vh; display: flex; flex-direction: column; }
 #app { display: flex; flex-direction: column; height: 100vh; }
 
 /* Toolbar */
-#toolbar { display: flex; justify-content: space-between; align-items: center; padding: 6px 12px; border-bottom: 1px solid var(--border); background: var(--surface); flex-shrink: 0; }
-.toolbar-left, .toolbar-right { display: flex; align-items: center; gap: 6px; }
-select { background: var(--bg); color: var(--text); border: 1px solid var(--border2); border-radius: 4px; padding: 4px 8px; font-size: 12px; }
-button { background: transparent; color: var(--text); border: 1px solid var(--border); border-radius: 6px; padding: 4px 10px; font-size: 12px; cursor: pointer; min-width: 28px; min-height: 28px; transition: background 0.15s, border-color 0.15s; }
+#toolbar { display: flex; justify-content: space-between; align-items: center; padding: 4px 10px; border-bottom: 1px solid var(--border); background: var(--surface); flex-shrink: 0; }
+.toolbar-left, .toolbar-right { display: flex; align-items: center; gap: 4px; }
+select { background: var(--bg); color: var(--text); border: 1px solid var(--border2); border-radius: 4px; padding: 3px 6px; font-size: 11px; }
+button { background: transparent; color: var(--text); border: 1px solid var(--border); border-radius: 5px; padding: 3px 8px; font-size: 11px; cursor: pointer; min-width: 24px; min-height: 24px; transition: background 0.15s, border-color 0.15s; }
 button:hover { background: var(--surface-hover); border-color: var(--border2); }
 button:active { background: var(--surface); }
 .btn-fetching { opacity: 0.6; pointer-events: none; }
 
 /* Branch dropdown */
 .branch-dropdown { position: relative; }
-.branch-trigger { background: var(--bg); color: var(--text); border: 1px solid var(--border); border-radius: 6px; padding: 4px 24px 4px 8px; font-size: 12px; cursor: pointer; min-width: 140px; text-align: left; position: relative; }
+.branch-trigger { background: var(--bg); color: var(--text); border: 1px solid var(--border); border-radius: 5px; padding: 3px 22px 3px 7px; font-size: 11px; cursor: pointer; min-width: 120px; text-align: left; position: relative; }
 .branch-trigger::after { content: '\\25BC'; font-size: 8px; position: absolute; right: 8px; top: 50%; transform: translateY(-50%); color: var(--subtext); }
 .branch-dropdown-menu { position: absolute; top: 100%; left: 0; z-index: 60; background: var(--surface); border: 1px solid var(--border2); border-radius: 6px; box-shadow: 0 4px 12px rgba(0,0,0,0.15); min-width: 220px; max-height: 300px; display: flex; flex-direction: column; margin-top: 2px; }
-.branch-filter-input { padding: 6px 8px; border: none; border-bottom: 1px solid var(--border); background: var(--bg); color: var(--text); font-size: 12px; outline: none; border-radius: 6px 6px 0 0; }
+.branch-filter-input { padding: 4px 7px; border: none; border-bottom: 1px solid var(--border); background: var(--bg); color: var(--text); font-size: 11px; outline: none; border-radius: 5px 5px 0 0; }
 .branch-list { overflow-y: auto; max-height: 250px; }
-.branch-option { padding: 6px 10px; cursor: pointer; font-size: 12px; display: flex; align-items: center; gap: 6px; }
+.branch-option { padding: 4px 8px; cursor: pointer; font-size: 11px; display: flex; align-items: center; gap: 5px; }
 .branch-option:hover { background: var(--surface-hover); }
 .branch-option.selected { background: var(--selected); font-weight: 600; }
 
 /* Worktree popover */
 .worktree-dropdown { position: relative; }
-#btn-worktree { display: flex; align-items: center; gap: 4px; font-size: 12px; padding: 4px 8px; }
-#btn-worktree .wt-count { background: var(--accent, #58a6ff); color: #fff; font-size: 10px; border-radius: 8px; padding: 0 5px; min-width: 16px; text-align: center; line-height: 16px; }
+#btn-worktree { display: flex; align-items: center; gap: 3px; font-size: 11px; padding: 3px 6px; }
+#btn-worktree .wt-count { background: var(--accent, #58a6ff); color: #fff; font-size: 9px; border-radius: 7px; padding: 0 4px; min-width: 14px; text-align: center; line-height: 14px; }
 .worktree-popover { position: absolute; top: 100%; right: 0; z-index: 60; background: var(--surface); border: 1px solid var(--border2); border-radius: 8px; box-shadow: 0 4px 16px rgba(0,0,0,0.2); min-width: 300px; max-width: 400px; margin-top: 4px; display: flex; flex-direction: column; }
 .worktree-popover-header { padding: 8px 12px; font-size: 12px; font-weight: 600; border-bottom: 1px solid var(--border); }
 .worktree-list { overflow-y: auto; max-height: 240px; }
@@ -192,19 +202,50 @@ button:active { background: var(--surface); }
 .wt-empty { padding: 16px; text-align: center; font-size: 11px; color: var(--subtext); }
 @media (max-width: 768px) { .branch-option { padding: 10px 12px; min-height: 44px; } }
 
+/* Stash popover */
+.stash-dropdown { position: relative; }
+#btn-stash { display: flex; align-items: center; gap: 3px; font-size: 11px; padding: 3px 6px; }
+#btn-stash .stash-count { background: var(--accent, #58a6ff); color: #fff; font-size: 9px; border-radius: 7px; padding: 0 4px; min-width: 14px; text-align: center; line-height: 14px; }
+.stash-popover { position: absolute; top: 100%; right: 0; z-index: 60; background: var(--surface); border: 1px solid var(--border2); border-radius: 8px; box-shadow: 0 4px 16px rgba(0,0,0,0.2); min-width: 300px; max-width: 400px; margin-top: 4px; display: flex; flex-direction: column; }
+.stash-popover-header { padding: 8px 12px; font-size: 12px; font-weight: 600; border-bottom: 1px solid var(--border); }
+.stash-list { overflow-y: auto; max-height: 240px; }
+.stash-item { padding: 8px 12px; border-bottom: 1px solid var(--border); display: flex; align-items: center; gap: 8px; font-size: 12px; }
+.stash-item:last-child { border-bottom: none; }
+.stash-item-info { flex: 1; min-width: 0; }
+.stash-item-ref { font-weight: 600; font-size: 11px; color: var(--subtext); }
+.stash-item-msg { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.stash-item-actions { display: flex; gap: 4px; flex-shrink: 0; }
+.stash-item-actions button { min-width: 24px; min-height: 24px; padding: 2px 6px; font-size: 10px; }
+.stash-empty { padding: 16px; text-align: center; font-size: 11px; color: var(--subtext); }
+.stash-popover-footer { padding: 8px 12px; border-top: 1px solid var(--border); display: flex; gap: 6px; }
+.stash-popover-footer .btn-sm { flex: 1; }
+
+/* Merge/rebase banner */
+.merge-banner { padding: 8px 12px; background: rgba(133, 77, 14, 0.12); border-bottom: 1px solid var(--border); display: flex; align-items: center; gap: 8px; font-size: 12px; flex-shrink: 0; }
+.merge-banner .banner-icon { color: #eab308; }
+.merge-banner .banner-text { flex: 1; }
+.merge-banner .banner-actions { display: flex; gap: 4px; }
+.merge-banner .banner-actions button { font-size: 11px; padding: 2px 8px; }
+.merge-banner .btn-continue { background: var(--green); color: #fff; border-color: transparent; }
+.merge-banner .btn-abort { background: var(--red); color: #fff; border-color: transparent; }
+
+/* Conflict section */
+.conflict-header { padding: 4px 0; font-size: 12px; font-weight: 600; color: var(--red); display: flex; align-items: center; gap: 4px; }
+.file-status-U { color: var(--red); font-weight: bold; }
+
 /* Find bar */
-.find-bar { display: flex; align-items: center; gap: 6px; padding: 6px 12px; border-bottom: 1px solid var(--border); background: var(--surface); }
-.find-bar input { flex: 1; background: var(--bg); color: var(--text); border: 1px solid var(--border2); border-radius: 4px; padding: 4px 8px; font-size: 12px; }
+.find-bar { display: flex; align-items: center; gap: 5px; padding: 4px 10px; border-bottom: 1px solid var(--border); background: var(--surface); }
+.find-bar input { flex: 1; background: var(--bg); color: var(--text); border: 1px solid var(--border2); border-radius: 4px; padding: 3px 6px; font-size: 11px; }
 .find-bar input:focus { outline: none; border-color: var(--blue); }
-#find-count { font-size: 11px; color: var(--subtext); min-width: 60px; }
+#find-count { font-size: 10px; color: var(--subtext); min-width: 50px; }
 .hidden { display: none !important; }
 
 /* Graph container */
 #graph-container { flex: 1; overflow-y: auto; overflow-x: hidden; }
-.commit-row { display: flex; align-items: center; cursor: pointer; min-height: 28px; padding: 0 8px; }
+.commit-row { display: flex; align-items: center; cursor: pointer; min-height: 24px; padding: 0 6px; font-size: 12px; }
 .commit-row:hover { background: var(--surface-hover); }
 .commit-row.selected { background: var(--selected); }
-.commit-row.header-row { background: var(--surface); cursor: default; font-weight: 600; font-size: 11px; color: var(--subtext); text-transform: uppercase; letter-spacing: 0.5px; position: sticky; top: 0; z-index: 2; border-bottom: 1px solid var(--border); }
+.commit-row.header-row { background: var(--surface); cursor: default; font-weight: 600; font-size: 10px; color: var(--subtext); text-transform: uppercase; letter-spacing: 0.5px; position: sticky; top: 0; z-index: 2; border-bottom: 1px solid var(--border); min-height: 22px; }
 .commit-row.search-match { background: rgba(234, 179, 8, 0.15); }
 .commit-row.virtual { opacity: 0.85; font-style: italic; }
 .commit-row.virtual .col-message { color: var(--subtext); }
@@ -213,13 +254,13 @@ button:active { background: var(--surface); }
 .col-graph { width: var(--graph-col-w, 120px); min-width: var(--graph-col-w, 80px); overflow: hidden; flex-shrink: 0; position: relative; }
 .graph-resize-handle { position: absolute; right: 0; top: 0; bottom: 0; width: 6px; cursor: col-resize; z-index: 3; background: transparent; }
 .graph-resize-handle:hover, .graph-resize-handle.dragging { background: var(--blue); opacity: 0.5; }
-.col-message { flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; padding: 0 8px; }
-.col-author { width: 120px; min-width: 120px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: var(--subtext); font-size: 12px; }
-.col-date { width: 100px; min-width: 100px; color: var(--subtext); font-size: 12px; }
-.col-hash { width: 70px; min-width: 70px; font-family: 'SF Mono', 'Fira Code', monospace; font-size: 11px; color: var(--subtle); }
+.col-message { flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; padding: 0 6px; }
+.col-author { width: 100px; min-width: 100px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: var(--subtext); font-size: 11px; }
+.col-date { width: 80px; min-width: 80px; color: var(--subtext); font-size: 11px; }
+.col-hash { width: 60px; min-width: 60px; font-family: 'SF Mono', 'Fira Code', monospace; font-size: 10px; color: var(--subtle); }
 
 /* Ref badges */
-.ref-badge { display: inline-block; padding: 1px 6px; border-radius: 3px; font-size: 10px; font-weight: 600; margin-right: 4px; vertical-align: middle; }
+.ref-badge { display: inline-block; padding: 0px 5px; border-radius: 3px; font-size: 9px; font-weight: 600; margin-right: 3px; vertical-align: middle; line-height: 16px; }
 .ref-head { background: var(--green); color: #fff; }
 .ref-local { background: var(--blue); color: #fff; }
 .ref-remote { background: var(--purple); color: #fff; }
@@ -236,14 +277,14 @@ button:active { background: var(--surface); }
 .commit-row.graph-hover { background: var(--surface-hover); }
 
 /* Detail panel */
-.detail-panel { border-top: 1px solid var(--border2); background: var(--surface); max-height: 40vh; overflow-y: auto; padding: 12px 16px; flex-shrink: 0; }
-.detail-panel h3 { font-size: 14px; margin-bottom: 8px; }
-.detail-field { margin-bottom: 4px; font-size: 12px; }
+.detail-panel { border-top: 1px solid var(--border2); background: var(--surface); max-height: 40vh; overflow-y: auto; padding: 8px 12px; flex-shrink: 0; }
+.detail-panel h3 { font-size: 13px; margin-bottom: 6px; }
+.detail-field { margin-bottom: 3px; font-size: 11px; }
 .detail-field .label { color: var(--subtext); display: inline-block; width: 80px; }
-.detail-message { background: var(--bg); border: 1px solid var(--border); border-radius: 4px; padding: 8px; margin: 8px 0; font-size: 12px; white-space: pre-wrap; font-family: 'SF Mono', 'Fira Code', monospace; }
+.detail-message { background: var(--bg); border: 1px solid var(--border); border-radius: 4px; padding: 6px; margin: 6px 0; font-size: 11px; white-space: pre-wrap; font-family: 'SF Mono', 'Fira Code', monospace; }
 .file-list { margin-top: 8px; }
-.file-item { display: flex; align-items: center; gap: 6px; padding: 2px 0; font-size: 12px; font-family: 'SF Mono', 'Fira Code', monospace; }
-.file-status { display: inline-block; width: 16px; text-align: center; font-weight: 700; font-size: 11px; }
+.file-item { display: flex; align-items: center; gap: 5px; padding: 1px 0; font-size: 11px; font-family: 'SF Mono', 'Fira Code', monospace; }
+.file-status { display: inline-block; width: 14px; text-align: center; font-weight: 700; font-size: 10px; }
 .file-status-A { color: var(--green); }
 .file-status-M { color: var(--yellow); }
 .file-status-D { color: var(--red); }
@@ -393,6 +434,7 @@ const state = {
   graphColWidth: null,
   fileViewMode: 'list',
   worktrees: [],
+  mergeState: null,
   _lastDetail: null,
 };
 
@@ -412,6 +454,7 @@ const ICONS = {
   fileOpen: '<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 13v6a2 2 0 01-2 2H5a2 2 0 01-2-2V8a2 2 0 012-2h6"/><polyline points="15 3 21 3 21 9"/><line x1="10" y1="14" x2="21" y2="3"/></svg>',
   gitBranch: '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="6" y1="3" x2="6" y2="15"/><circle cx="18" cy="6" r="3"/><circle cx="6" cy="18" r="3"/><path d="M18 9a9 9 0 01-9 9"/></svg>',
   trash: '<svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg>',
+  archive: '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="21 8 21 21 3 21 3 8"/><rect x="1" y="3" width="22" height="5"/><line x1="10" y1="12" x2="14" y2="12"/></svg>',
 };
 
 // --- Toast notifications ---
@@ -431,6 +474,7 @@ document.getElementById('btn-fetch').innerHTML = ICONS.download;
 document.getElementById('btn-find').innerHTML = ICONS.search;
 document.getElementById('btn-settings').innerHTML = ICONS.settings;
 document.getElementById('btn-worktree').innerHTML = ICONS.gitBranch + ' <span class="wt-count" style="display:none">0</span>';
+document.getElementById('btn-stash').innerHTML = ICONS.archive + ' <span class="stash-count" style="display:none">0</span>';
 vscode.postMessage({ command: 'ready' });
 
 // --- Message handler ---
@@ -479,9 +523,12 @@ window.addEventListener('message', (event) => {
       break;
     case 'loadUncommitted':
       state.uncommitted = msg.data;
+      state.mergeState = msg.data?.mergeState || null;
       renderCommitList();
+      renderMergeBanner();
       if (state.selectedCommit === 'uncommitted') {
-        if (!msg.data || (msg.data.staged.length === 0 && msg.data.unstaged.length === 0)) {
+        const u = msg.data;
+        if (!u || (u.staged.length === 0 && u.unstaged.length === 0 && (!u.conflicted || u.conflicted.length === 0))) {
           state.selectedCommit = null;
           state.expandedCommit = null;
           document.getElementById('detail-panel').classList.add('hidden');
@@ -531,11 +578,19 @@ window.addEventListener('message', (event) => {
       if (msg.result.ok && (msg.action === 'addWorktree' || msg.action === 'removeWorktree' || msg.action === 'pruneWorktrees')) {
         vscode.postMessage({ command: 'requestWorktrees' });
       }
+      // Refresh stash list after stash mutations
+      if (msg.result.ok && ['stashSave','stashPop','stashDrop','stashApply'].includes(msg.action)) {
+        vscode.postMessage({ command: 'requestStashes' });
+      }
       break;
     case 'loadWorktrees':
       state.worktrees = msg.data || [];
       renderWorktreeList();
       break;
+    case 'loadStashes':
+      state.stashes = msg.data || [];
+      renderStashList();
+      break;
     case 'error':
       document.getElementById('status-text').textContent = 'Error: ' + msg.message;
       break;
@@ -552,6 +607,8 @@ document.getElementById('detail-panel').addEventListener('click', (e) => {
     const file = actionBtn.dataset.file;
     if (action === 'open') {
       vscode.postMessage({ command: 'openFile', filePath: file });
+    } else if (action === 'open-conflict') {
+      vscode.postMessage({ command: 'openConflictFile', filePath: file });
     } else if (action === 'stage') {
       vscode.postMessage({ command: 'gitAction', action: 'stage', args: { files: [file] } });
     } else if (action === 'unstage') {
@@ -829,6 +886,140 @@ function showCreateWorktreeDialog(startPoint) {
   });
 }
 
+// --- Merge/rebase banner ---
+function renderMergeBanner() {
+  let banner = document.getElementById('merge-banner');
+  if (!state.mergeState) {
+    if (banner) banner.remove();
+    return;
+  }
+  const ms = state.mergeState;
+  const typeLabel = ms.type === 'cherry-pick' ? 'Cherry-pick' : ms.type.charAt(0).toUpperCase() + ms.type.slice(1);
+  const progressText = ms.progress ? ' (' + ms.progress + ')' : '';
+  const msgText = ms.message ? ' — ' + escHtml(ms.message) : '';
+
+  let buttonsHtml = '';
+  if (ms.type === 'rebase') {
+    buttonsHtml = '<button class="btn-sm btn-continue" data-merge-action="rebaseContinue">Continue</button>'
+      + '<button class="btn-sm" data-merge-action="rebaseSkip">Skip</button>'
+      + '<button class="btn-sm btn-abort" data-merge-action="rebaseAbort">Abort</button>';
+  } else if (ms.type === 'merge') {
+    buttonsHtml = '<button class="btn-sm btn-abort" data-merge-action="mergeAbort">Abort</button>';
+  } else if (ms.type === 'cherry-pick') {
+    buttonsHtml = '<button class="btn-sm btn-continue" data-merge-action="cherryPickContinue">Continue</button>'
+      + '<button class="btn-sm btn-abort" data-merge-action="cherryPickAbort">Abort</button>';
+  }
+
+  if (!banner) {
+    banner = document.createElement('div');
+    banner.id = 'merge-banner';
+    banner.className = 'merge-banner';
+    const toolbar = document.getElementById('toolbar');
+    toolbar.parentNode.insertBefore(banner, toolbar.nextSibling);
+  }
+  banner.innerHTML = '<span class="banner-icon">⚠</span>'
+    + '<span class="banner-text"><strong>' + typeLabel + ' in progress' + progressText + '</strong>' + msgText + '</span>'
+    + '<div class="banner-actions">' + buttonsHtml + '</div>';
+
+  banner.querySelectorAll('[data-merge-action]').forEach(btn => {
+    btn.addEventListener('click', () => {
+      const action = btn.dataset.mergeAction;
+      if (action.includes('Abort')) {
+        showDialog({
+          title: 'Abort ' + typeLabel,
+          message: 'Abort the current ' + ms.type + '? Any resolved conflicts will be lost.',
+          destructive: true,
+          confirmLabel: 'Abort',
+          onConfirm: () => gitAction(action, {}),
+        });
+      } else {
+        gitAction(action, {});
+      }
+    });
+  });
+}
+
+// --- Stash popover ---
+const btnStash = document.getElementById('btn-stash');
+const stashPopover = document.getElementById('stash-popover');
+
+btnStash.addEventListener('click', (e) => {
+  e.stopPropagation();
+  const wasHidden = stashPopover.classList.contains('hidden');
+  stashPopover.classList.toggle('hidden');
+  if (wasHidden) vscode.postMessage({ command: 'requestStashes' });
+});
+
+document.addEventListener('click', (e) => {
+  if (!e.target.closest('.stash-dropdown')) stashPopover.classList.add('hidden');
+});
+
+function renderStashList() {
+  const listEl = document.getElementById('stash-list');
+  const countEl = btnStash.querySelector('.stash-count');
+  const stashes = state.stashes;
+  if (countEl) {
+    countEl.textContent = stashes.length;
+    countEl.style.display = stashes.length > 0 ? '' : 'none';
+  }
+  if (!stashes.length) {
+    listEl.innerHTML = '<div class="stash-empty">No stashes</div>';
+    return;
+  }
+  listEl.innerHTML = stashes.map((s, i) => {
+    const ref = 'stash@{' + s.index + '}';
+    return '<div class="stash-item">'
+      + '<div class="stash-item-info">'
+      + '<div class="stash-item-ref">' + escHtml(ref) + '</div>'
+      + '<div class="stash-item-msg" title="' + escHtml(s.message) + '">' + escHtml(s.message) + '</div>'
+      + '</div>'
+      + '<div class="stash-item-actions">'
+      + '<button class="stash-apply btn-sm" data-idx="' + i + '" title="Apply (keep stash)">Apply</button>'
+      + '<button class="stash-pop btn-sm" data-idx="' + i + '" title="Pop (apply & remove)">Pop</button>'
+      + '<button class="stash-drop btn-sm" data-idx="' + i + '" title="Drop (delete)">Drop</button>'
+      + '</div>'
+      + '</div>';
+  }).join('');
+
+  listEl.querySelectorAll('.stash-apply').forEach(btn => {
+    btn.addEventListener('click', (e) => {
+      e.stopPropagation();
+      const s = state.stashes[parseInt(btn.dataset.idx)];
+      if (s) gitAction('stashApply', { stashRef: 'stash@{' + s.index + '}' });
+    });
+  });
+  listEl.querySelectorAll('.stash-pop').forEach(btn => {
+    btn.addEventListener('click', (e) => {
+      e.stopPropagation();
+      const s = state.stashes[parseInt(btn.dataset.idx)];
+      if (s) gitAction('stashPop', { stashRef: 'stash@{' + s.index + '}' });
+    });
+  });
+  listEl.querySelectorAll('.stash-drop').forEach(btn => {
+    btn.addEventListener('click', (e) => {
+      e.stopPropagation();
+      const s = state.stashes[parseInt(btn.dataset.idx)];
+      if (!s) return;
+      showDialog({
+        title: 'Drop Stash',
+        message: 'Delete stash@{' + s.index + '}? This cannot be undone.',
+        destructive: true,
+        confirmLabel: 'Drop',
+        onConfirm: () => gitAction('stashDrop', { stashRef: 'stash@{' + s.index + '}' }),
+      });
+    });
+  });
+}
+
+document.getElementById('stash-save').addEventListener('click', () => {
+  showDialog({
+    title: 'Stash Changes',
+    input: { placeholder: 'Stash message (optional)' },
+    confirmLabel: 'Stash',
+    onConfirm: (msg) => gitAction('stashSave', msg ? { message: msg } : {}),
+  });
+});
+
 // --- Graph column resize ---
 {
   const resizeHandle = document.getElementById('graph-resize-handle');
@@ -1189,7 +1380,8 @@ function graphVertexOut(e) {
 // --- Commit list ---
 function getDisplayCommits() {
   const u = state.uncommitted;
-  if (!u || (u.staged.length === 0 && u.unstaged.length === 0)) return state.commits;
+  const totalFiles = u ? (u.staged.length + u.unstaged.length + (u.conflicted ? u.conflicted.length : 0)) : 0;
+  if (!u || totalFiles === 0) return state.commits;
   const virtualCommit = {
     hash: 'uncommitted',
     parents: state.head ? [state.head] : [],
@@ -1200,7 +1392,7 @@ function getDisplayCommits() {
     committerEmail: '',
     commitDate: Math.floor(Date.now() / 1000),
     refs: [],
-    message: 'Uncommitted Changes (' + (u.staged.length + u.unstaged.length) + ' files)',
+    message: 'Uncommitted Changes (' + totalFiles + ' files)',
   };
   return [virtualCommit, ...state.commits];
 }
@@ -1412,9 +1604,25 @@ function renderUncommittedDetail() {
   const u = state.uncommitted;
   if (!u) { panel.classList.add('hidden'); return; }
   let html = '<h3>Uncommitted Changes</h3>';
-  if (u.staged.length > 0 || u.unstaged.length > 0) {
+  const hasFiles = u.staged.length > 0 || u.unstaged.length > 0 || (u.conflicted && u.conflicted.length > 0);
+  if (hasFiles) {
     html += fileViewToggleHtml();
   }
+  // Conflict section (above staged/unstaged)
+  if (u.conflicted && u.conflicted.length > 0) {
+    html += '<div class="file-list"><div class="conflict-header">⚠ Conflicts (' + u.conflicted.length + ')</div>';
+    html += u.conflicted.map(f => {
+      const fileName = f.path.split('/').pop() || f.path;
+      return '<div class="file-item">'
+        + '<span class="file-status file-status-U">U</span>'
+        + '<span class="file-clickable" data-file="' + escHtml(f.path) + '" data-hash="uncommitted" data-parent="' + escHtml(state.head) + '">' + escHtml(f.path) + '</span>'
+        + '<div class="file-actions">'
+        + '<button class="file-action-btn" data-action="open-conflict" data-file="' + escHtml(f.path) + '" title="Open conflict file">' + ICONS.fileOpen + '</button>'
+        + '<button class="file-action-btn" data-action="stage" data-file="' + escHtml(f.path) + '" title="Mark resolved (stage)">' + ICONS.plus + '</button>'
+        + '</div></div>';
+    }).join('');
+    html += '</div>';
+  }
   if (u.staged.length > 0) {
     html += '<div class="file-list"><div class="section-actions"><strong>Staged (' + u.staged.length + '):</strong>';
     html += '<button class="btn-sm section-action-btn" data-action="unstage-all">Unstage All</button></div>';
@@ -1427,7 +1635,7 @@ function renderUncommittedDetail() {
     html += renderFileListHtml(u.unstaged, 'uncommitted', state.head, 'unstaged');
     html += '</div>';
   }
-  if (u.staged.length === 0 && u.unstaged.length === 0) {
+  if (u.staged.length === 0 && u.unstaged.length === 0 && (!u.conflicted || u.conflicted.length === 0)) {
     html += '<p>No uncommitted changes.</p>';
   }
   html += '<div class="commit-section">';
@@ -1496,6 +1704,16 @@ function showCommitContextMenu(x, y, commit) {
     { label: 'Create Branch Here...', action: () => promptAndAction('Branch name:', (name) => gitAction('createBranch', { name, startPoint: commit.hash })) },
     { label: 'Create Tag Here...', action: () => promptAndAction('Tag name:', (name) => gitAction('createTag', { name, hash: commit.hash })) },
     { label: 'Create Worktree Here...', action: () => showCreateWorktreeDialog(commit.hash) },
+    { separator: true },
+    { label: 'Rebase current branch onto this...', action: () => {
+      showDialog({
+        title: 'Rebase',
+        message: 'Rebase current branch (' + escHtml(state.currentBranch) + ') onto commit ' + commit.hash.substring(0, 7) + '?',
+        rawMessage: true,
+        confirmLabel: 'Rebase',
+        onConfirm: () => gitAction('rebase', { branch: commit.hash }),
+      });
+    }},
   ];
   // Add "Create PR" if PR creation is configured and commit has a branch ref
   if (state.settings.prCreation && state.settings.prCreation.urlTemplate) {

package/src/server/ws/extensions.ts

@@ -71,9 +71,14 @@ async function handleMessage(ws: ExtWsSocket, raw: string | Buffer): Promise<voi
 
   switch (msg.type) {
     case "ready": {
-      // Send current contributions on connect
+      // Send current contributions + any activation errors on connect
       const contributions = contributionRegistry.getAll();
-      ws.send(JSON.stringify({ type: "contributions:update", contributions } satisfies ExtServerMsg));
+      const { extensionService } = await import("../../services/extension.service.ts");
+      const activationErrors = Object.fromEntries(extensionService.getActivationErrors());
+      const readyMsg: ExtServerMsg = Object.keys(activationErrors).length > 0
+        ? { type: "contributions:update", contributions, activationErrors }
+        : { type: "contributions:update", contributions };
+      ws.send(JSON.stringify(readyMsg));
       break;
     }
 
@@ -81,15 +86,36 @@ async function handleMessage(ws: ExtWsSocket, raw: string | Buffer): Promise<voi
       try {
         const { extensionService } = await import("../../services/extension.service.ts");
         if (extensionService["rpc"]) {
+          console.log(`[ExtWS] command:execute "${msg.command}"`);
           const result = await extensionService["rpc"].sendRequest<{ ok: boolean; error?: string }>(
             "ext:command:execute", msg.command, ...(msg.args ?? []),
           );
           if (!result?.ok) {
             console.error(`[ExtWS] command:execute failed: ${result?.error ?? "unknown"}`);
+            broadcastExtMsg({
+              type: "notification",
+              id: `cmd-error-${Date.now()}`,
+              level: "error",
+              message: `Extension command failed: ${result?.error ?? "unknown error"}`,
+            });
           }
+        } else {
+          console.error(`[ExtWS] command:execute: extension host not ready`);
+          broadcastExtMsg({
+            type: "notification",
+            id: `cmd-error-${Date.now()}`,
+            level: "error",
+            message: `Extension host not ready. Try reloading the page.`,
+          });
         }
       } catch (e) {
         console.error(`[ExtWS] command:execute error:`, e);
+        broadcastExtMsg({
+          type: "notification",
+          id: `cmd-error-${Date.now()}`,
+          level: "error",
+          message: `Extension command error: ${e instanceof Error ? e.message : String(e)}`,
+        });
       }
       break;
     }

package/src/services/extension-host-worker.ts

@@ -29,6 +29,7 @@ self.addEventListener("message", (event: MessageEvent<RpcMessage>) => {
 
 rpc.onRequest("ext:activate", async (params) => {
   const [extId, entryPath, extensionPath, storedState, baseUrl] = params as [string, string, string, Record<string, Record<string, string | null>>?, string?];
+  console.log(`[ExtHost] activating ${extId} from ${entryPath}`);
   if (activeExtensions.has(extId)) return { ok: true, already: true };
 
   // Expose server base URL so extensions can use fetch() with absolute URLs
@@ -68,6 +69,7 @@ rpc.onRequest("ext:activate", async (params) => {
       window: api.window as WindowService,
       commands: api.commands as CommandService,
     });
+    console.log(`[ExtHost] activated ${extId} (${activeExtensions.size} total)`);
     return { ok: true };
   } catch (e) {
     const msg = e instanceof Error ? e.message : String(e);
@@ -101,20 +103,23 @@ rpc.onRequest("ext:deactivate", async (params) => {
 
 rpc.onRequest("ext:command:execute", async (params) => {
   const [command, ...args] = params as [string, ...unknown[]];
+  console.log(`[ExtHost] command:execute "${command}" (${activeExtensions.size} extensions active)`);
   for (const [extId, ext] of activeExtensions) {
     if (ext.commands) {
       const hasLocal = (ext.commands as any).localHandlers?.has(command);
       if (!hasLocal) continue;
+      console.log(`[ExtHost] routing "${command}" → ${extId}`);
       try {
         const result = await (ext.commands as any).executeCommand(command, ...args);
         return { ok: true, result };
       } catch (e) {
         const msg = e instanceof Error ? e.message : String(e);
-        console.error(`[ExtHost] Command "${command}" in ${extId} threw:`, msg);
+        console.error(`[ExtHost] command "${command}" in ${extId} threw:`, msg);
         return { ok: false, error: msg };
       }
     }
   }
+  console.warn(`[ExtHost] command not found: "${command}"`);
   return { ok: false, error: `Command not found: ${command}` };
 });
 

package/src/services/extension.service.ts

@@ -13,6 +13,7 @@ class ExtensionService {
   private worker: Worker | null = null;
   private rpc: RpcChannel | null = null;
   private activatedIds = new Set<string>();
+  private activationErrors = new Map<string, string>();
   private workerReady = false;
   private installing = new Set<string>();
   private extensionPaths = new Map<string, string>();
@@ -56,6 +57,7 @@ class ExtensionService {
     if (this.worker) { this.worker.terminate(); this.worker = null; }
     this.workerReady = false;
     this.activatedIds.clear();
+    this.activationErrors.clear();
     this.extensionPaths.clear();
     this.bundledIds.clear();
     contributionRegistry.clear();
@@ -141,15 +143,20 @@ class ExtensionService {
     const port = cfg.get("port") ?? 8080;
     const baseUrl = `http://localhost:${port}`;
 
+    console.log(`[ExtService] activating ${id} (entry: ${entryPath})`);
     const result = await rpc.sendRequest<{ ok: boolean; error?: string }>(
       "ext:activate", id, entryPath, extDir, storedState, baseUrl,
     );
-    if (!result.ok) throw new Error(`Failed to activate ${id}: ${result.error}`);
+    if (!result.ok) {
+      this.activationErrors.set(id, result.error ?? "Unknown activation error");
+      throw new Error(`Failed to activate ${id}: ${result.error}`);
+    }
 
+    this.activationErrors.delete(id);
     this.activatedIds.add(id);
     if (manifest.contributes) contributionRegistry.register(id, manifest.contributes);
     this.broadcastContributions();
-    console.log(`[ExtService] Activated ${id}`);
+    console.log(`[ExtService] activated ${id} successfully`);
   }
 
   async deactivate(id: string): Promise<void> {
@@ -236,7 +243,9 @@ class ExtensionService {
     }
     for (const row of getExtensions()) {
       if (row.enabled !== 1) continue;
+      console.log(`[ExtService] startup: activating ${row.id}...`);
       try { await this.activate(row.id); } catch (e) {
+        this.activationErrors.set(row.id, e instanceof Error ? e.message : String(e));
         console.error(`[ExtService] Failed to activate ${row.id} on startup:`, e);
       }
     }
@@ -252,12 +261,17 @@ class ExtensionService {
   isActivated(id: string): boolean { return this.activatedIds.has(id); }
   isBundled(id: string): boolean { return this.bundledIds.has(id); }
   getExtensionsDir(): string { return resolve(getPpmDir(), "extensions"); }
+  getActivationErrors(): Map<string, string> { return new Map(this.activationErrors); }
 
   /** Push current contributions to all connected browser clients */
   private broadcastContributions(): void {
     try {
       const { broadcastExtMsg } = require("../server/ws/extensions.ts");
-      broadcastExtMsg({ type: "contributions:update", contributions: contributionRegistry.getAll() });
+      const contributions = contributionRegistry.getAll();
+      broadcastExtMsg(this.activationErrors.size > 0
+        ? { type: "contributions:update", contributions, activationErrors: Object.fromEntries(this.activationErrors) }
+        : { type: "contributions:update", contributions },
+      );
     } catch {}
   }
 }

package/src/types/extension-messages.ts

@@ -51,7 +51,7 @@ export type ExtServerMsg =
   | { type: "webview:postMessage"; panelId: string; message: unknown }
   | { type: "tab:open"; tabType: string; title: string; projectId: string | null; closable?: boolean; metadata?: Record<string, unknown> }
   | { type: "project:switch"; projectName: string }
-  | { type: "contributions:update"; contributions: ExtensionContributes };
+  | { type: "contributions:update"; contributions: ExtensionContributes; activationErrors?: Record<string, string> };
 
 // --- Client → Server messages ---