create-walle 0.9.11 → 0.9.13

package/template/claude-task-manager/public/js/message-renderer.js

@@ -20,6 +20,7 @@
  *   - renderGroup(g)                    — render one group from groupMessages
  *   - _buildCollapsible(label, color, preview, bodyEl) — Conversation tab DOM helper
  *   - renderConversationEvent(evt)      — Conversation row DOM element
+ *   - refreshConversationActivityGroup(group) — recompute grouped tool UI
  *
  * Depends on global escHtml (defined in index.html). Since the renderer
  * functions are only invoked AFTER the page's body scripts run, escHtml
@@ -28,10 +29,26 @@
 (function () {
   const MR = {};
 
+  function _imageApiUrlForLocalPath(src) {
+    const value = String(src || '').trim().replace(/^<|>$/g, '');
+    const match = value.match(/(?:^|[\\/])images[\\/]+([^\\/?:#]+\.(?:png|jpe?g|gif|webp|svg))(?:[?#].*)?$/i);
+    if (!match) return null;
+    return '/api/images/file/' + encodeURIComponent(match[1]);
+  }
+
+  function _normalizeMarkdownImageSources(text) {
+    return String(text || '').replace(/!\[([^\]]*)\]\(([^)\s]+|<[^>]+>)\)/g, (all, alt, src) => {
+      const apiUrl = _imageApiUrlForLocalPath(src);
+      if (!apiUrl) return all;
+      return `![${alt}](${apiUrl})`;
+    });
+  }
+
   // ------------------------------------------------------------------
   // Markdown + tool-badge formatting (was index.html formatMsgText).
   // ------------------------------------------------------------------
   MR.formatMsgText = function (text) {
+    text = _normalizeMarkdownImageSources(text);
     // Stash tool badges with unique placeholders before markdown parsing
     const badges = [];
     text = text.replace(/\[Tool: ([^\]]+)\]/g, (_, name) => {
@@ -179,6 +196,34 @@
     return 'normal';
   };
 
+  const _TOOL_TOKEN_RE = /\[Tool(?: result)?:\s*([^\]]+)\]/g;
+
+  function _toolNamesFromText(text) {
+    const names = [];
+    for (const m of String(text || '').matchAll(_TOOL_TOKEN_RE)) {
+      const name = (m[1] || '').trim();
+      if (name) names.push(name);
+    }
+    return names;
+  }
+
+  function _summarizeNames(names, max = 4) {
+    const counts = new Map();
+    for (const raw of names || []) {
+      const name = String(raw || '').trim();
+      if (!name) continue;
+      counts.set(name, (counts.get(name) || 0) + 1);
+    }
+    const parts = Array.from(counts.entries()).map(([name, count]) => count > 1 ? `${name} x${count}` : name);
+    if (parts.length <= max) return parts.join(' · ');
+    return parts.slice(0, max).join(' · ') + ` · +${parts.length - max}`;
+  }
+
+  function _previewFromText(text, max = 90) {
+    const s = String(text || '').replace(/\n/g, ' ').trim();
+    return s.length > max ? s.slice(0, max) + '…' : s;
+  }
+
   // ------------------------------------------------------------------
   // Review-page renderers — return HTML strings. The page batches many
   // groups into one big string, sanitizes via DOMPurify, then sets
@@ -265,15 +310,17 @@
   MR.renderSelfThoughtMsg = function (m, i, stripped) {
     const time = m.timestamp ? new Date(m.timestamp).toLocaleString() : '';
     const textHtml = MR.formatMsgText(m.text);
-    const preview = stripped.replace(/\n/g, ' ').slice(0, 90) + (stripped.length > 90 ? '…' : '');
-    return '<div class="thought-group" onclick="this.classList.toggle(\'expanded\')">'
+    const toolSummary = _summarizeNames(_toolNamesFromText(m.text));
+    const preview = toolSummary || _previewFromText(stripped);
+    const groupClass = toolSummary ? 'thought-group tool-activity-group' : 'thought-group';
+    return '<div class="' + groupClass + '" onclick="this.classList.toggle(\'expanded\')">'
       + '<div class="thought-group-header">'
       + '<span class="thought-group-label"><span class="thought-chevron">▶</span>Claude</span>'
       + '<span class="thought-group-preview">' + escHtml(preview) + '</span>'
       + '<span class="thought-group-time">' + escHtml(time) + '</span>'
       + '</div>'
       + '<div class="thought-group-items">'
-      + '<div class="review-msg assistant" data-msg-idx="' + i + '">'
+      + '<div class="review-msg assistant tool-activity-item" data-msg-idx="' + i + '">'
       + '<div class="msg-text">' + textHtml + '</div></div>'
       + '</div></div>';
   };
@@ -281,7 +328,9 @@
   MR.renderSelfThoughtItem = function (m, i, stripped) {
     const time = m.timestamp ? new Date(m.timestamp).toLocaleString() : '';
     const textHtml = MR.formatMsgText(m.text);
-    return '<div class="review-msg assistant" data-msg-idx="' + i + '">'
+    const toolNames = _toolNamesFromText(m.text);
+    const dataTools = toolNames.length ? ' data-tool-names="' + escHtml(toolNames.join(',')) + '"' : '';
+    return '<div class="review-msg assistant tool-activity-item" data-msg-idx="' + i + '"' + dataTools + '>'
       + '<div class="msg-header">'
       + '<span class="msg-role">Claude</span>'
       + '<span class="msg-time">' + escHtml(time) + '</span>'
@@ -326,12 +375,15 @@
     if (groupItems.length === 1) {
       return MR.renderSelfThoughtMsg(groupItems[0].m, groupItems[0].i, groupItems[0].stripped);
     }
+    const toolNames = groupItems.flatMap(gi => _toolNamesFromText(gi.m.text));
+    const toolSummary = _summarizeNames(toolNames);
     const firstPreview = groupItems.map(gi => gi.stripped).find(s => s.length > 0) || '';
-    const preview = firstPreview.replace(/\n/g, ' ').slice(0, 80) + (firstPreview.length > 80 ? '…' : '');
+    const preview = toolSummary || _previewFromText(firstPreview, 80);
     const firstTime = groupItems[0].m.timestamp ? new Date(groupItems[0].m.timestamp).toLocaleString() : '';
     const lastTime = groupItems[groupItems.length - 1].m.timestamp ? new Date(groupItems[groupItems.length - 1].m.timestamp).toLocaleString() : '';
     const timeLabel = firstTime === lastTime ? firstTime : firstTime + ' – ' + lastTime;
-    return '<div class="thought-group" onclick="this.classList.toggle(\'expanded\')">'
+    const groupClass = toolSummary ? 'thought-group tool-activity-group' : 'thought-group';
+    return '<div class="' + groupClass + '" onclick="this.classList.toggle(\'expanded\')">'
       + '<div class="thought-group-header">'
       + '<span class="thought-group-label"><span class="thought-chevron">▶</span>Claude'
       + '<span class="thought-group-count">— ' + groupItems.length + ' steps</span></span>'
@@ -392,6 +444,41 @@
     return wrap;
   };
 
+  MR.refreshConversationActivityGroup = function (group) {
+    if (!group || !group.querySelector) return;
+    const items = group.querySelector('.thought-group-items');
+    if (!items) return;
+    const rows = Array.from(items.children || []);
+    const countEl = group.querySelector('.thought-group-count');
+    if (countEl) {
+      const stepCount = rows.length;
+      countEl.textContent = '— ' + stepCount + ' step' + (stepCount === 1 ? '' : 's');
+    }
+    const toolNames = [];
+    const previews = [];
+    for (const row of rows) {
+      const rawTools = row.dataset?.toolNames || '';
+      if (rawTools) {
+        for (const name of rawTools.split(',')) {
+          const clean = name.trim();
+          if (clean) toolNames.push(clean);
+        }
+      }
+      const p = row.dataset?.activityPreview || '';
+      if (p) previews.push(p);
+    }
+    const previewEl = group.querySelector('.thought-group-preview');
+    if (previewEl) {
+      previewEl.textContent = _summarizeNames(toolNames) || previews[0] || '';
+    }
+    const timeEl = group.querySelector('.thought-group-time');
+    if (timeEl) {
+      const f = group.dataset.firstTime || rows[0]?.dataset?.time || '';
+      const l = group.dataset.lastTime || rows[rows.length - 1]?.dataset?.time || '';
+      timeEl.textContent = (f && l && f !== l) ? f + ' – ' + l : (l || f);
+    }
+  };
+
   // Phase 2: Conversation rows now share the `.review-msg` CSS classes with
   // Review, run text through `MR.formatMsgText` for markdown + tool badges,
   // and get Show-more affordances + per-message timestamps. Conversation
@@ -602,8 +689,7 @@
       }
       if (isSelfThought) {
         const group = document.createElement('div');
-        group.className = 'thought-group conv-tool-group';
-        if (evt.data?.parentUuid) group.dataset.parentUuid = evt.data.parentUuid;
+        group.className = 'thought-group conv-tool-group tool-activity-group';
         group.dataset.firstTime = time;
         group.dataset.lastTime = time;
         group.addEventListener('click', () => group.classList.toggle('expanded'));
@@ -642,7 +728,11 @@
         const items = document.createElement('div');
         items.className = 'thought-group-items';
         const itemRow = document.createElement('div');
-        itemRow.className = 'review-msg assistant';
+        itemRow.className = 'review-msg assistant tool-activity-item';
+        if (evt.data?.parentUuid) itemRow.dataset.parentUuid = evt.data.parentUuid;
+        if (time) itemRow.dataset.time = time;
+        if (toolNames.length) itemRow.dataset.toolNames = toolNames.join(',');
+        if (stripped) itemRow.dataset.activityPreview = _previewFromText(stripped, 90);
         const itemBody = document.createElement('div');
         itemBody.className = 'msg-text';
         if (stripped) {
@@ -665,6 +755,7 @@
         items.appendChild(itemRow);
         group.appendChild(header);
         group.appendChild(items);
+        MR.refreshConversationActivityGroup(group);
         return group;
       }
       // Mixed (text + maybe tools) — keep the existing per-row layout with
@@ -695,18 +786,56 @@
 
     if (evType === 'tool_result') {
       if (!text) return null;
-      const div = document.createElement('div');
-      // `.tool-only` lets the existing "Hide tool calls" toggle hide these
-      // when the user opts in — matches Review's classification.
-      div.className = 'review-msg tool-only';
-      if (evt.data?.parentUuid) div.dataset.parentUuid = evt.data.parentUuid;
-      const body = document.createElement('div');
-      body.style.cssText = 'white-space:pre-wrap;color:#bbb;max-height:300px;overflow-y:auto;padding:4px 0 4px 12px;font-size:12px';
-      body.textContent = text;
       const firstLine = (text.split('\n').find(l => l.trim()) || '').trim();
       const preview = firstLine.length > 100 ? firstLine.slice(0, 97) + '…' : firstLine;
-      div.appendChild(MR._buildCollapsible('Tool Result', '#888', preview, body));
-      return div;
+      const group = document.createElement('div');
+      group.className = 'thought-group conv-tool-group tool-activity-group tool-result-group';
+      group.dataset.firstTime = time;
+      group.dataset.lastTime = time;
+      group.addEventListener('click', () => group.classList.toggle('expanded'));
+
+      const header = document.createElement('div');
+      header.className = 'thought-group-header';
+      const label = document.createElement('span');
+      label.className = 'thought-group-label';
+      const chev = document.createElement('span');
+      chev.className = 'thought-chevron';
+      chev.textContent = '▶';
+      label.appendChild(chev);
+      const labelText = document.createElement('span');
+      labelText.textContent = 'Tools';
+      label.appendChild(labelText);
+      const count = document.createElement('span');
+      count.className = 'thought-group-count';
+      count.textContent = '— 1 step';
+      label.appendChild(count);
+      const previewEl = document.createElement('span');
+      previewEl.className = 'thought-group-preview';
+      previewEl.textContent = preview;
+      const tEl = document.createElement('span');
+      tEl.className = 'thought-group-time';
+      tEl.textContent = time;
+      header.appendChild(label);
+      header.appendChild(previewEl);
+      header.appendChild(tEl);
+
+      const items = document.createElement('div');
+      items.className = 'thought-group-items';
+      const itemRow = document.createElement('div');
+      itemRow.className = 'review-msg tool-only tool-activity-item tool-result-item';
+      if (evt.data?.parentUuid) itemRow.dataset.parentUuid = evt.data.parentUuid;
+      if (time) itemRow.dataset.time = time;
+      if (preview) itemRow.dataset.activityPreview = preview;
+      const itemBody = document.createElement('div');
+      itemBody.className = 'msg-text';
+      itemBody.style.cssText = 'white-space:pre-wrap;color:#bbb;max-height:300px;overflow-y:auto;font-size:12px';
+      itemBody.textContent = text;
+      itemRow.appendChild(itemBody);
+      items.appendChild(itemRow);
+      group.appendChild(header);
+      group.appendChild(items);
+      MR.refreshConversationActivityGroup(group);
+      return group;
     }
 
     if (evType === 'summary') {

package/template/claude-task-manager/public/js/reviews.js

@@ -18,17 +18,31 @@ let crState = {
   diffMode: 'unified',   // unified | split
   selectStart: null,     // Line selection start for range comments
   fileChangeCount: 0,    // For badge
+  _view: 'projects',
+  _openSeq: 0,
+  _diffSeq: 0,
+  _projectSeq: 0,
 };
 
-function api(path, method, body) {
+async function api(path, method, body) {
   const token = window._ctmState?.token || '';
   const opts = { method: method || 'GET', headers: {} };
   if (body) {
     opts.headers['Content-Type'] = 'application/json';
     opts.body = JSON.stringify(body);
   }
-  return fetch(`/api${path}${path.includes('?') ? '&' : '?'}token=${token}`, opts)
-    .then(r => r.json());
+  const res = await fetch(`/api${path}${path.includes('?') ? '&' : '?'}token=${encodeURIComponent(token)}`, opts);
+  let data = null;
+  try { data = await res.json(); } catch (_) {}
+  if (!res.ok || (data && data.error)) {
+    throw new Error((data && data.error) || ('HTTP ' + res.status));
+  }
+  return data || {};
+}
+
+function normalizeReviewSeverity(severity) {
+  severity = String(severity || 'comment').trim().toLowerCase();
+  return ['comment', 'suggestion', 'issue', 'nit', 'question'].includes(severity) ? severity : 'comment';
 }
 
 // --- Pinned projects ---
@@ -46,6 +60,9 @@ CR.loadPinnedProjects = function(prefs) {
 
 // --- Show project list (default view when panel opens) ---
 CR.showProjectList = async function() {
+  const seq = ++crState._projectSeq;
+  crState._view = 'projects';
+  crState.reviewId = null;
   const header = document.getElementById('cr-header');
   const tree = document.getElementById('cr-file-tree');
   const area = document.getElementById('cr-diff-area');
@@ -58,6 +75,7 @@ CR.showProjectList = async function() {
 
   try {
     const data = await api('/reviews/tracked-projects');
+    if (seq !== crState._projectSeq || crState._view !== 'projects') return;
     const projects = data.projects || [];
 
     if (projects.length === 0) {
@@ -137,6 +155,7 @@ CR.showProjectList = async function() {
     html += '</div>';
     if (area) area.innerHTML = html;
   } catch (e) {
+    if (seq !== crState._projectSeq || crState._view !== 'projects') return;
     if (area) area.innerHTML = `<div class="cr-diff-empty" style="color:var(--red)">Failed to load projects: ${escHtml(e.message)}</div>`;
   }
 };
@@ -184,6 +203,8 @@ CR.openSessionForProject = function() {
 
 // --- Initialize review for a session ---
 CR.openReview = async function(sessionId, projectPath) {
+  const seq = ++crState._openSeq;
+  crState._view = 'review';
   crState.sessionId = sessionId;
   crState.projectPath = projectPath;
   crState.baseRef = '';
@@ -210,34 +231,45 @@ CR.openReview = async function(sessionId, projectPath) {
   renderHeader();
   renderLoading();
 
-  // Load branch, commits, and rich commit log in parallel
-  const [branchData, commitsData, logData] = await Promise.all([
-    api(`/reviews/branch?project=${encodeURIComponent(projectPath)}`),
-    api(`/reviews/commits?project=${encodeURIComponent(projectPath)}`),
-    api(`/reviews/commit-log?project=${encodeURIComponent(projectPath)}&count=20`),
-  ]);
-  crState.branch = branchData.branch || '';
-  crState._commitLog = logData.commits || [];
-  renderHeader(commitsData.commits || []);
-
-  // Create review record in DB
-  const { id } = await api('/reviews', 'POST', {
-    session_id: sessionId,
-    project_path: projectPath,
-    base_ref: '',
-  });
-  crState.reviewId = id;
+  try {
+    // Load branch, commits, and rich commit log in parallel
+    const [branchData, commitsData, logData] = await Promise.all([
+      api(`/reviews/branch?project=${encodeURIComponent(projectPath)}`),
+      api(`/reviews/commits?project=${encodeURIComponent(projectPath)}`),
+      api(`/reviews/commit-log?project=${encodeURIComponent(projectPath)}&count=20`),
+    ]);
+    if (seq !== crState._openSeq || crState._view !== 'review') return;
+    crState.branch = branchData.branch || '';
+    crState._commitLog = logData.commits || [];
+    renderHeader(commitsData.commits || []);
+
+    // Create review record in DB
+    const { id } = await api('/reviews', 'POST', {
+      session_id: sessionId,
+      project_path: projectPath,
+      base_ref: '',
+    });
+    if (seq !== crState._openSeq || crState._view !== 'review') return;
+    crState.reviewId = id;
 
-  // Load diff
-  await loadDiff();
+    // Load diff
+    await loadDiff();
+  } catch (e) {
+    if (seq !== crState._openSeq || crState._view !== 'review') return;
+    const area = document.getElementById('cr-diff-area');
+    if (area) area.innerHTML = `<div class="cr-diff-empty" style="color:var(--red)">Failed to open review: ${escHtml(e.message)}</div>`;
+    if (typeof window.toast === 'function') window.toast('Failed to open review: ' + e.message, { type: 'error' });
+  }
 };
 
 async function loadDiff() {
+  const seq = ++crState._diffSeq;
   renderLoading();
   try {
     const data = await api(
       `/reviews/diff?project=${encodeURIComponent(crState.projectPath)}&base=${encodeURIComponent(crState.baseRef)}`
     );
+    if (seq !== crState._diffSeq || crState._view !== 'review') return;
     crState.files = data.files || [];
 
     // Update file count on review record
@@ -253,6 +285,7 @@ async function loadDiff() {
       renderDiff();
     }
   } catch (e) {
+    if (seq !== crState._diffSeq || crState._view !== 'review') return;
     const area = document.getElementById('cr-diff-area');
     if (area) area.innerHTML = `<div class="cr-diff-empty" style="color:var(--red)">Failed to load diff: ${escHtml(e.message)}</div>`;
   }
@@ -282,8 +315,8 @@ function renderHeader(commits) {
   // logMap keyed by both full SHA and short SHA for flexible lookup
   const logMap = {};
   for (const lc of (crState._commitLog || [])) { logMap[lc.sha] = lc; logMap[lc.shortSha] = lc; }
-  let baseOptions = '<option value="">Working tree (unstaged)</option>';
-  baseOptions += '<option value="--staged">Staged changes</option>';
+  let baseOptions = `<option value=""${crState.baseRef === '' ? ' selected' : ''}>Working tree (unstaged)</option>`;
+  baseOptions += `<option value="--staged"${crState.baseRef === '--staged' ? ' selected' : ''}>Staged changes</option>`;
   if (commits) {
     for (const c of commits) {
       const sel = crState.baseRef === c.sha ? ' selected' : '';
@@ -345,10 +378,13 @@ function renderLoading() {
 function renderNoChanges() {
   const area = document.getElementById('cr-diff-area');
   const tree = document.getElementById('cr-file-tree');
+  const message = crState.baseRef === '--staged'
+    ? 'No staged changes'
+    : (crState.baseRef ? `Commit ${crState.baseRef.slice(0,7)} has no file changes` : 'Working tree is clean against HEAD');
   if (area) area.innerHTML = `<div class="cr-no-changes">
     <div class="cr-no-changes-icon">&#x2714;</div>
     <div class="cr-no-changes-text">No changes detected</div>
-    <div style="font-size:11px;color:var(--fg-dim)">${crState.baseRef ? `Commit ${crState.baseRef.slice(0,7)} has no file changes` : 'Working tree is clean against HEAD'}</div>
+    <div style="font-size:11px;color:var(--fg-dim)">${escHtml(message)}</div>
   </div>`;
   if (tree) tree.innerHTML = '';
   renderFooter();
@@ -595,16 +631,16 @@ function _setupScrollSpy(area) {
 function renderCommentThread(comments, filePath, lineNum, side) {
   let html = `<tr class="cr-comment-row"><td colspan="4"><div class="cr-comment-thread">`;
   for (const c of comments) {
-    const severityCls = c.severity || 'comment';
+    const severityCls = normalizeReviewSeverity(c.severity);
     const lineRange = c.line_end && c.line_end !== c.line_start
       ? `Lines ${c.line_start}-${c.line_end}`
       : `Line ${c.line_start}`;
     html += `<div class="cr-comment-item" data-comment-id="${c.id}">
       <div class="cr-comment-header">
         <span class="cr-comment-author">${c.ai_generated ? 'AI' : 'You'}</span>
-        <span class="cr-comment-severity ${severityCls}">${severityCls}</span>
+        <span class="cr-comment-severity ${severityCls}">${escHtml(severityCls)}</span>
         ${c.ai_generated ? '<span class="cr-comment-ai">AI suggestion</span>' : ''}
-        <span style="font-size:10px;color:var(--fg-dim);margin-left:auto">${lineRange}</span>
+        <span style="font-size:10px;color:var(--fg-dim);margin-left:auto">${escHtml(lineRange)}</span>
       </div>
       <div class="cr-comment-body">${escHtml(c.body)}</div>
       <div class="cr-comment-actions">
@@ -623,9 +659,9 @@ function renderFooter() {
   const footer = document.getElementById('cr-footer');
   if (!footer) return;
   const openComments = crState.comments.filter(c => c.status === 'open');
-  const issues = openComments.filter(c => c.severity === 'issue').length;
-  const suggestions = openComments.filter(c => c.severity === 'suggestion').length;
-  const nits = openComments.filter(c => c.severity === 'nit').length;
+  const issues = openComments.filter(c => normalizeReviewSeverity(c.severity) === 'issue').length;
+  const suggestions = openComments.filter(c => normalizeReviewSeverity(c.severity) === 'suggestion').length;
+  const nits = openComments.filter(c => normalizeReviewSeverity(c.severity) === 'nit').length;
   const other = openComments.length - issues - suggestions - nits;
   const fileCount = crState.files.length;
 
@@ -779,24 +815,29 @@ CR.saveComment = async function(filePath, lineStart, lineEnd, side) {
   if (!input || !input.value.trim()) return;
 
   const body = input.value.trim();
-  const severity = severitySelect?.value || 'comment';
+  const severity = normalizeReviewSeverity(severitySelect?.value);
 
   if (!crState.reviewId) return;
 
-  const { id } = await api(`/reviews/${crState.reviewId}/comments`, 'POST', {
-    file_path: filePath,
-    line_start: lineStart,
-    line_end: lineEnd,
-    side: side,
-    body: body,
-    severity: severity,
-  });
+  try {
+    const { id } = await api(`/reviews/${crState.reviewId}/comments`, 'POST', {
+      file_path: filePath,
+      line_start: lineStart,
+      line_end: lineEnd,
+      side: side === 'old' ? 'old' : 'new',
+      body: body,
+      severity: severity,
+    });
 
-  crState.comments.push({
-    id, review_id: crState.reviewId, file_path: filePath,
-    line_start: lineStart, line_end: lineEnd, side,
-    body, severity, status: 'open', ai_generated: 0,
-  });
+    crState.comments.push({
+      id, review_id: crState.reviewId, file_path: filePath,
+      line_start: lineStart, line_end: lineEnd, side: side === 'old' ? 'old' : 'new',
+      body, severity, status: 'open', ai_generated: 0,
+    });
+  } catch (e) {
+    if (typeof window.toast === 'function') window.toast('Failed to save comment: ' + e.message, { type: 'error' });
+    return;
+  }
 
   // Remove form and re-render
   renderDiff();
@@ -804,26 +845,38 @@ CR.saveComment = async function(filePath, lineStart, lineEnd, side) {
 };
 
 CR.resolveComment = async function(commentId) {
-  await api(`/review-comments/${commentId}`, 'PUT', { status: 'resolved' });
-  const c = crState.comments.find(c => c.id === commentId);
-  if (c) c.status = 'resolved';
-  renderDiff();
-  renderFileTree();
+  try {
+    await api(`/review-comments/${commentId}`, 'PUT', { status: 'resolved' });
+    const c = crState.comments.find(c => c.id === commentId);
+    if (c) c.status = 'resolved';
+    renderDiff();
+    renderFileTree();
+  } catch (e) {
+    if (typeof window.toast === 'function') window.toast('Failed to resolve comment: ' + e.message, { type: 'error' });
+  }
 };
 
 CR.reopenComment = async function(commentId) {
-  await api(`/review-comments/${commentId}`, 'PUT', { status: 'open' });
-  const c = crState.comments.find(c => c.id === commentId);
-  if (c) c.status = 'open';
-  renderDiff();
-  renderFileTree();
+  try {
+    await api(`/review-comments/${commentId}`, 'PUT', { status: 'open' });
+    const c = crState.comments.find(c => c.id === commentId);
+    if (c) c.status = 'open';
+    renderDiff();
+    renderFileTree();
+  } catch (e) {
+    if (typeof window.toast === 'function') window.toast('Failed to reopen comment: ' + e.message, { type: 'error' });
+  }
 };
 
 CR.deleteComment = async function(commentId) {
-  await api(`/review-comments/${commentId}`, 'DELETE');
-  crState.comments = crState.comments.filter(c => c.id !== commentId);
-  renderDiff();
-  renderFileTree();
+  try {
+    await api(`/review-comments/${commentId}`, 'DELETE');
+    crState.comments = crState.comments.filter(c => c.id !== commentId);
+    renderDiff();
+    renderFileTree();
+  } catch (e) {
+    if (typeof window.toast === 'function') window.toast('Failed to delete comment: ' + e.message, { type: 'error' });
+  }
 };
 
 // --- Submit review: compose prompt and send to session ---
@@ -877,9 +930,14 @@ async function _composeReviewPrompt() {
     if (typeof window.toast === 'function') window.toast('No open comments to submit', { type: 'warning' });
     return null;
   }
-  await api(`/reviews/${crState.reviewId}`, 'PUT', { status: 'submitted' });
-  const { prompt } = await api(`/reviews/${crState.reviewId}/compose`);
-  return prompt;
+  try {
+    const { prompt } = await api(`/reviews/${crState.reviewId}/compose`);
+    await api(`/reviews/${crState.reviewId}`, 'PUT', { status: 'submitted' });
+    return prompt;
+  } catch (e) {
+    if (typeof window.toast === 'function') window.toast('Failed to compose review: ' + e.message, { type: 'error' });
+    return null;
+  }
 }
 
 // Main "Send" button — auto-detects best session (existing project session or new)