md-annotator 0.6.0 → 0.8.0

package/client/src/utils/parser.js

@@ -12,6 +12,12 @@ const HTML_VOID_TAGS = new Set([
   'link', 'meta', 'param', 'source', 'track', 'wbr'
 ])
 
+// HTML tags that can contain markdown content (e.g. <div align="center">)
+const HTML_MIXED_CONTENT_TAGS = new Set([
+  'div', 'section', 'details', 'aside', 'article', 'figure', 'figcaption',
+  'header', 'footer', 'main', 'nav', 'center'
+])
+
 /**
  * Simplified markdown parser that splits content into linear blocks.
  * Designed for predictable text-anchoring (not AST-based).
@@ -215,12 +221,56 @@ export function parseMarkdownToBlocks(markdown) {
         flush()
         const tagName = tagMatch[1].toLowerCase()
         const htmlStartLine = currentLineNum
-        const htmlLines = [line]
 
         const isSelfClosing = trimmed.endsWith('/>')
         const isVoid = HTML_VOID_TAGS.has(tagName)
         const hasSameLineClose = new RegExp(`</${tagName}\\s*>`, 'i').test(trimmed)
 
+        if (!isSelfClosing && !isVoid && !hasSameLineClose && HTML_MIXED_CONTENT_TAGS.has(tagName)) {
+          // Mixed content wrapper: split into open tag + inner markdown + close tag
+          const closePattern = new RegExp(`</${tagName}\\s*>`, 'i')
+          const openPattern = new RegExp(`<${tagName}[\\s>/]`, 'i')
+          const innerLines = []
+          let closingLine = null
+          let depth = 1
+          i++
+          while (i < lines.length) {
+            if (openPattern.test(lines[i].trim())) { depth++ }
+            if (closePattern.test(lines[i].trim())) {
+              depth--
+              if (depth === 0) { closingLine = lines[i]; break }
+            }
+            innerLines.push(lines[i])
+            i++
+          }
+
+          // Emit opening tag
+          blocks.push({
+            id: `block-${currentId++}`,
+            type: 'html',
+            content: line,
+            order: currentId,
+            startLine: htmlStartLine
+          })
+          // Recursively parse inner content as markdown
+          for (const inner of parseMarkdownToBlocks(innerLines.join('\n'))) {
+            blocks.push({ ...inner, id: `block-${currentId++}`, order: currentId, startLine: htmlStartLine + inner.startLine })
+          }
+          // Emit closing tag
+          if (closingLine) {
+            blocks.push({
+              id: `block-${currentId++}`,
+              type: 'html',
+              content: closingLine,
+              order: currentId,
+              startLine: htmlStartLine + innerLines.length + 1
+            })
+          }
+          continue
+        }
+
+        // Non-mixed HTML: collect everything as one opaque block
+        const htmlLines = [line]
         if (!isSelfClosing && !isVoid && !hasSameLineClose) {
           const closePattern = new RegExp(`</${tagName}\\s*>`, 'i')
           const openPattern = new RegExp(`<${tagName}[\\s>/]`, 'i')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "md-annotator",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "Browser-based Markdown annotator for AI-assisted review",
   "type": "module",
   "bin": {
@@ -41,6 +41,8 @@
     "highlight.js": "^11.11.0",
     "mermaid": "^11.12.3",
     "open": "^10.1.0",
+    "pako": "^2.1.0",
+    "plantuml-encoder": "^1.4.0",
     "portfinder": "^1.0.32",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",

package/server/config.js

@@ -27,10 +27,28 @@ function getHeartbeatTimeoutMs() {
   return DEFAULT_HEARTBEAT_TIMEOUT_MS
 }
 
+function getPlantumlServerUrl() {
+  const envUrl = process.env.PLANTUML_SERVER_URL
+  if (envUrl) {
+    return envUrl.replace(/\/+$/, '')
+  }
+  return 'https://www.plantuml.com/plantuml'
+}
+
+function getKrokiServerUrl() {
+  const envUrl = process.env.KROKI_SERVER_URL
+  if (envUrl) {
+    return envUrl.replace(/\/+$/, '')
+  }
+  return 'https://kroki.io'
+}
+
 export const config = {
   port: getServerPort(),
   browser: process.env.MD_ANNOTATOR_BROWSER || null,
   heartbeatTimeoutMs: getHeartbeatTimeoutMs(),
   forceExitTimeoutMs: 5000,
   jsonLimit: '10mb',
+  plantumlServerUrl: getPlantumlServerUrl(),
+  krokiServerUrl: getKrokiServerUrl(),
 }

package/server/feedback.js

@@ -20,11 +20,27 @@ function formatAnnotation(ann, block, heading) {
     return output + '\n'
   }
 
+  if (ann.targetType === 'pinpoint') {
+    const isDeletion = ann.type === 'DELETION'
+    const label = isDeletion ? 'Remove block' : 'Comment on block'
+    let output = `${heading} ${label} (Line ${blockStartLine})\n`
+    const preview = (block?.content || ann.originalText || '').slice(0, 200)
+    output += `\`\`\`\n${preview}\n\`\`\`\n`
+    if (isDeletion) {
+      output += `> User wants this block removed from the document.\n`
+    } else {
+      output += `> ${(ann.text ?? '').replace(/\n/g, '\n> ')}\n`
+    }
+    return output + '\n'
+  }
+
   if (ann.targetType === 'diagram') {
     const isDeletion = ann.type === 'DELETION'
-    const label = isDeletion ? 'Remove Mermaid diagram' : 'Comment on Mermaid diagram'
+    const diagramLang = block?.language === 'plantuml' ? 'PlantUML' : 'Mermaid'
+    const fence = block?.language === 'plantuml' ? 'plantuml' : 'mermaid'
+    const label = isDeletion ? `Remove ${diagramLang} diagram` : `Comment on ${diagramLang} diagram`
     let output = `${heading} ${label} (Line ${blockStartLine})\n`
-    output += `\`\`\`mermaid\n${block?.content || ann.originalText}\n\`\`\`\n`
+    output += `\`\`\`${fence}\n${block?.content || ann.originalText}\n\`\`\`\n`
     if (isDeletion) {
       output += `> User wants this diagram removed from the document.\n`
     } else {

package/server/routes.js

@@ -4,6 +4,7 @@ import { createHash } from 'node:crypto'
 import { readMarkdownFile, isMarkdownFile } from './file.js'
 import { exportFeedback, exportMultiFileFeedback } from './feedback.js'
 import { listWorkspaceFiles } from './workspace.js'
+import { config } from './config.js'
 
 function success(data) {
   return { success: true, data }
@@ -43,7 +44,7 @@ export function createApiRouter(filePaths, resolveDecision, origin = 'cli', stor
           }
         })
       )
-      res.json(success({ files, origin }))
+      res.json(success({ files, origin, config: { plantumlServerUrl: config.plantumlServerUrl, krokiServerUrl: config.krokiServerUrl } }))
     } catch (error) {
       res.status(500).json(failure(error.message))
     }