md-annotator 0.7.0 → 0.9.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.7.0",
+  "version": "0.9.0",
   "description": "Browser-based Markdown annotator for AI-assisted review",
   "type": "module",
   "bin": {
@@ -43,7 +43,6 @@
     "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",
     "web-highlighter": "^0.7.4"

package/server/annotator.js

@@ -3,13 +3,12 @@
  * Provides startAnnotatorServer() for both CLI and plugin usage.
  */
 
-import { existsSync } from 'node:fs'
+import { existsSync, readFileSync } from 'node:fs'
 import { createHash } from 'node:crypto'
 import { fileURLToPath } from 'node:url'
 import { dirname, join } from 'node:path'
 import express from 'express'
 import cors from 'cors'
-import portfinder from 'portfinder'
 import { config } from './config.js'
 import { createApiRouter } from './routes.js'
 import { readMarkdownFile } from './file.js'
@@ -19,6 +18,15 @@ const __dirname = dirname(fileURLToPath(import.meta.url))
 const DIST_PATH = join(__dirname, '..', 'client', 'dist')
 const DEV_PATH = join(__dirname, '..', 'client')
 
+// Pre-load index.html into memory at module load time (avoids per-request disk I/O)
+const DIST_INDEX = join(DIST_PATH, 'index.html')
+const DEV_INDEX = join(DEV_PATH, 'index.html')
+const preloadedHtml = existsSync(DIST_INDEX)
+  ? readFileSync(DIST_INDEX, 'utf-8')
+  : existsSync(DEV_INDEX)
+    ? readFileSync(DEV_INDEX, 'utf-8')
+    : null
+
 /**
  * Resolve notes for a specific file from the feedbackNotes array.
  * Notes apply to the first file only (multi-file uses one invocation per file).
@@ -59,14 +67,14 @@ export async function startAnnotatorServer(options) {
   app.use(cors())
   app.use(express.json({ limit: config.jsonLimit }))
 
-  // Serve static files or embedded HTML
-  if (htmlContent) {
-    // Plugin mode: serve embedded HTML
+  // Serve HTML from memory (pre-loaded or embedded)
+  const html = htmlContent || preloadedHtml
+  if (html) {
     app.get('/', (_req, res) => {
-      res.type('html').send(htmlContent)
+      res.type('html').send(html)
     })
   } else {
-    // CLI mode: serve from disk
+    // Fallback: serve from disk (dev mode without built index.html)
     const clientPath = existsSync(DIST_PATH) ? DIST_PATH : DEV_PATH
     app.use(express.static(clientPath))
   }
@@ -131,15 +139,14 @@ export async function startAnnotatorServer(options) {
   // API routes with multi-file support
   app.use(createApiRouter(filePaths, safeResolve, origin, stores))
 
-  // Find available port
-  portfinder.basePort = config.port
-  const port = await portfinder.getPortPromise()
-
-  // Start server
+  // Start server — use port 0 to let the OS assign a free port instantly,
+  // falling back to configured port if explicitly set via MD_ANNOTATOR_PORT
+  const requestedPort = config.portExplicit ? config.port : 0
   const server = await new Promise((resolve) => {
-    const s = app.listen(port, () => resolve(s))
+    const s = app.listen(requestedPort, () => resolve(s))
   })
 
+  const port = server.address().port
   const url = `http://localhost:${port}`
 
   // Call onReady callback if provided

package/server/config.js

@@ -45,6 +45,7 @@ function getKrokiServerUrl() {
 
 export const config = {
   port: getServerPort(),
+  portExplicit: !!process.env.MD_ANNOTATOR_PORT,
   browser: process.env.MD_ANNOTATOR_BROWSER || null,
   heartbeatTimeoutMs: getHeartbeatTimeoutMs(),
   forceExitTimeoutMs: 5000,

package/server/feedback.js

@@ -49,6 +49,27 @@ function formatAnnotation(ann, block, heading) {
     return output + '\n'
   }
 
+  // Source view annotations — blockId is "source-line-N" (0-indexed)
+  if (ann.targetType === 'source') {
+    const lineMatch = ann.blockId?.match(/^source-line-(\d+)$/)
+    const startLine = lineMatch ? parseInt(lineMatch[1], 10) + 1 : 1
+    const newlinesInSelection = (ann.originalText.match(/\n/g) || []).length
+    const endLine = startLine + newlinesInSelection
+    const lineRef = startLine === endLine ? `Line ${startLine}` : `Lines ${startLine}-${endLine}`
+
+    let output = `${heading} `
+    if (ann.type === 'DELETION') {
+      output += `Remove this (${lineRef}, source)\n`
+      output += `\`\`\`\n${ann.originalText}\n\`\`\`\n`
+      output += `> User wants this removed from the document.\n`
+    } else if (ann.type === 'COMMENT') {
+      output += `Comment on (${lineRef}, source)\n`
+      output += `\`\`\`\n${ann.originalText}\n\`\`\`\n`
+      output += `> ${(ann.text ?? '').replace(/\n/g, '\n> ')}\n`
+    }
+    return output + '\n'
+  }
+
   const blockContent = block?.content || ''
   const textBeforeSelection = blockContent.slice(0, ann.startOffset)
   const linesBeforeSelection = (textBeforeSelection.match(/\n/g) || []).length
@@ -79,10 +100,18 @@ function formatAnnotation(ann, block, heading) {
   return output + '\n'
 }
 
+function getBlockOrder(blockId, blocks) {
+  const sourceMatch = blockId?.match(/^source-line-(\d+)$/)
+  if (sourceMatch) { return parseInt(sourceMatch[1], 10) + 1 }
+  const block = blocks.find(blk => blk.id === blockId)
+  if (block?.startLine) { return block.startLine }
+  return Infinity
+}
+
 function sortAnnotations(annotations, blocks) {
   return [...annotations].sort((a, b) => {
-    const blockA = blocks.findIndex(blk => blk.id === a.blockId)
-    const blockB = blocks.findIndex(blk => blk.id === b.blockId)
+    const blockA = getBlockOrder(a.blockId, blocks)
+    const blockB = getBlockOrder(b.blockId, blocks)
     if (blockA !== blockB) {return blockA - blockB}
     return a.startOffset - b.startOffset
   })

package/client/src/utils/storage.js

@@ -1,44 +0,0 @@
-/**
- * Cookie-based storage utility.
- *
- * Uses cookies instead of localStorage so settings persist across
- * different ports (each session uses a random port).
- * Cookies are scoped by domain, not port, so localhost:54321 and
- * localhost:54322 share the same cookies.
- */
-
-const ONE_YEAR_SECONDS = 60 * 60 * 24 * 365
-
-function escapeRegex(str) {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-}
-
-function getItem(key) {
-  try {
-    const match = document.cookie.match(new RegExp(`(?:^|; )${escapeRegex(key)}=([^;]*)`))
-    return match ? decodeURIComponent(match[1]) : null
-  } catch {
-    return null
-  }
-}
-
-function setItem(key, value) {
-  try {
-    const encoded = encodeURIComponent(value)
-    document.cookie = `${key}=${encoded}; path=/; max-age=${ONE_YEAR_SECONDS}; SameSite=Lax`
-  } catch {
-    // Cookie not available
-  }
-}
-
-const AUTO_CLOSE_KEY = 'md-annotator-auto-close'
-
-export function getAutoCloseDelay() {
-  const val = getItem(AUTO_CLOSE_KEY)
-  if (val === '0' || val === '3' || val === '5') {return val}
-  return 'off'
-}
-
-export function setAutoCloseDelay(delay) {
-  setItem(AUTO_CLOSE_KEY, delay)
-}