@iceinvein/agent-skills 0.1.30 → 0.1.31

package/package.json

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

package/skills/index.json

@@ -197,7 +197,7 @@
     "name": "magpie",
     "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 onto PATH via the skill's postinstall step. Use when the user asks to review a GitHub pull request.",
     "type": "prompt",
-    "version": "0.4.0"
+    "version": "0.4.1"
   },
   {
     "name": "module-secret-auditor",

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

@@ -109,6 +109,61 @@ test('formatPostBody omits the suggestion block when no suggestion is set', () =
   expect(body).not.toContain('```suggestion')
 })
 
+test('formatInlineBody extracts an embedded fenced code block out of the suggestion body', () => {
+  const body = formatInlineBody({
+    ...findingA,
+    line: 12,
+    suggestion: {
+      body: 'Switch to the inference profile and widen IAM:\n\n```hcl\nstatement {\n  effect = "Allow"\n}\n```\n\nAt minimum, log the failure.',
+      startLine: 12,
+      endLine: 12,
+    },
+  } as never)
+  // Prose appears as ordinary markdown, not inside the suggestion fence.
+  expect(body).toContain('Switch to the inference profile and widen IAM:')
+  expect(body).toContain('At minimum, log the failure.')
+  // The suggestion body contains only the extracted code, not the prose.
+  expect(body).toContain('```suggestion\nstatement {\n  effect = "Allow"\n}\n```')
+  // The hidden finding marker stays inside an HTML comment, not a code block.
+  const markerIdx = body.indexOf('<!-- magpie:finding')
+  expect(markerIdx).toBeGreaterThan(-1)
+  // After the marker the body must be balanced; no dangling open fence above it.
+  const beforeMarker = body.slice(0, markerIdx)
+  const fenceCount = (beforeMarker.match(/```/g) ?? []).length
+  expect(fenceCount % 2).toBe(0)
+})
+
+test('formatInlineBody handles a fenced suggestion that contains no surrounding prose', () => {
+  const body = formatInlineBody({
+    ...findingA,
+    line: 12,
+    suggestion: {
+      body: '```ts\nconst safe = true;\n```',
+      startLine: 12,
+      endLine: 12,
+    },
+  } as never)
+  expect(body).toContain('```suggestion\nconst safe = true;\n```')
+  // No stray, unterminated fence above the magpie marker.
+  const markerIdx = body.indexOf('<!-- magpie:finding')
+  const beforeMarker = body.slice(0, markerIdx)
+  expect((beforeMarker.match(/```/g) ?? []).length % 2).toBe(0)
+})
+
+test('buildSuggestion uses a longer outer fence when the code body contains triple backticks', () => {
+  const body = formatInlineBody({
+    ...findingA,
+    line: 12,
+    suggestion: {
+      body: 'const md = "```inline```"',
+      startLine: 12,
+      endLine: 12,
+    },
+  } as never)
+  // 3 backticks in body → outer fence must be at least 4 to avoid premature close.
+  expect(body).toContain('````suggestion\nconst md = "```inline```"\n````')
+})
+
 test('runPost rejects when pr.json is missing', async () => {
   const outcome = await runPost({ runDir, findingIds: ['anything'] })
   expect(outcome.ok).toBe(false)

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

@@ -116,10 +116,57 @@ function buildRiskParts(f: ReviewFinding): string[] {
   ]
 }
 
-function buildSuggestionBlock(f: ReviewFinding): string | null {
-  const body = f.suggestion?.body.trim()
-  if (!body) return null
-  return ['```suggestion', body, '```'].join('\n')
+function maxBacktickRun(s: string): number {
+  let max = 0
+  for (const m of s.matchAll(/`+/g)) {
+    if (m[0].length > max) max = m[0].length
+  }
+  return max
+}
+
+/**
+ * Pull a single fenced code block out of a suggestion body, returning its code
+ * plus any surrounding prose. LLMs sometimes wrap the real replacement in
+ * ```lang ... ``` with explanatory text around it; if that nested fence leaks
+ * into the outer ```suggestion``` wrapper it breaks GitHub's renderer and
+ * causes downstream markdown (e.g. the magpie:finding HTML marker) to spill
+ * into a stray code block. We hoist the inner code out so the suggestion body
+ * contains only what should be committed.
+ */
+function splitEmbeddedFence(
+  body: string,
+): { code: string; preamble: string; postamble: string } | null {
+  const re = /(?:^|\n)(`{3,})[^\n`]*\n([\s\S]*?)\n\1(?=\n|$)/
+  const match = body.match(re)
+  if (match?.index === undefined) return null
+  const code = match[2] ?? ''
+  const matchStart = match.index + (body[match.index] === '\n' ? 1 : 0)
+  const matchEnd = matchStart + match[0].length - (body[match.index] === '\n' ? 1 : 0)
+  return {
+    code,
+    preamble: body.slice(0, matchStart).trim(),
+    postamble: body.slice(matchEnd).trim(),
+  }
+}
+
+type SuggestionParts = {
+  block: string | null
+  preamble: string | null
+  postamble: string | null
+}
+
+function buildSuggestion(f: ReviewFinding): SuggestionParts {
+  const raw = f.suggestion?.body.trim()
+  if (!raw) return { block: null, preamble: null, postamble: null }
+  const split = splitEmbeddedFence(raw)
+  const code = split?.code ?? raw
+  const fenceLen = Math.max(3, maxBacktickRun(code) + 1)
+  const fence = '`'.repeat(fenceLen)
+  return {
+    block: `${fence}suggestion\n${code}\n${fence}`,
+    preamble: split?.preamble || null,
+    postamble: split?.postamble || null,
+  }
 }
 
 function buildFindingMarker(f: ReviewFinding): string {
@@ -150,7 +197,7 @@ export function formatInlineBody(f: ReviewFinding): string {
   const label = SEVERITY_LABEL[f.severity]
   const focus = formatFocus(f)
   const metaLine = buildMetaLine([...buildRiskParts(f), focus ? `Focus · ${focus}` : null])
-  const suggestion = buildSuggestionBlock(f)
+  const { block: suggestion, preamble: sugPre, postamble: sugPost } = buildSuggestion(f)
   const sections = formatFindingDescriptionMarkdown(f.description)
 
   return joinBlock([
@@ -159,8 +206,12 @@ export function formatInlineBody(f: ReviewFinding): string {
     metaLine,
     '',
     sections,
+    sugPre ? '' : null,
+    sugPre,
     suggestion ? '' : null,
     suggestion,
+    sugPost ? '' : null,
+    sugPost,
     '',
     buildFindingMarker(f),
   ])
@@ -181,7 +232,7 @@ export function formatConversationBody(f: ReviewFinding): string {
     ...buildRiskParts(f),
   ])
   const sections = formatFindingDescriptionMarkdown(f.description)
-  const suggestion = buildSuggestionBlock(f)
+  const { block: suggestion, preamble: sugPre, postamble: sugPost } = buildSuggestion(f)
 
   return joinBlock([
     `### ${icon} ${label}: ${f.title}`,
@@ -189,8 +240,12 @@ export function formatConversationBody(f: ReviewFinding): string {
     metaLine,
     '',
     sections,
+    sugPre ? '' : null,
+    sugPre,
     suggestion ? '' : null,
     suggestion,
+    sugPost ? '' : null,
+    sugPost,
     '',
     buildFindingMarker(f),
   ])

package/skills/magpie/skill.json

@@ -1,6 +1,6 @@
 {
   "name": "magpie",
-  "version": "0.4.0",
+  "version": "0.4.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 onto PATH via the skill's postinstall step. Use when the user asks to review a GitHub pull request.",
   "author": "iceinvein",
   "type": "prompt",