@iceinvein/agent-skills 0.1.26 → 0.1.27

package/README.md

@@ -157,6 +157,10 @@ The CLI fetches skills from GitHub and installs them into the right locations fo
 
 Skills install to the **current project** by default. Use `-g` to install to your **home directory** so the skill is available everywhere. A `.agent-skills.lock` file tracks installations for update and remove.
 
+## Contributing
+
+- [Releasing](docs/RELEASING.md) — how versions are bumped, tagged, and published to npm
+
 ## License
 
 MIT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iceinvein/agent-skills",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "description": "Install agent skills into AI coding tools",
   "author": "iceinvein",
   "license": "MIT",

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

@@ -1,9 +1,33 @@
 import { createHash } from 'node:crypto'
 import { appendFile, readFile, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
+import { parseUnifiedDiffToHunks, splitDiffByFile } from './diff-utils.ts'
 import { formatFindingDescriptionMarkdown } from './finding-description.ts'
 import { type FocusId, parseFinding, type ReviewFinding, type Severity } from './types.ts'
 
+/**
+ * Build a per-file set of RIGHT-side line numbers that GitHub's PR Reviews API
+ * will accept as inline-comment anchors (added or context lines within hunks).
+ * Returns an empty map when the diff is empty/unavailable.
+ */
+function buildValidRightLines(diff: string): Map<string, Set<number>> {
+  const result = new Map<string, Set<number>>()
+  if (!diff) return result
+  for (const [file, chunk] of splitDiffByFile(diff)) {
+    const hunks = parseUnifiedDiffToHunks(chunk)
+    const set = new Set<number>()
+    for (const h of hunks) {
+      for (const l of h.lines) {
+        if (l.newLineNo != null && (l.type === 'added' || l.type === 'context')) {
+          set.add(l.newLineNo)
+        }
+      }
+    }
+    result.set(file, set)
+  }
+  return result
+}
+
 export type PostInput = {
   runDir: string
   findingIds: string[]
@@ -289,6 +313,12 @@ export type PostReviewInput = {
   findingIds: string[]
   prNumber: number
   headSha: string
+  /**
+   * Target repo as "owner/name". When omitted, the `{owner}/{repo}` gh
+   * placeholder is used, which resolves from the gh process's cwd. The server
+   * always passes this explicitly so the call does not depend on cwd.
+   */
+  repo?: string
   reviewBody?: string
   ghBin?: string
   dryRun?: boolean
@@ -364,25 +394,59 @@ export async function postFindingsAsReview(input: PostReviewInput): Promise<Post
     // findings.final.json missing or unparseable; strictById stays empty
   }
 
-  // Partition into inline (has file + line) and unplaced.
+  // Build the set of (file, RIGHT-side line) pairs GitHub will accept as inline
+  // anchors. Inline comments on lines outside this set get 422'd and would
+  // poison the whole batch; instead we demote them to the review body.
+  let validRightLines: Map<string, Set<number>> | null = null
+  try {
+    const diff = await readFile(join(input.runDir, 'diff.patch'), 'utf8')
+    validRightLines = buildValidRightLines(diff)
+  } catch {
+    // diff.patch absent (archived/legacy runs); skip validation and trust caller.
+    validRightLines = null
+  }
+
+  // Partition into inline (has file + line in diff) and unplaced (everything else).
   type InlineComment = { path: string; line: number; side: 'RIGHT'; body: string }
   const inlineComments: InlineComment[] = []
   const unplacedBodies: string[] = []
+  const demotedIds: string[] = []
 
   for (const id of input.findingIds) {
-    const f = byId.get(id)
-    if (!f) continue
     const strict = strictById.get(id)
-    if (f.line != null && f.file != null) {
+    const f =
+      byId.get(id) ??
+      (strict
+        ? {
+            id: strict.id,
+            file: strict.file,
+            line: strict.line,
+            title: strict.title,
+            description: strict.description,
+          }
+        : null)
+    if (!f) continue
+    const lineInDiff =
+      f.line != null &&
+      f.file != null &&
+      (validRightLines == null || validRightLines.get(f.file)?.has(f.line) === true)
+    if (lineInDiff) {
       const body = strict
         ? formatInlineBody(strict)
         : formatFindingDescriptionMarkdown(f.description)
       inlineComments.push({
-        path: f.file,
-        line: f.line,
+        path: f.file as string,
+        line: f.line as number,
         side: 'RIGHT',
         body,
       })
+    } else if (f.line != null && f.file != null) {
+      demotedIds.push(id)
+      const anchor = `\`${f.file}:${f.line}\` (anchor not in PR diff, posted in review body)`
+      const inner = strict
+        ? formatConversationBody(strict)
+        : `**${f.title}**\n\n${formatFindingDescriptionMarkdown(f.description)}`
+      unplacedBodies.push(`${anchor}\n\n${inner}`)
     } else {
       const body = strict
         ? formatConversationBody(strict)
@@ -406,20 +470,30 @@ export async function postFindingsAsReview(input: PostReviewInput): Promise<Post
   }
   const payload = JSON.stringify(payloadObj)
 
+  const repoSlug = input.repo ?? '{owner}/{repo}'
   const command = [
     bin,
     'api',
-    `repos/{owner}/{repo}/pulls/${input.prNumber}/reviews`,
+    `repos/${repoSlug}/pulls/${input.prNumber}/reviews`,
     '--method',
     'POST',
     '--input',
     '-',
   ]
 
+  const demoted = new Set(demotedIds)
+  const buildCommentResults = (status: 'posted' | 'failed', message?: string) =>
+    input.findingIds.map((id) => {
+      const base: PostReviewCommentResult = { id, status }
+      const m =
+        message ?? (demoted.has(id) ? 'anchor not in PR diff, posted in review body' : undefined)
+      return m ? { ...base, message: m } : base
+    })
+
   if (input.dryRun) {
     return {
       reviewId: null,
-      comments: input.findingIds.map((id) => ({ id, status: 'posted' as const })),
+      comments: buildCommentResults('posted'),
       command,
       payload,
     }
@@ -444,7 +518,7 @@ export async function postFindingsAsReview(input: PostReviewInput): Promise<Post
     const msg = (err as Error).message ?? `cannot spawn ${bin}`
     return {
       reviewId: null,
-      comments: input.findingIds.map((id) => ({ id, status: 'failed' as const, message: msg })),
+      comments: buildCommentResults('failed', msg),
       command,
       payload,
     }
@@ -453,11 +527,7 @@ export async function postFindingsAsReview(input: PostReviewInput): Promise<Post
   if (exit !== 0) {
     return {
       reviewId: null,
-      comments: input.findingIds.map((id) => ({
-        id,
-        status: 'failed' as const,
-        message: stderrText.trim(),
-      })),
+      comments: buildCommentResults('failed', stderrText.trim()),
       command,
       payload,
     }
@@ -476,7 +546,7 @@ export async function postFindingsAsReview(input: PostReviewInput): Promise<Post
 
   return {
     reviewId,
-    comments: input.findingIds.map((id) => ({ id, status: 'posted' as const })),
+    comments: buildCommentResults('posted'),
     command,
     payload,
   }

package/skills/magpie/scripts/refresh.ts

@@ -1,7 +1,7 @@
-import { readdir, unlink } from 'node:fs/promises'
+import { readdir, readFile, unlink } from 'node:fs/promises'
 import { basename, join } from 'node:path'
 import { type PostStatusMap, renderFindingsToDisk } from './render-findings.ts'
-import { parseFinding } from './types.ts'
+import { type PrFileEntry, parseFinding } from './types.ts'
 
 export type RefreshResult = {
   refreshed: boolean
@@ -60,6 +60,7 @@ export async function refreshFindings(runDir: string): Promise<RefreshResult> {
   }
 
   let pr: { number: number; branch: string; headSha: string } | undefined
+  let files: PrFileEntry[] = []
   try {
     const prJson = (await Bun.file(join(runDir, 'pr.json')).json()) as Record<string, unknown>
     const prNumber = Number(prJson.number ?? 0)
@@ -70,12 +71,23 @@ export async function refreshFindings(runDir: string): Promise<RefreshResult> {
         headSha: String(prJson.headRefOid ?? '?'),
       }
     }
+    const filesArray = Array.isArray(prJson.files) ? (prJson.files as unknown[]) : []
+    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),
+      }
+    })
   } catch {
     // optional file; archived runs may not include pr.json
   }
 
+  const diff = await readFile(join(runDir, 'diff.patch'), 'utf8').catch(() => '')
+
   await renderFindingsToDisk(
-    { findings, postStatus, runId: basename(runDir), pr },
+    { findings, postStatus, runId: basename(runDir), pr, files, diff },
     join(screenDir, 'findings.html'),
   )
 

package/skills/magpie/scripts/server.ts

@@ -1,6 +1,6 @@
 import { appendFile, readdir, readFile, stat, unlink, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
-import { postFindingsAsReview } from './post-cmd.ts'
+import { parseRepoFromUrl, postFindingsAsReview } from './post-cmd.ts'
 
 export type ServerHandle = {
   url: string
@@ -130,12 +130,23 @@ export async function startServer(input: StartServerInput): Promise<ServerHandle
           const prJson = JSON.parse(await readFile(join(runDir, 'pr.json'), 'utf8')) as {
             number: number
             headRefOid: string
+            url?: string
+          }
+          const repo = prJson.url ? parseRepoFromUrl(prJson.url) : null
+          if (!repo) {
+            return new Response(
+              JSON.stringify({
+                error: 'Cannot resolve target repo from pr.json (missing or unparseable url).',
+              }),
+              { status: 500, headers: { 'content-type': 'application/json' } },
+            )
           }
           const result = await postFindingsAsReview({
             runDir,
             findingIds: ids,
             prNumber: prJson.number,
             headSha: prJson.headRefOid,
+            repo,
             dryRun: process.env.MAGPIE_DRY_RUN_POST === '1',
           })
           const status =

package/skills/magpie/skill.json

@@ -1,6 +1,6 @@
 {
   "name": "magpie",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Interactive PR review pipeline. Runs five parallel specialist subagents (security, bugs, performance, code-smells, architecture), dedupes findings, applies a critic rubric, peer-reviews via codex exec, and serves an interactive HTML report for selecting findings to post via gh. Bundles a Bun CLI installed separately via the skill's install.sh. Use when the user asks to review a GitHub pull request.",
   "author": "iceinvein",
   "type": "prompt",