@iceinvein/agent-skills 0.1.24 → 0.1.26

package/skills/magpie/scripts/render-cmd.ts

@@ -99,7 +99,30 @@ export async function runRender(runDir: string, page: 'progress' | 'findings'):
     parseFinding(raw),
   )
   const postStatus = await readJson<PostStatusMap>(join(runDir, 'post-status.json'), {})
+  const prJson = await readJson<Record<string, unknown>>(join(runDir, 'pr.json'), {})
+  const prNumber = Number(prJson.number ?? 0)
+  const pr =
+    prNumber > 0
+      ? {
+          number: prNumber,
+          branch: String(prJson.headRefName ?? '?'),
+          headSha: String(prJson.headRefOid ?? '?'),
+        }
+      : undefined
+  const filesArray = Array.isArray(prJson.files) ? (prJson.files as unknown[]) : []
+  const files = filesArray.map((f) => {
+    const entry = f as Record<string, unknown>
+    return {
+      path: String(entry.path ?? ''),
+      additions: Number(entry.additions ?? 0),
+      deletions: Number(entry.deletions ?? 0),
+    }
+  })
+  const diff = await readFile(join(runDir, 'diff.patch'), 'utf8').catch(() => '')
   const outPath = await nextVersionedPath(screenDir, 'findings')
-  await renderFindingsToDisk({ findings, postStatus, runId: basename(runDir) }, outPath)
+  await renderFindingsToDisk(
+    { findings, postStatus, runId: basename(runDir), pr, files, diff },
+    outPath,
+  )
   return 0
 }

package/skills/magpie/scripts/render-diff.ts

@@ -0,0 +1,125 @@
+import { buildPairedLines, type DiffHunk, type DiffLine, type PairedLine } from './diff-utils.ts'
+import { renderAnnotation } from './render-annotation.ts'
+import type { PostStatusEntry, PostStatusMap, ReviewFinding } from './types.ts'
+
+function esc(s: string): string {
+  return s.replace(/[&<>"']/g, (c) => {
+    const m: Record<string, string> = {
+      '&': '&amp;',
+      '<': '&lt;',
+      '>': '&gt;',
+      '"': '&quot;',
+      "'": '&#39;',
+    }
+    return m[c] ?? c
+  })
+}
+
+export type RenderDiffInput = {
+  hunks: DiffHunk[]
+  findings: ReviewFinding[]
+  postStatus: PostStatusMap
+  selectedIds: Set<string>
+}
+
+function isPosted(status: PostStatusEntry | undefined): boolean {
+  return status === 'posted'
+}
+
+function failedFrom(status: PostStatusEntry | undefined): { message: string } | undefined {
+  if (status && typeof status === 'object' && status.status === 'failed') {
+    return { message: status.message }
+  }
+  return undefined
+}
+
+function lineRow(line: DiffLine): string {
+  const cls = line.type === 'added' ? 'added' : line.type === 'removed' ? 'removed' : 'context'
+  const lineNo = line.type === 'removed' ? line.oldLineNo : line.newLineNo
+  const sign = line.type === 'added' ? '+' : line.type === 'removed' ? '-' : ' '
+  return `<div class="diff-row ${cls}"><span class="gutter">${lineNo ?? ''}</span><span class="sign">${sign}</span><span class="content">${esc(line.content)}</span></div>`
+}
+
+function findingsByLine(findings: ReviewFinding[]): Map<number, ReviewFinding[]> {
+  const m = new Map<number, ReviewFinding[]>()
+  for (const f of findings) {
+    if (f.line == null) continue
+    const arr = m.get(f.line) ?? []
+    arr.push(f)
+    m.set(f.line, arr)
+  }
+  return m
+}
+
+export function renderUnifiedDiff(input: RenderDiffInput): string {
+  const { hunks, findings, postStatus, selectedIds } = input
+  if (hunks.length === 0) return `<div class="diff-empty">No changes</div>`
+  const byLine = findingsByLine(findings)
+  const parts: string[] = []
+  hunks.forEach((h, hi) => {
+    if (hi > 0) parts.push(`<div class="diff-hunk-sep">⋯</div>`)
+    for (const line of h.lines) {
+      parts.push(lineRow(line))
+      const targetLine = line.newLineNo ?? null
+      if (targetLine != null) {
+        const fs = byLine.get(targetLine)
+        if (fs) {
+          for (const f of fs) {
+            parts.push(
+              renderAnnotation(f, {
+                checked: selectedIds.has(f.id),
+                posted: isPosted(postStatus[f.id]),
+                failed: failedFrom(postStatus[f.id]),
+                asCard: false,
+              }),
+            )
+          }
+        }
+      }
+    }
+  })
+  return parts.join('\n')
+}
+
+function pairedRow(pair: PairedLine): string {
+  const cellL =
+    pair.left == null
+      ? `<div class="diff-cell empty"></div>`
+      : `<div class="diff-cell ${pair.left.type}"><span class="gutter">${pair.left.oldLineNo ?? pair.left.newLineNo ?? ''}</span><span class="sign">${pair.left.type === 'removed' ? '-' : ' '}</span><span class="content">${esc(pair.left.content)}</span></div>`
+  const cellR =
+    pair.right == null
+      ? `<div class="diff-cell empty"></div>`
+      : `<div class="diff-cell ${pair.right.type}"><span class="gutter">${pair.right.newLineNo ?? pair.right.oldLineNo ?? ''}</span><span class="sign">${pair.right.type === 'added' ? '+' : ' '}</span><span class="content">${esc(pair.right.content)}</span></div>`
+  return `<div class="diff-row split">${cellL}${cellR}</div>`
+}
+
+export function renderSplitDiff(input: RenderDiffInput): string {
+  const { hunks, findings, postStatus, selectedIds } = input
+  if (hunks.length === 0) return `<div class="diff-empty">No changes</div>`
+  const byLine = findingsByLine(findings)
+  const parts: string[] = []
+  hunks.forEach((h, hi) => {
+    if (hi > 0) parts.push(`<div class="diff-hunk-sep">⋯</div>`)
+    const pairs = buildPairedLines([h])
+    for (const pair of pairs) {
+      parts.push(pairedRow(pair))
+      const target = pair.right?.newLineNo ?? null
+      if (target != null) {
+        const fs = byLine.get(target)
+        if (fs) {
+          for (const f of fs) {
+            parts.push(
+              renderAnnotation(f, {
+                checked: selectedIds.has(f.id),
+                posted: isPosted(postStatus[f.id]),
+                failed: failedFrom(postStatus[f.id]),
+                asCard: false,
+              }),
+            )
+          }
+        }
+      }
+    }
+  })
+  return parts.join('\n')
+}

package/skills/magpie/scripts/render-file-tree.ts

@@ -0,0 +1,86 @@
+import {
+  buildTree,
+  collapseTree,
+  countDirFindings,
+  type DirNode,
+  findingCountsBySeverity,
+} from './file-tree.ts'
+import type { PrFileEntry, ReviewFinding } from './types.ts'
+
+function esc(s: string): string {
+  return s.replace(/[&<>"']/g, (c) => {
+    const m: Record<string, string> = {
+      '&': '&amp;',
+      '<': '&lt;',
+      '>': '&gt;',
+      '"': '&quot;',
+      "'": '&#39;',
+    }
+    return m[c] ?? c
+  })
+}
+
+function pipsHtml(findings: ReviewFinding[], path: string): string {
+  const counts = findingCountsBySeverity(findings, path)
+  if (counts.length === 0) return ''
+  return counts
+    .map(
+      (c) =>
+        `<span class="sev-pip ${c.severity}" aria-label="${c.count} ${c.severity}">${c.count}</span>`,
+    )
+    .join('')
+}
+
+function deltaHtml(f: PrFileEntry): string {
+  return `<span class="delta" aria-label="${f.additions} additions, ${f.deletions} deletions"><span class="add">+${f.additions}</span> <span class="del">-${f.deletions}</span></span>`
+}
+
+function renderFiles(files: PrFileEntry[], findings: ReviewFinding[], depth: number): string {
+  return [...files]
+    .sort((a, b) => a.path.localeCompare(b.path))
+    .map((file) => {
+      const fileName = file.path.split('/').pop() ?? file.path
+      return `<button type="button" class="tree-file" data-action="select-file" data-file="${esc(file.path)}" style="padding-left:${depth * 12 + 12}px">
+        <span class="name">${esc(fileName)}</span>
+        ${pipsHtml(findings, file.path)}
+        ${deltaHtml(file)}
+      </button>`
+    })
+    .join('')
+}
+
+function renderDirs(dirs: Map<string, DirNode>, findings: ReviewFinding[], depth: number): string {
+  return [...dirs.values()]
+    .sort((a, b) => a.name.localeCompare(b.name))
+    .map((dir) => {
+      const totalCount = countDirFindings(findings, dir)
+      const countBadge = totalCount > 0 ? `<span class="dir-count">${totalCount}</span>` : ''
+      return `<details class="tree-dir" open data-dir="${esc(dir.fullPath)}">
+        <summary style="padding-left:${depth * 12 + 6}px"><span class="chev"></span><span class="name">${esc(dir.name)}</span>${countBadge}</summary>
+        ${renderDirs(dir.dirs, findings, depth + 1)}
+        ${renderFiles(dir.files, findings, depth + 1)}
+      </details>`
+    })
+    .join('')
+}
+
+export type RenderFileTreeInput = {
+  files: PrFileEntry[]
+  findings: ReviewFinding[]
+  selectedFile?: string | null
+}
+
+export function renderFileTree(input: RenderFileTreeInput): string {
+  const tree = collapseTree(buildTree(input.files))
+  const generalCount = input.findings.filter((f) => !f.file).length
+  const overviewBadge = generalCount > 0 ? `<span class="dir-count">${generalCount}</span>` : ''
+  return `<aside class="file-rail" data-role="file-tree">
+    <button type="button" class="tree-overview" data-action="select-file" data-file="">
+      <span class="name">Overview</span>${overviewBadge}
+    </button>
+    <div class="tree-body">
+      ${renderDirs(tree.dirs, input.findings, 0)}
+      ${renderFiles(tree.files, input.findings, 0)}
+    </div>
+  </aside>`
+}