memd-cli 3.0.1 → 3.1.0

package/.claude/settings.local.json

@@ -0,0 +1,22 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(echo:*)",
+      "Bash(FORCE_COLOR=1 echo:*)",
+      "Bash(script:*)",
+      "Bash(FORCE_COLOR=1 node:*)",
+      "Bash(node -e \"import\\('beautiful-mermaid/src/ascii/ansi.ts'\\).then\\(m=>console.log\\(Object.keys\\(m\\)\\)\\).catch\\(e=>console.error\\('ERROR:',e.message\\)\\)\" 2>&1 | head -5)",
+      "Bash(node main.js test/test-highlight.md --no-pager --theme catppuccin-mocha 2>&1 | head -3 | xxd | head -10)",
+      "Bash(FORCE_COLOR=1 node main.js test/test-highlight.md --no-pager --theme catppuccin-mocha 2>&1 | head -3 | xxd | head -5)",
+      "Bash(FORCE_COLOR=1 node main.js test/test-highlight.md --no-pager --theme zinc-dark 2>&1 | head -3 | xxd | head -5)",
+      "mcp__grep-github__searchGitHub",
+      "Bash(npx npm-check-updates:*)",
+      "Bash(MEMD_THEME= pnpm test 2>&1 | tail -20)",
+      "Bash(MEMD_THEME= npx vitest run 2>&1)",
+      "Bash(node:*)",
+      "Bash(printf:*)",
+      "WebFetch(domain:registry.npmjs.org)",
+      "WebFetch(domain:api.github.com)"
+    ]
+  }
+}

package/CLAUDE.md

@@ -1,4 +1,73 @@
-## how to test
+# memd
 
-- `node main.js test/test1.md`
-- `node main.js test/test2.md`
+Markdown viewer CLI with Mermaid diagram support. Terminal rendering and HTTP serve mode.
+
+## Structure
+
+```
+memd/
+  main.js            # CLI entry point (commander). Terminal render + `serve` sub-command
+  render-shared.js   # HTML rendering: Mermaid SVG conversion, marked HTML output
+  render-utils.js    # Pure helpers: escapeHtml, mixHex, resolveThemeColors
+  render-worker.js   # Worker thread for serve mode (calls renderToHTML)
+  package.json
+  pnpm-lock.yaml
+  .npmrc
+  test/
+    memd.test.js     # vitest tests (CLI, HTML output, serve, TTY, theme)
+    test1.md         # basic markdown + mermaid
+    test2.md         # complex mermaid diagram
+    test3.md         # multiple mermaid blocks (marker ID uniqueness)
+    complex.md       # graph TD with <br>, special chars, edge labels
+    test-br.md       # <br> tag line breaks in mermaid nodes
+    test-cjk.md      # Japanese labels in mermaid
+    test-highlight.md # syntax highlighting test
+    poc_md.ts         # PoC script
+    poc_mermaid.ts    # PoC script
+    pixel.png         # test image for static file serving
+```
+
+## Commands
+
+```bash
+pnpm install          # install dependencies
+pnpm test             # run tests (vitest run --maxConcurrency=20)
+```
+
+## Manual testing
+
+```bash
+node main.js test/test1.md
+node main.js test/test2.md
+node main.js test/complex.md
+node main.js --html test/test1.md          # HTML output to stdout
+node main.js serve --dir test --port 3000  # HTTP serve mode
+```
+
+## Key CLI flags
+
+- `--no-pager` -- disable pager (less)
+- `--no-color` -- strip ANSI escape codes
+- `--ascii` -- ASCII-only diagram rendering
+- `--html` -- output HTML instead of terminal
+- `--theme <name>` -- color theme (default: `nord`)
+- `--width <n>` -- terminal width override
+
+## Environment variables
+
+- `MEMD_THEME` -- default theme (overridden by `--theme` flag)
+- `FORCE_COLOR=3` -- force truecolor ANSI output
+
+## Available themes
+
+nord, dracula, one-dark, github-dark, github-light, solarized-dark, solarized-light,
+catppuccin-mocha, catppuccin-latte, tokyo-night, tokyo-night-storm, tokyo-night-light,
+nord-light, zinc-dark, zinc-light
+
+## Architecture notes
+
+- `main.js` handles both terminal rendering (marked + marked-terminal + shiki) and `serve` sub-command (HTTP server with worker pool)
+- `render-shared.js` converts Mermaid fenced blocks to SVG via `@ktrysmt/beautiful-mermaid`, then renders full HTML with `marked`
+- `render-worker.js` runs `renderToHTML` in a worker thread for non-blocking serve mode
+- `render-utils.js` provides theme color resolution and HTML escaping (shared by main.js and render-shared.js)
+- Serve mode supports: directory listing, ETag/304 caching, gzip, static file serving (images/css), sidebar navigation, `--watch` with SSE live reload, CSP nonce

package/README.md

@@ -363,6 +363,31 @@ Note:
 * Each worker loads the Mermaid rendering library in an independent V8 isolate. Each worker consumes approximately 80-120 MB of memory. The default is `min(num_CPUs-1, 4)` workers. In memory-constrained environments, specify `--workers 1`. Recommended memory: 512 MB + (number of workers x 120 MB).
 
 
+## Environment Variables
+
+| Variable | Description | Default |
+|---|---|---|
+| `MEMD_THEME` | Color theme for both terminal and HTML output | `nord` |
+| `NO_COLOR` | Disable colored terminal output (any value) | _(unset)_ |
+| `NO_PAGER` | Disable pager (any value) | _(unset)_ |
+| `PAGER` | Pager command | `less` |
+| `MEMD_SERVE_RESPAWN_MAX` | Max worker respawns before marking dead | `5` |
+| `MEMD_SERVE_RESPAWN_WINDOW_MS` | Time window for respawn limit (ms) | `60000` |
+| `MEMD_SERVE_RENDER_TIMEOUT_MS` | Per-request render timeout (ms) | `30000` |
+| `MEMD_SERVE_DEAD_RECOVERY_MS` | Cooldown before recovering a dead worker (ms) | `300000` |
+| `MEMD_SERVE_CACHE_MAX_ENTRIES` | Max number of cached rendered pages | `200` |
+| `MEMD_SERVE_CACHE_MAX_BYTES` | Max total bytes for render cache | `52428800` (50 MB) |
+| `MEMD_SERVE_MD_MAX_SIZE` | Max markdown file size to render (bytes) | `10485760` (10 MB) |
+| `MEMD_SERVE_GZIP_CACHE_MAX` | Max number of cached gzip responses | `200` |
+
+```bash
+# Examples
+MEMD_THEME=github-dark memd README.md
+MEMD_THEME=dracula memd serve
+NO_COLOR=1 memd README.md
+MEMD_SERVE_RENDER_TIMEOUT_MS=60000 memd serve
+```
+
 ## Author
 
 [ktrysmt](https://github.com/ktrysmt)

package/main.js

@@ -2,7 +2,7 @@
 // @ts-nocheck
 import { marked } from 'marked';
 import { markedTerminal } from 'marked-terminal';
-import { renderMermaidASCII, THEMES as MERMAID_THEMES } from 'beautiful-mermaid';
+import { renderMermaidASCII, THEMES as MERMAID_THEMES } from '@ktrysmt/beautiful-mermaid';
 import chalk from 'chalk';
 import { program } from 'commander';
 import { spawn } from 'child_process';
@@ -566,6 +566,7 @@ async function main() {
     .name('memd')
     .version(packageJson.version, '-v, --version', 'output the version number')
     .description('Render markdown with mermaid diagrams')
+    .enablePositionalOptions()
     .argument('[files...]', 'markdown file(s) to render')
     .option('--no-pager', 'disable pager (less)')
     .option('--no-mouse', 'disable mouse scroll in pager')

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "memd-cli",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "type": "module",
   "main": "main.js",
   "bin": {
     "memd": "main.js"
   },
   "scripts": {
-    "test": "vitest run"
+    "test": "vitest run --maxConcurrency=20"
   },
   "dependencies": {
-    "beautiful-mermaid": "^1.1.3",
+    "@ktrysmt/beautiful-mermaid": "^1.1.4",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "marked": "^17.0.4",

package/render-shared.js

@@ -1,6 +1,6 @@
 import crypto from 'node:crypto';
 import { Marked } from 'marked';
-import { renderMermaidSVG } from 'beautiful-mermaid';
+import { renderMermaidSVG } from '@ktrysmt/beautiful-mermaid';
 import { escapeHtml, resolveThemeColors } from './render-utils.js';
 
 export const MERMAID_MODAL_SCRIPT = [

package/test/complex.md

@@ -0,0 +1,21 @@
+
+```mermaid
+  graph TD
+      A["AAA<br>(keita)"] --> C["CCC"]
+      B["BBB<br>(yuriko)"] --> C
+      C --> D["DDDD"]
+      D --> E["EEEE"]
+
+      A1["1 / 2"] --> A
+      A2["3 / 4"] --> A
+      A3["5 / 6"] --> A
+      A4["XXX<br>(YYY ZZZ)"] --> A
+
+      B1["77 77<br>(7 / 7 / 7)"] --> B
+      B2["88-88<br>(99 99)"] --> B
+      B3["111s 222s"] --> B
+
+      D --> F{"F?"}
+      F -->|Yes| G["High level<br>Tr"]
+      F -->|No| H["Dumb Tr<br>S"]
+```

package/test/memd.test.js

@@ -1,6 +1,6 @@
 import { describe, it, expect, beforeAll, afterAll } from 'vitest'
 import { launchTerminal } from 'tuistory'
-import { execSync, spawn } from 'child_process'
+import { execSync, execFile, execFileSync, spawn } from 'child_process'
 import fs from 'fs'
 import path from 'path'
 import { fileURLToPath } from 'url'
@@ -11,30 +11,25 @@ const MAIN = path.join(__dirname, '..', 'main.js')
 // Strip MEMD_THEME from env so tests always get the built-in default (nord)
 delete process.env.MEMD_THEME
 
-async function run(args, { waitFor = null } = {}) {
-  const session = await launchTerminal({
-    command: 'node',
-    args: [MAIN, ...args],
-    cols: 80,
-    rows: 30,
-    waitForData: false,
-  })
-  const waitText = waitFor ?? (t => t.trim().length > 0)
-  const output = await session.text({ waitFor: waitText, timeout: 8000 })
-  return output.trim()
+function run(args) {
+  return new Promise((resolve) => {
+    execFile('node', [MAIN, ...args], { encoding: 'utf-8', timeout: 15000 }, (err, stdout, stderr) => {
+      resolve(((stdout ?? '') + (stderr ?? '')).trim())
+    })
+  })
 }
 
 function runSync(args) {
-  return execSync(`node ${MAIN} ${args}`, { encoding: 'utf-8', timeout: 15000 })
+  return execFileSync('node', [MAIN, ...args], { encoding: 'utf-8', timeout: 15000 })
 }
 
 describe('memd CLI', () => {
-  it('--version', async () => {
+  it.concurrent('--version', async () => {
     const output = await run(['-v'])
-    expect(output).toContain('3.0.1')
+    expect(output).toContain('3.1.0')
   })
 
-  it('--help', async () => {
+  it.concurrent('--help', async () => {
     const output = await run(['--help'])
     expect(output).toContain('Usage: memd')
     expect(output).toContain('--no-pager')
@@ -47,7 +42,6 @@ describe('memd CLI', () => {
   it('renders test1.md (basic markdown + mermaid)', async () => {
     const output = await run(
       ['--no-pager', '--no-color', '--width', '80', 'test/test1.md'],
-      { waitFor: t => t.includes('More text.') },
     )
     expect(output).toMatchInlineSnapshot(`
       "# Hello
@@ -63,10 +57,9 @@ describe('memd CLI', () => {
     `)
   })
 
-  it('renders test2.md (complex mermaid diagram)', async () => {
+  it.concurrent('renders test2.md (complex mermaid diagram)', async () => {
     const output = await run(
       ['--no-pager', '--no-color', '--width', '80', 'test/test2.md'],
-      { waitFor: t => t.includes('More text after the diagram.') },
     )
     expect(output).toContain('Start')
     expect(output).toContain('Decision?')
@@ -75,10 +68,9 @@ describe('memd CLI', () => {
     expect(output).toContain('More text after the diagram.')
   })
 
-  it('--ascii renders ASCII-only diagram', async () => {
+  it.concurrent('--ascii renders ASCII-only diagram', async () => {
     const output = await run(
       ['--no-pager', '--no-color', '--width', '80', '--ascii', 'test/test1.md'],
-      { waitFor: t => t.includes('More text.') },
     )
     expect(output).toContain('+---+')
     expect(output).toContain('---->')
@@ -86,35 +78,23 @@ describe('memd CLI', () => {
     expect(output).not.toContain('►')
   })
 
-  it('--no-color strips ANSI escape codes', async () => {
+  it.concurrent('--no-color strips ANSI escape codes', async () => {
     const output = await run(
       ['--no-pager', '--no-color', '--width', '80', 'test/test1.md'],
-      { waitFor: t => t.includes('More text.') },
     )
     // eslint-disable-next-line no-control-regex
     expect(output).not.toMatch(/\x1b\[[\d;]*m/)
   })
 
-  it('error on missing file', async () => {
-    const session = await launchTerminal({
-      command: 'node',
-      args: [MAIN, '--no-pager', 'test/nonexistent.md'],
-      cols: 80,
-      rows: 10,
-      waitForData: false,
-    })
-    const output = (await session.text({
-      waitFor: t => t.includes('Error'),
-      timeout: 8000,
-    })).trim()
+  it.concurrent('error on missing file', async () => {
+    const output = await run(['--no-pager', 'test/nonexistent.md'])
     expect(output).toContain('Error reading file')
     expect(output).toContain('nonexistent.md')
   })
 
-  it('renders test-br.md (<br> tag line breaks)', async () => {
+  it.concurrent('renders test-br.md (<br> tag line breaks)', async () => {
     const output = await run(
       ['--no-pager', '--no-color', '--width', '80', 'test/test-br.md'],
-      { waitFor: t => t.includes('All three variants') },
     )
     // Each node should have its label split across two lines
     expect(output).toContain('Line1')
@@ -130,10 +110,9 @@ describe('memd CLI', () => {
     expect(diagramSection).not.toMatch(/<br\s*\/?>/)
   })
 
-  it('renders test-cjk.md (Japanese labels)', async () => {
+  it.concurrent('renders test-cjk.md (Japanese labels)', async () => {
     const output = await run(
       ['--no-pager', '--no-color', '--width', '80', 'test/test-cjk.md'],
-      { waitFor: t => t.includes('Japanese labels') },
     )
     expect(output).toContain('開始')
     expect(output).toContain('判定')
@@ -143,25 +122,41 @@ describe('memd CLI', () => {
     expect(output).toContain('いいえ')
   })
 
-  it('reads markdown from stdin via shell', async () => {
-    const session = await launchTerminal({
-      command: 'sh',
-      args: ['-c', `echo '# stdin test' | node ${MAIN} --no-pager --no-color`],
-      cols: 80,
-      rows: 10,
-      waitForData: false,
-    })
-    const output = (await session.text({
-      waitFor: t => t.includes('stdin test'),
-      timeout: 8000,
-    })).trim()
+  it.concurrent('renders complex.md (graph TD with <br> and special chars)', async () => {
+    const output = await run(
+      ['--no-pager', '--no-color', '--width', '80', 'test/complex.md'],
+    )
+    // Node labels with <br> should render as multi-line text
+    expect(output).toContain('AAA')
+    expect(output).toContain('keita')
+    expect(output).toContain('BBB')
+    expect(output).toContain('yuriko')
+    // Leaf nodes
+    expect(output).toContain('1 / 2')
+    expect(output).toContain('XXX')
+    expect(output).toContain('YYY ZZZ')
+    // Decision node and edge labels
+    expect(output).toContain('F?')
+    expect(output).toContain('Yes')
+    expect(output).toContain('No')
+    expect(output).toContain('High level')
+    expect(output).toContain('Dumb Tr')
+    // <br> tags should not appear in rendered output
+    expect(output).not.toMatch(/<br\s*\/?>/)
+  })
+
+  it('reads markdown from stdin via shell', () => {
+    const output = execSync(
+      `echo '# stdin test' | node ${MAIN} --no-pager --no-color`,
+      { encoding: 'utf-8', timeout: 15000 },
+    ).trim()
     expect(output).toContain('stdin test')
   })
 
   // --html output tests
   describe('--html output', () => {
     it('--html + file -> stdout', () => {
-      const output = runSync('--html test/test1.md')
+      const output = runSync(['--html', 'test/test1.md'])
       expect(output).toContain('<!DOCTYPE html>')
       expect(output).toContain('<svg')
       // Contains theme CSS colors (nord default: bg=#2e3440, fg=#d8dee9)
@@ -184,7 +179,7 @@ describe('memd CLI', () => {
     })
 
     it('--html + multiple Mermaid blocks have unique marker IDs', () => {
-      const output = runSync('--html test/test3.md')
+      const output = runSync(['--html', 'test/test3.md'])
       expect(output).toContain('<svg')
       // Check for prefixed marker IDs (m0-, m1-, etc.)
       expect(output).toMatch(/id="m0-/)
@@ -192,7 +187,7 @@ describe('memd CLI', () => {
     })
 
     it('--html + multiple files -> combined single HTML', () => {
-      const output = runSync('--html test/test1.md test/test2.md')
+      const output = runSync(['--html', 'test/test1.md', 'test/test2.md'])
       expect(output).toContain('<!DOCTYPE html>')
       // Content from both files
       expect(output).toContain('Hello')
@@ -206,13 +201,13 @@ describe('memd CLI', () => {
   // Theme tests (HTML path)
   describe('theme (HTML path)', () => {
     it('--html --theme dracula uses dracula colors', () => {
-      const output = runSync('--html --theme dracula test/test1.md')
+      const output = runSync(['--html', '--theme', 'dracula', 'test/test1.md'])
       expect(output).toContain('#282a36') // bg
       expect(output).toContain('#f8f8f2') // fg
     })
 
     it('--html --theme tokyo-night uses tokyo-night colors', () => {
-      const output = runSync('--html --theme tokyo-night test/test1.md')
+      const output = runSync(['--html', '--theme', 'tokyo-night', 'test/test1.md'])
       expect(output).toContain('#1a1b26') // bg
       expect(output).toContain('#a9b1d6') // fg
     })
@@ -224,7 +219,7 @@ describe('memd CLI', () => {
     })
 
     it('--html --no-color outputs full color HTML (silently ignored)', () => {
-      const output = runSync('--html --no-color test/test1.md')
+      const output = runSync(['--html', '--no-color', 'test/test1.md'])
       expect(output).toContain('<!DOCTYPE html>')
       expect(output).toContain('#2e3440')
     })
@@ -232,53 +227,39 @@ describe('memd CLI', () => {
 
   // Theme tests (terminal path)
   describe('theme (terminal path)', () => {
-    it('--theme dracula renders terminal output', async () => {
+    it.concurrent('--theme dracula renders terminal output', async () => {
       const output = await run(
         ['--no-pager', '--no-color', '--theme', 'dracula', 'test/test1.md'],
-        { waitFor: t => t.includes('More text.') },
       )
       expect(output).toContain('Hello')
       expect(output).toContain('More text.')
     })
 
-    it('--theme tokyo-night (no highlight) renders terminal output', async () => {
+    it.concurrent('--theme tokyo-night (no highlight) renders terminal output', async () => {
       const output = await run(
         ['--no-pager', '--no-color', '--theme', 'tokyo-night', 'test/test1.md'],
-        { waitFor: t => t.includes('More text.') },
       )
       expect(output).toContain('Hello')
       expect(output).toContain('More text.')
     })
 
-    it('--theme one-dark renders terminal output', async () => {
+    it.concurrent('--theme one-dark renders terminal output', async () => {
       const output = await run(
         ['--no-pager', '--no-color', '--theme', 'one-dark', 'test/test1.md'],
-        { waitFor: t => t.includes('More text.') },
       )
       expect(output).toContain('Hello')
       expect(output).toContain('More text.')
     })
 
-    it('--theme nonexistent exits with error', async () => {
-      const session = await launchTerminal({
-        command: 'node',
-        args: [MAIN, '--no-pager', '--no-color', '--theme', 'nonexistent', 'test/test1.md'],
-        cols: 80,
-        rows: 10,
-        waitForData: false,
-      })
-      const output = (await session.text({
-        waitFor: t => t.includes('Unknown theme'),
-        timeout: 8000,
-      })).trim()
+    it.concurrent('--theme nonexistent exits with error', async () => {
+      const output = await run(['--no-pager', '--no-color', '--theme', 'nonexistent', 'test/test1.md'])
       expect(output).toContain('Unknown theme')
       expect(output).toContain('Available themes')
     })
 
-    it('default theme is nord', async () => {
+    it.concurrent('default theme is nord', async () => {
       const output = await run(
         ['--no-pager', '--no-color', 'test/test1.md'],
-        { waitFor: t => t.includes('More text.') },
       )
       expect(output).toContain('Hello')
       expect(output).toContain('More text.')
@@ -317,7 +298,7 @@ describe('memd CLI', () => {
   })
 
   // chalk.level = 0 + Shiki: verify no ANSI codes for all themes
-  describe('--no-color strips ANSI from all themes', () => {
+  describe.concurrent('--no-color strips ANSI from all themes', () => {
     const themes = [
       'nord', 'dracula', 'one-dark', 'github-dark', 'github-light',
       'solarized-dark', 'solarized-light', 'catppuccin-mocha', 'catppuccin-latte',
@@ -329,7 +310,6 @@ describe('memd CLI', () => {
       it(`--theme ${theme} --no-color has no ANSI codes`, async () => {
         const output = await run(
           ['--no-pager', '--no-color', '--theme', theme, 'test/test-highlight.md'],
-          { waitFor: t => t.includes('TypeScript') },
         )
         // eslint-disable-next-line no-control-regex
         expect(output).not.toMatch(/\x1b\[[\d;]*m/)
@@ -347,37 +327,72 @@ describe('memd CLI', () => {
     expect(output).toMatch(/\x1b\[38;2;\d+;\d+;\d+m/)
   })
 
-  it('unknown language falls back to plain text without errors', async () => {
+  it('unknown language falls back to plain text without errors', () => {
+    const output = execSync(`node ${MAIN} --no-pager --no-color`, {
+      encoding: 'utf-8',
+      timeout: 15000,
+      input: '# Test\n\n```unknownlang\nsome code\n```',
+    }).trim()
+    expect(output).toContain('some code')
+    expect(output).not.toContain('Error')
+    expect(output).not.toContain('Could not find the language')
+  })
+
+  it('cli-highlight is not invoked (no highlight.js errors in output)', () => {
+    const output = execSync(`node ${MAIN} --no-pager --no-color`, {
+      encoding: 'utf-8',
+      timeout: 15000,
+      input: '# Test\n\n```rust\nfn main() {}\n```',
+    }).trim()
+    expect(output).toContain('fn main')
+    expect(output).not.toContain('Could not find the language')
+  })
+})
+
+describe('TTY behavior (PTY required)', () => {
+  it('auto-detects color in TTY (no --no-color)', async () => {
     const session = await launchTerminal({
-      command: 'sh',
-      args: ['-c', `echo '# Test\n\n\`\`\`unknownlang\nsome code\n\`\`\`' | node ${MAIN} --no-pager --no-color`],
+      command: 'node',
+      args: [MAIN, '--no-pager', '--width', '80', 'test/test-highlight.md'],
+      cols: 80,
+      rows: 30,
+      waitForData: false,
+    })
+    await session.text({ waitFor: t => t.includes('TypeScript'), timeout: 8000 })
+    const data = await session.getTerminalData()
+    const hasColor = data.lines.some(line =>
+      line.spans.some(span => span.fg !== null)
+    )
+    expect(hasColor).toBe(true)
+  })
+
+  it('pager activates for long output in TTY (no --no-pager)', async () => {
+    // test3.md is long enough to exceed terminal rows
+    const session = await launchTerminal({
+      command: 'node',
+      args: [MAIN, '--no-color', '--width', '80', 'test/test3.md'],
       cols: 80,
       rows: 10,
       waitForData: false,
     })
-    const output = (await session.text({
-      waitFor: t => t.includes('some code'),
-      timeout: 8000,
-    })).trim()
-    expect(output).toContain('some code')
-    expect(output).not.toContain('Error')
-    expect(output).not.toContain('Could not find the language')
+    const output = await session.text({ timeout: 8000 })
+    // less shows ':' or '(END)' prompt; partial output means pager is holding
+    expect(output).not.toContain('Error Handling Example')
+    await session.write('q')
   })
 
-  it('cli-highlight is not invoked (no highlight.js errors in output)', async () => {
+  it('pager quit with q exits cleanly', async () => {
     const session = await launchTerminal({
-      command: 'sh',
-      args: ['-c', `echo '# Test\n\n\`\`\`rust\nfn main() {}\n\`\`\`' | node ${MAIN} --no-pager`],
+      command: 'node',
+      args: [MAIN, '--no-color', '--width', '80', 'test/test3.md'],
       cols: 80,
       rows: 10,
       waitForData: false,
     })
-    const output = (await session.text({
-      waitFor: t => t.includes('fn main'),
-      timeout: 8000,
-    })).trim()
-    expect(output).toContain('fn main')
-    expect(output).not.toContain('Could not find the language')
+    await session.text({ timeout: 8000 })
+    await session.write('q')
+    // After quitting, session should end without error
+    await session.waitIdle({ timeout: 3000 })
   })
 })
 
@@ -414,7 +429,7 @@ describe('memd serve', () => {
   })
 
   it('serve --help shows options', () => {
-    const output = runSync('serve --help')
+    const output = runSync(['serve', '--help'])
     expect(output).toContain('-d, --dir')
     expect(output).toContain('--port')
     expect(output).toContain('--host')