create-walle 0.9.21 → 0.9.23

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

@@ -29,6 +29,13 @@ function jsonResponse(res, code, data) {
   res.end(body);
 }
 
+function reviewErrorPayload(err) {
+  const payload = { error: err.message || String(err) };
+  if (err.code) payload.code = err.code;
+  if (Array.isArray(err.candidates)) payload.candidates = err.candidates;
+  return payload;
+}
+
 function readBody(req, limit = 1024 * 1024) {
   return new Promise((resolve, reject) => {
     let body = '';
@@ -111,18 +118,27 @@ function sanitizeReviewCommentUpdate(body) {
 
 // --- Change Detection for Badge Polling ---
 // Track last known diff stats per project to detect changes
-const changeTracker = new Map(); // projectPath -> { files: [...], hash: string }
+const changeTracker = new Map(); // projectPath -> { files: [...], hash: string, checkedAt: number }
 
 function computeStatsHash(files) {
   return files.map(f => `${f.path}:${f.additions}:${f.deletions}`).sort().join('|');
 }
 
-async function checkForChanges(projectPath) {
+async function checkForChanges(projectPath, options = {}) {
   try {
-    const files = await gitUtils.getDiffStat(projectPath);
-    const hash = computeStatsHash(files);
+    const now = Date.now();
+    const ttlMs = Math.max(0, Number(options.ttlMs || 0));
     const prev = changeTracker.get(projectPath);
-    changeTracker.set(projectPath, { files, hash });
+    if (!options.force && ttlMs > 0 && prev && prev.checkedAt && now - prev.checkedAt < ttlMs) {
+      return { changed: false, fileCount: prev.files.length, files: prev.files, cached: true };
+    }
+    // Use the default review base (all branch work vs main, fallback all-uncommitted) so the
+    // chooser badge matches exactly what opening the project shows. Previously this counted
+    // only unstaged working-tree changes, which disagreed with the diff view whenever work
+    // was staged or committed on a feature branch.
+    const { files } = await gitUtils.getDefaultDiffStat(projectPath);
+    const hash = computeStatsHash(files);
+    changeTracker.set(projectPath, { files, hash, checkedAt: Date.now() });
     const changed = !prev || prev.hash !== hash;
     return { changed, fileCount: files.length, files };
   } catch {
@@ -130,6 +146,30 @@ async function checkForChanges(projectPath) {
   }
 }
 
+// Resolve a COMPARE base sentinel to a unified diff (file list). Sentinels:
+//   ''            working tree vs HEAD (unstaged only)
+//   '--staged'    staged changes
+//   '--uncommitted' (or 'HEAD')  all uncommitted = staged + unstaged
+//   '--vs-main'   all branch work: working tree vs merge-base(main, HEAD)
+//   <sha>         a single commit's parent..commit diff
+async function diffForBase(project, base) {
+  if (base === '--staged') return gitUtils.getStagedDiff(project);
+  if (base === '--uncommitted' || base === 'HEAD') return gitUtils.getDiffVsRef(project, 'HEAD');
+  if (base === '--vs-main') {
+    const def = await gitUtils.getDefaultReviewBase(project);
+    return gitUtils.getDiffVsRef(project, def.kind === 'vs-main' ? def.mergeBase : 'HEAD');
+  }
+  return gitUtils.getFullDiff(project, base || undefined);
+}
+async function diffStatForBase(project, base) {
+  if (base === '--uncommitted' || base === 'HEAD') return gitUtils.getDiffStatVsRef(project, 'HEAD');
+  if (base === '--vs-main') {
+    const def = await gitUtils.getDefaultReviewBase(project);
+    return gitUtils.getDiffStatVsRef(project, def.kind === 'vs-main' ? def.mergeBase : 'HEAD');
+  }
+  return gitUtils.getDiffStat(project, base || undefined);
+}
+
 // --- Route Handler ---
 function handleReviewApi(req, res, url) {
   const p = url.pathname;
@@ -140,17 +180,20 @@ function handleReviewApi(req, res, url) {
     try {
       const filePath = url.searchParams.get('path');
       const line = url.searchParams.get('line') || 1;
-      const document = documentReview.readDocument(filePath, { line });
+      const document = documentReview.readDocument(filePath, { line, cwd: url.searchParams.get('cwd') || '' });
       return jsonResponse(res, 200, { document });
     } catch (e) {
-      return jsonResponse(res, e.statusCode || 500, { error: e.message });
+      return jsonResponse(res, e.statusCode || 500, reviewErrorPayload(e));
     }
   }
 
   // POST /api/reviews/document-review - create/reuse a review record for one document
   if (p === '/api/reviews/document-review' && m === 'POST') {
     readBody(req).then(body => {
-      const document = documentReview.readDocument(body.path, { line: body.line || 1 });
+      const document = documentReview.readDocument(body.path, {
+        line: body.line || 1,
+        cwd: body.cwd || '',
+      });
       const review = db.listReviews({
         project_path: document.projectRoot,
         review_type: 'doc',
@@ -175,7 +218,7 @@ function handleReviewApi(req, res, url) {
         review: db.getReview(id),
         document,
       });
-    }).catch(e => jsonResponse(res, e.statusCode || 400, { error: e.message }));
+    }).catch(e => jsonResponse(res, e.statusCode || 400, reviewErrorPayload(e)));
     return true;
   }
 
@@ -185,10 +228,8 @@ function handleReviewApi(req, res, url) {
     const base = url.searchParams.get('base') || '';
     if (!project) return jsonResponse(res, 400, { error: 'project required' });
     if (!isValidProjectPath(project)) return jsonResponse(res, 403, { error: 'Invalid project path' });
-    const diffFn = base === '--staged'
-      ? gitUtils.getStagedDiff(project)
-      : gitUtils.getFullDiff(project, base || undefined);
-    diffFn.then(files => jsonResponse(res, 200, { files }))
+    diffForBase(project, base)
+      .then(files => jsonResponse(res, 200, { files }))
       .catch(e => jsonResponse(res, 500, { error: e.message }));
     return true;
   }
@@ -199,12 +240,61 @@ function handleReviewApi(req, res, url) {
     if (!project) return jsonResponse(res, 400, { error: 'project required' });
     if (!isValidProjectPath(project)) return jsonResponse(res, 403, { error: 'Invalid project path' });
     const base = url.searchParams.get('base') || '';
-    gitUtils.getDiffStat(project, base || undefined)
+    diffStatForBase(project, base)
       .then(files => jsonResponse(res, 200, { files }))
       .catch(e => jsonResponse(res, 500, { error: e.message }));
     return true;
   }
 
+  // GET /api/reviews/base-info?project=... — the default review base + per-base file counts,
+  // so the client can default the COMPARE selector to "all branch work vs main" and label
+  // each option with its count.
+  if (p === '/api/reviews/base-info' && m === 'GET') {
+    const project = url.searchParams.get('project');
+    if (!project) return jsonResponse(res, 400, { error: 'project required' });
+    if (!isValidProjectPath(project)) return jsonResponse(res, 403, { error: 'Invalid project path' });
+    gitUtils.getDefaultReviewBase(project).then(async (def) => {
+      const [vsMain, uncommitted, working, staged] = await Promise.all([
+        def.mergeBase ? gitUtils.getDiffStatVsRef(project, def.mergeBase).catch(() => []) : Promise.resolve([]),
+        gitUtils.getDiffStatVsRef(project, 'HEAD').catch(() => []),
+        gitUtils.getDiffStat(project).catch(() => []),
+        gitUtils.getDiffStat(project, '--staged').catch(() => []),
+      ]);
+      jsonResponse(res, 200, {
+        defaultBase: def.sentinel,
+        kind: def.kind,
+        mainBranch: def.mainBranch,
+        mergeBase: def.mergeBase,
+        counts: {
+          'vs-main': vsMain.length,
+          'uncommitted': uncommitted.length,
+          'working': working.length,
+          'staged': staged.length,
+        },
+      });
+    }).catch(e => jsonResponse(res, 500, { error: e.message }));
+    return true;
+  }
+
+  // GET /api/reviews/file-lines?project=&path=&from=&to=&ref= — fetch the "new"-side file
+  // lines in [from,to] so the diff view can expand context hidden between hunks.
+  if (p === '/api/reviews/file-lines' && m === 'GET') {
+    const project = url.searchParams.get('project');
+    const relPath = url.searchParams.get('path');
+    if (!project || !relPath) return jsonResponse(res, 400, { error: 'project and path required' });
+    if (!isValidProjectPath(project)) return jsonResponse(res, 403, { error: 'Invalid project path' });
+    const from = Math.max(1, parseInt(url.searchParams.get('from') || '1', 10));
+    const toRaw = parseInt(url.searchParams.get('to') || '0', 10);
+    const ref = url.searchParams.get('ref') || '';
+    gitUtils.getFileAtRef(project, relPath, ref).then(content => {
+      const all = String(content).split('\n');
+      const to = toRaw > 0 ? Math.min(toRaw, all.length) : all.length;
+      const lines = all.slice(from - 1, to).map((text, i) => ({ num: from + i, text }));
+      jsonResponse(res, 200, { lines, total: all.length });
+    }).catch(e => jsonResponse(res, 500, { error: e.message }));
+    return true;
+  }
+
   // GET /api/reviews/commits?project=...
   if (p === '/api/reviews/commits' && m === 'GET') {
     const project = url.searchParams.get('project');
@@ -244,7 +334,11 @@ function handleReviewApi(req, res, url) {
     const getTrackedProjects = module.exports._getTrackedProjects;
     if (!getTrackedProjects) return jsonResponse(res, 500, { error: 'tracker not initialized' });
     getTrackedProjects()
-      .then(projects => jsonResponse(res, 200, { projects }))
+      .then(result => {
+        if (Array.isArray(result)) return jsonResponse(res, 200, { projects: result });
+        const projects = Array.isArray(result && result.projects) ? result.projects : [];
+        jsonResponse(res, 200, { projects, scan: result && result.scan ? result.scan : null });
+      })
       .catch(e => jsonResponse(res, 500, { error: e.message }));
     return true;
   }