diff --git a/hive-ag3nt/assets/app.js b/hive-ag3nt/assets/app.js index f5a2afd..709d9bd 100644 --- a/hive-ag3nt/assets/app.js +++ b/hive-ag3nt/assets/app.js @@ -656,6 +656,79 @@ log.innerHTML = ''; function trim(s, n) { return s.length > n ? s.slice(0, n) + '…' : s; } + // Render a message body as markdown into a new
. + // Wraps `marked.parse` so the per-row body element carries the + // `.md` class (CSS in TERMINAL_CSS scopes paragraph/code/list + // styles to it). Falls back to a plain text node if marked isn't + // loaded (network glitch, asset 404) so the body still renders. + function mdNode(text) { + const div = document.createElement('div'); + div.className = 'md'; + const src = String(text || ''); + if (window.marked && typeof window.marked.parse === 'function') { + try { + marked.setOptions({ breaks: true, gfm: true }); + div.innerHTML = marked.parse(src); + } catch (err) { + console.warn('marked failed', err); + div.textContent = src; + } + } else { + div.textContent = src; + } + return div; + } + // Build a default-open details row whose body is markdown-rendered. + // Used by send / ask / answer tool_use renderers and by `recv` + // tool_result so message-bearing rows show their content inline + // without an extra click. + function detailsOpenMd(api, cls, summary, body) { + const d = api.details(cls, summary, ''); + d.open = true; + const pre = d.querySelector('pre.tool-body'); + if (pre) { + pre.replaceWith(mdNode(body)); + } else { + d.appendChild(mdNode(body)); + } + return d; + } + // Generic args-pretty-printer for unknown / extra-MCP tools. The + // built-in switch handles the common claude/hyperhive tools; this + // is the fallback so an `mcp__matrix__send_message` or similar + // doesn't dump raw JSON. Heuristics: single string-valued field → + // `Name field: "value"`; single dict-valued field → `Name field + // {…}`; otherwise compact JSON. Always trimmed to fit a row. + function fmtArgsGeneric(name, input) { + const keys = Object.keys(input || {}); + if (keys.length === 0) return name + '()'; + if (keys.length === 1) { + const k = keys[0]; + const v = input[k]; + if (typeof v === 'string') { + const oneline = v.replace(/\s+/g, ' ').trim(); + return name + ' ' + k + ': ' + JSON.stringify(trim(oneline, 100)); + } + if (typeof v === 'number' || typeof v === 'boolean') { + return name + ' ' + k + ': ' + JSON.stringify(v); + } + } + // Multi-field: render `k: v` pairs with strings/numbers inlined and + // anything else summarised by type so the row stays readable. + const pretty = keys.slice(0, 4).map((k) => { + const v = input[k]; + if (v == null) return k + ': null'; + if (typeof v === 'string') { + const oneline = v.replace(/\s+/g, ' ').trim(); + return k + ': ' + JSON.stringify(trim(oneline, 40)); + } + if (typeof v === 'number' || typeof v === 'boolean') return k + ': ' + v; + if (Array.isArray(v)) return k + `: [${v.length}]`; + return k + ': {…}'; + }); + const tail = keys.length > 4 ? ' …+' + (keys.length - 4) : ''; + return name + ' ' + pretty.join(' · ') + tail; + } // Pretty-print a tool call: per-known-tool format, fallback to JSON // for unknown tools. function fmtToolUse(c) { @@ -678,7 +751,7 @@ case 'mcp__hyperhive__kill': return short + ' ' + (input.name || ''); case 'mcp__hyperhive__request_apply_commit': return short + ' ' + (input.agent || '') + ' @ ' + (input.commit_ref || '').slice(0, 12); - default: return name + ' ' + trim(JSON.stringify(input), 200); + default: return fmtArgsGeneric(short, input); } } // Build a "rich" tool_use row for tools whose input has a body we @@ -709,37 +782,73 @@ + '\n' + newLines.map(l => '+ ' + l).join('\n'); } - const summary = '→ ' + name + ' ' + path + ' · ' + // Summaries on expandable rows omit the row's directional glyph + // (`→`) — the disclosure marker (`▸/▾`) from CSS sits in the + // prefix column for every row kind, and the row's cyan colour + // already signals "outbound tool". + const summary = name + ' ' + path + ' · ' + (minus ? '-' + minus + ' ' : '') + '+' + plus; return api.detailsDiff('tool-use', summary, body); } + // Message-bearing tools render default-open with a markdown body so + // the operator sees the content without an extra click. send / ask + // address a target; answer attaches to an existing question id. if (name === 'mcp__hyperhive__send') { const to = input.to || '?'; const body = String(input.body || ''); - const headline = body.replace(/\s+/g, ' ').trim().slice(0, 80); const lines = body.split('\n').length; - const summary = '→ send → ' + to + (lines > 1 ? ` · ${lines}L` : '') - + (headline ? ' · ' + headline + (body.length > 80 ? '…' : '') : ''); - return api.details('tool-use', summary, body); + return detailsOpenMd(api, 'tool-use', + 'send → ' + to + (lines > 1 ? ` · ${lines}L` : ''), + body); + } + if (name === 'mcp__hyperhive__ask') { + const to = input.to || 'operator'; + const q = String(input.question || ''); + const lines = q.split('\n').length; + return detailsOpenMd(api, 'tool-use', + 'ask → ' + to + (lines > 1 ? ` · ${lines}L` : ''), + q); + } + if (name === 'mcp__hyperhive__answer') { + const id = input.id != null ? String(input.id) : '?'; + const a = String(input.answer || ''); + const lines = a.split('\n').length; + return detailsOpenMd(api, 'tool-use', + 'answer #' + id + (lines > 1 ? ` · ${lines}L` : ''), + a); } return null; } + // Track tool_use_id → tool name so we can decide on rendering when the + // matching tool_result lands later. Lets us default-open the body for + // message-bearing tools (`recv`) while keeping shell/file tool output + // collapsed unless the operator clicks. Cleared on /clear; otherwise + // grows with the session — entries are tiny strings. + const toolNameById = new Map(); function renderToolResult(c, api) { const txt = Array.isArray(c.content) ? c.content.map(p => p.text || '').join('') : (c.content || ''); - const summary = '← ' + (() => { - const trimmed = txt.replace(/\s+/g, ' ').trim(); + const sourceName = c.tool_use_id ? toolNameById.get(c.tool_use_id) : null; + const isMessageBearing = sourceName === 'mcp__hyperhive__recv'; + const trimmed = txt.replace(/\s+/g, ' ').trim(); + const summaryBody = (() => { if (!trimmed) return '(empty)'; if (trimmed.length <= 120) return trimmed; const lines = txt.split('\n').filter(l => l.length).length; const headline = trimmed.slice(0, 90) + '…'; return `${lines}L · ${headline}`; })(); + // Flat row: keep the `←` glyph in the prefix column. Details rows + // drop it — the `▸/▾` disclosure marker sits in that column via CSS. + if (isMessageBearing && txt.trim()) { + return detailsOpenMd(api, 'tool-result-block', + 'recv ← ' + summaryBody, txt); + } if (!txt.trim() || txt.length <= 120) { - api.row('tool-result', summary); + api.row('tool-result', '← ' + summaryBody); } else { - api.details('tool-result-block', summary, txt); + api.details('tool-result-block', summaryBody, txt); } } // Pretty-render claude's background-task subagent events @@ -783,12 +892,19 @@ } if (v.type === 'assistant' && v.message && v.message.content) { for (const c of v.message.content) { - if (c.type === 'text' && c.text && c.text.trim()) api.row('text', c.text); + if (c.type === 'text' && c.text && c.text.trim()) { + // Assistant prose renders with markdown — claude often + // emits bullets / fenced code / inline code; raw text + // loses the structure. + const row = api.row('text', ''); + row.appendChild(mdNode(c.text)); + } else if (c.type === 'thinking') { const txt = (c.thinking || c.text || '').trim(); api.row('thinking', txt ? '· ' + txt : '· thinking …'); } else if (c.type === 'tool_use') { + if (c.id && c.name) toolNameById.set(c.id, c.name); if (!renderRichToolUse(c, api)) { api.row('tool-use', '→ ' + fmtToolUse(c)); } @@ -802,7 +918,10 @@ } return; } - api.row('sys', '· ' + trim(JSON.stringify(v), 200)); + // Catch-all for unrecognised stream-json shapes. Loud (orange) so + // silently-dropped event types surface in the scrollback for + // follow-up classification. + api.row('sys', '! ' + trim(JSON.stringify(v), 200)); } // Count open turns across the backfill replay so the live banner + @@ -844,7 +963,22 @@ (ev.ok ? '✓' : '✗') + ' turn ' + (ev.ok ? 'ok' : 'fail') + (ev.note ? ' — ' + ev.note : '')); }, - note(ev, api) { api.row('note', '· ' + ev.text); }, + note(ev, api) { + const t = String(ev.text || ''); + // stderr lines coming off the claude pump get an orange `!` + // glyph so they're not visually fused with ambient harness + // chatter. Operator-initiated notes (/cancel, /compact, + // /model, new-session) get a mauve italic affordance so the + // scrollback distinguishes "the operator did this" from + // "the harness did this on its own." + if (t.startsWith('stderr:')) { + api.row('note stderr', '! ' + t); + } else if (t.startsWith('operator:')) { + api.row('note op', '· ' + t); + } else { + api.row('note', '· ' + t); + } + }, stream(ev, api) { const v = Object.assign({}, ev); delete v.kind; renderStream(v, api); diff --git a/hive-ag3nt/assets/index.html b/hive-ag3nt/assets/index.html index a0c86e7..8635a32 100644 --- a/hive-ag3nt/assets/index.html +++ b/hive-ag3nt/assets/index.html @@ -39,6 +39,7 @@
+ diff --git a/hive-ag3nt/src/web_ui.rs b/hive-ag3nt/src/web_ui.rs index c3c093c..82d9b62 100644 --- a/hive-ag3nt/src/web_ui.rs +++ b/hive-ag3nt/src/web_ui.rs @@ -94,6 +94,7 @@ pub async fn serve( .route("/static/agent.css", get(serve_css)) .route("/static/app.js", get(serve_app_js)) .route("/static/hive-fr0nt.js", get(serve_shared_js)) + .route("/static/marked.js", get(serve_marked_js)) .route("/api/state", get(api_state)) .route("/events/stream", get(events_stream)) .route("/events/history", get(events_history)) @@ -190,6 +191,13 @@ async fn serve_shared_js() -> impl IntoResponse { ) } +async fn serve_marked_js() -> impl IntoResponse { + ( + [("content-type", "application/javascript")], + hive_fr0nt::MARKED_JS, + ) +} + #[derive(Serialize)] struct StateSnapshot { /// Bus seq at the moment this snapshot was assembled. Clients dedupe diff --git a/hive-c0re/assets/dashboard.css b/hive-c0re/assets/dashboard.css index ea62fe3..f7ec83e 100644 --- a/hive-c0re/assets/dashboard.css +++ b/hive-c0re/assets/dashboard.css @@ -668,6 +668,10 @@ summary:hover { color: var(--purple); } align-items: baseline; gap: 0.5em; padding: 0.1em 0; + /* Override the per-agent-terminal's hanging-indent metrics from + TERMINAL_CSS — the dashboard's broker rows are flex grids, not + glyph-prefixed text, and don't want the prefix column. */ + text-indent: 0; } .live .msgrow .msg-body { flex: 1 1 0; diff --git a/hive-fr0nt/assets/marked.min.js b/hive-fr0nt/assets/marked.min.js new file mode 100644 index 0000000..4049e35 --- /dev/null +++ b/hive-fr0nt/assets/marked.min.js @@ -0,0 +1,6 @@ +/** + * marked - a markdown parser + * Copyright (c) 2011-2021, Christopher Jeffrey. (MIT Licensed) + * https://github.com/markedjs/marked + */ +"use strict";function _defineProperties(e,t){for(var u=0;ue.length)&&(t=e.length);for(var u=0,n=new Array(t);u=e.length?{done:!0}:{done:!1,value:e[n++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function getDefaults(){return{baseUrl:null,breaks:!1,extensions:null,gfm:!0,headerIds:!0,headerPrefix:"",highlight:null,langPrefix:"language-",mangle:!0,pedantic:!1,renderer:null,sanitize:!1,sanitizer:null,silent:!1,smartLists:!1,smartypants:!1,tokenizer:null,walkTokens:null,xhtml:!1}}function changeDefaults(e){exports.defaults=e}Object.defineProperty(exports,"__esModule",{value:!0}),exports.defaults=getDefaults();var escapeTest=/[&<>"']/,escapeReplace=/[&<>"']/g,escapeTestNoEncode=/[<>"']|&(?!#?\w+;)/,escapeReplaceNoEncode=/[<>"']|&(?!#?\w+;)/g,escapeReplacements={"&":"&","<":"<",">":">",'"':""","'":"'"},getEscapeReplacement=function(e){return escapeReplacements[e]};function escape(e,t){if(t){if(escapeTest.test(e))return e.replace(escapeReplace,getEscapeReplacement)}else if(escapeTestNoEncode.test(e))return e.replace(escapeReplaceNoEncode,getEscapeReplacement);return e}var unescapeTest=/&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/gi;function unescape(e){return e.replace(unescapeTest,function(e,t){return"colon"===(t=t.toLowerCase())?":":"#"===t.charAt(0)?"x"===t.charAt(1)?String.fromCharCode(parseInt(t.substring(2),16)):String.fromCharCode(+t.substring(1)):""})}var caret=/(^|[^\[])\^/g;function edit(u,e){u=u.source||u,e=e||"";var n={replace:function(e,t){return t=(t=t.source||t).replace(caret,"$1"),u=u.replace(e,t),n},getRegex:function(){return new RegExp(u,e)}};return n}var nonWordAndColonTest=/[^\w:]/g,originIndependentUrl=/^$|^[a-z][a-z0-9+.-]*:|^[?#]/i;function cleanUrl(e,t,u){if(e){var n;try{n=decodeURIComponent(unescape(u)).replace(nonWordAndColonTest,"").toLowerCase()}catch(e){return null}if(0===n.indexOf("javascript:")||0===n.indexOf("vbscript:")||0===n.indexOf("data:"))return null}t&&!originIndependentUrl.test(u)&&(u=resolveUrl(t,u));try{u=encodeURI(u).replace(/%25/g,"%")}catch(e){return null}return u}var baseUrls={},justDomain=/^[^:]+:\/*[^/]*$/,protocol=/^([^:]+:)[\s\S]*$/,domain=/^([^:]+:\/*[^/]*)[\s\S]*$/;function resolveUrl(e,t){baseUrls[" "+e]||(justDomain.test(e)?baseUrls[" "+e]=e+"/":baseUrls[" "+e]=rtrim(e,"/",!0));var u=-1===(e=baseUrls[" "+e]).indexOf(":");return"//"===t.substring(0,2)?u?t:e.replace(protocol,"$1")+t:"/"===t.charAt(0)?u?t:e.replace(domain,"$1")+t:e+t}var noopTest={exec:function(){}};function merge(e){for(var t,u,n=1;nt)u.splice(t);else for(;u.length>=1,e+=e;return u+e}function outputLink(e,t,u,n){var r=t.href,i=t.title?escape(t.title):null,t=e[1].replace(/\\([\[\]])/g,"$1");if("!"===e[0].charAt(0))return{type:"image",raw:u,href:r,title:i,text:escape(t)};n.state.inLink=!0;t={type:"link",raw:u,href:r,title:i,text:t,tokens:n.inlineTokens(t,[])};return n.state.inLink=!1,t}function indentCodeCompensation(e,t){e=e.match(/^(\s+)(?:```)/);if(null===e)return t;var u=e[1];return t.split("\n").map(function(e){var t=e.match(/^\s+/);return null!==t&&t[0].length>=u.length?e.slice(u.length):e}).join("\n")}var Tokenizer=function(){function e(e){this.options=e||exports.defaults}var t=e.prototype;return t.space=function(e){e=this.rules.block.newline.exec(e);if(e)return 1 ?/gm,"");return{type:"blockquote",raw:t[0],tokens:this.lexer.blockTokens(e,[]),text:e}}},t.list=function(e){var t=this.rules.block.list.exec(e);if(t){var u,n,r,i,s,l,a,o,D,c=1<(h=t[1].trim()).length,p={type:"list",raw:"",ordered:c,start:c?+h.slice(0,-1):"",loose:!1,items:[]},h=c?"\\d{1,9}\\"+h.slice(-1):"\\"+h;this.options.pedantic&&(h=c?h:"[*+-]");for(var g=new RegExp("^( {0,3}"+h+")((?: [^\\n]*| *)(?:\\n[^\\n]*)*(?:\\n|$))");e&&!this.rules.block.hr.test(e)&&(t=g.exec(e));){o=t[2].split("\n"),D=this.options.pedantic?(i=2,o[0].trimLeft()):(i=t[2].search(/[^ ]/),i=t[1].length+(4=i)&&a.trim()){u=t[1]+o.slice(0,f).join("\n")+"\n";break}D+="\n"+a.slice(i)}else a.trim()||(s=!0),a.search(/[^ ]/)>=i?D+="\n"+a.slice(i):D+="\n"+a}p.loose||(l?p.loose=!0:/\n *\n *$/.test(u)&&(l=!0)),this.options.gfm&&(n=/^\[[ xX]\] /.exec(D))&&(r="[ ] "!==n[0],D=D.replace(/^\[[ xX]\] +/,"")),p.items.push({type:"list_item",raw:u,task:!!n,checked:r,loose:!1,text:D}),p.raw+=u,e=e.slice(u.length)}p.items[p.items.length-1].raw=u.trimRight(),p.items[p.items.length-1].text=D.trimRight(),p.raw=p.raw.trimRight();var d=p.items.length;for(f=0;f/i.test(e[0])&&(this.lexer.state.inLink=!1),!this.lexer.state.inRawBlock&&/^<(pre|code|kbd|script)(\s|>)/i.test(e[0])?this.lexer.state.inRawBlock=!0:this.lexer.state.inRawBlock&&/^<\/(pre|code|kbd|script)(\s|>)/i.test(e[0])&&(this.lexer.state.inRawBlock=!1),{type:this.options.sanitize?"text":"html",raw:e[0],inLink:this.lexer.state.inLink,inRawBlock:this.lexer.state.inRawBlock,text:this.options.sanitize?this.options.sanitizer?this.options.sanitizer(e[0]):escape(e[0]):e[0]}},t.link=function(e){var t=this.rules.inline.link.exec(e);if(t){var u=t[2].trim();if(!this.options.pedantic&&/^$/.test(u))return;e=rtrim(u.slice(0,-1),"\\");if((u.length-e.length)%2==0)return}else{var n=findClosingBracket(t[2],"()");-1$/.test(u)?n.slice(1):n.slice(1,-1):n)&&n.replace(this.rules.inline._escapes,"$1"),title:i&&i.replace(this.rules.inline._escapes,"$1")},t[0],this.lexer)}},t.reflink=function(e,t){if((u=this.rules.inline.reflink.exec(e))||(u=this.rules.inline.nolink.exec(e))){e=(u[2]||u[1]).replace(/\s+/g," ");if((e=t[e.toLowerCase()])&&e.href)return outputLink(u,e,u[0],this.lexer);var u=u[0].charAt(0);return{type:"text",raw:u,text:u}}},t.emStrong=function(e,t,u){void 0===u&&(u="");var n=this.rules.inline.emStrong.lDelim.exec(e);if(n&&(!n[3]||!u.match(/(?:[0-9A-Za-z\xAA\xB2\xB3\xB5\xB9\xBA\xBC-\xBE\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0560-\u0588\u05D0-\u05EA\u05EF-\u05F2\u0620-\u064A\u0660-\u0669\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07C0-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u0860-\u086A\u0870-\u0887\u0889-\u088E\u08A0-\u08C9\u0904-\u0939\u093D\u0950\u0958-\u0961\u0966-\u096F\u0971-\u0980\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09E6-\u09F1\u09F4-\u09F9\u09FC\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A66-\u0A6F\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0AE6-\u0AEF\u0AF9\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B66-\u0B6F\u0B71-\u0B77\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0BE6-\u0BF2\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D\u0C58-\u0C5A\u0C5D\u0C60\u0C61\u0C66-\u0C6F\u0C78-\u0C7E\u0C80\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDD\u0CDE\u0CE0\u0CE1\u0CE6-\u0CEF\u0CF1\u0CF2\u0D04-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D54-\u0D56\u0D58-\u0D61\u0D66-\u0D78\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DE6-\u0DEF\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E86-\u0E8A\u0E8C-\u0EA3\u0EA5\u0EA7-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F20-\u0F33\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F-\u1049\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u1090-\u1099\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1369-\u137C\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u1711\u171F-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u17E0-\u17E9\u17F0-\u17F9\u1810-\u1819\u1820-\u1878\u1880-\u1884\u1887-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191E\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A16\u1A20-\u1A54\u1A80-\u1A89\u1A90-\u1A99\u1AA7\u1B05-\u1B33\u1B45-\u1B4C\u1B50-\u1B59\u1B83-\u1BA0\u1BAE-\u1BE5\u1C00-\u1C23\u1C40-\u1C49\u1C4D-\u1C7D\u1C80-\u1C88\u1C90-\u1CBA\u1CBD-\u1CBF\u1CE9-\u1CEC\u1CEE-\u1CF3\u1CF5\u1CF6\u1CFA\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2070\u2071\u2074-\u2079\u207F-\u2089\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2150-\u2189\u2460-\u249B\u24EA-\u24FF\u2776-\u2793\u2C00-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2CFD\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312F\u3131-\u318E\u3192-\u3195\u31A0-\u31BF\u31F0-\u31FF\u3220-\u3229\u3248-\u324F\u3251-\u325F\u3280-\u3289\u32B1-\u32BF\u3400-\u4DBF\u4E00-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66E\uA67F-\uA69D\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B-\uA7CA\uA7D0\uA7D1\uA7D3\uA7D5-\uA7D9\uA7F2-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA830-\uA835\uA840-\uA873\uA882-\uA8B3\uA8D0-\uA8D9\uA8F2-\uA8F7\uA8FB\uA8FD\uA8FE\uA900-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF-\uA9D9\uA9E0-\uA9E4\uA9E6-\uA9FE\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA50-\uAA59\uAA60-\uAA76\uAA7A\uAA7E-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB69\uAB70-\uABE2\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD07-\uDD33\uDD40-\uDD78\uDD8A\uDD8B\uDE80-\uDE9C\uDEA0-\uDED0\uDEE1-\uDEFB\uDF00-\uDF23\uDF2D-\uDF4A\uDF50-\uDF75\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDCB0-\uDCD3\uDCD8-\uDCFB\uDD00-\uDD27\uDD30-\uDD63\uDD70-\uDD7A\uDD7C-\uDD8A\uDD8C-\uDD92\uDD94\uDD95\uDD97-\uDDA1\uDDA3-\uDDB1\uDDB3-\uDDB9\uDDBB\uDDBC\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67\uDF80-\uDF85\uDF87-\uDFB0\uDFB2-\uDFBA]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC58-\uDC76\uDC79-\uDC9E\uDCA7-\uDCAF\uDCE0-\uDCF2\uDCF4\uDCF5\uDCFB-\uDD1B\uDD20-\uDD39\uDD80-\uDDB7\uDDBC-\uDDCF\uDDD2-\uDE00\uDE10-\uDE13\uDE15-\uDE17\uDE19-\uDE35\uDE40-\uDE48\uDE60-\uDE7E\uDE80-\uDE9F\uDEC0-\uDEC7\uDEC9-\uDEE4\uDEEB-\uDEEF\uDF00-\uDF35\uDF40-\uDF55\uDF58-\uDF72\uDF78-\uDF91\uDFA9-\uDFAF]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2\uDCFA-\uDD23\uDD30-\uDD39\uDE60-\uDE7E\uDE80-\uDEA9\uDEB0\uDEB1\uDF00-\uDF27\uDF30-\uDF45\uDF51-\uDF54\uDF70-\uDF81\uDFB0-\uDFCB\uDFE0-\uDFF6]|\uD804[\uDC03-\uDC37\uDC52-\uDC6F\uDC71\uDC72\uDC75\uDC83-\uDCAF\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD03-\uDD26\uDD36-\uDD3F\uDD44\uDD47\uDD50-\uDD72\uDD76\uDD83-\uDDB2\uDDC1-\uDDC4\uDDD0-\uDDDA\uDDDC\uDDE1-\uDDF4\uDE00-\uDE11\uDE13-\uDE2B\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEDE\uDEF0-\uDEF9\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3D\uDF50\uDF5D-\uDF61]|\uD805[\uDC00-\uDC34\uDC47-\uDC4A\uDC50-\uDC59\uDC5F-\uDC61\uDC80-\uDCAF\uDCC4\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDAE\uDDD8-\uDDDB\uDE00-\uDE2F\uDE44\uDE50-\uDE59\uDE80-\uDEAA\uDEB8\uDEC0-\uDEC9\uDF00-\uDF1A\uDF30-\uDF3B\uDF40-\uDF46]|\uD806[\uDC00-\uDC2B\uDCA0-\uDCF2\uDCFF-\uDD06\uDD09\uDD0C-\uDD13\uDD15\uDD16\uDD18-\uDD2F\uDD3F\uDD41\uDD50-\uDD59\uDDA0-\uDDA7\uDDAA-\uDDD0\uDDE1\uDDE3\uDE00\uDE0B-\uDE32\uDE3A\uDE50\uDE5C-\uDE89\uDE9D\uDEB0-\uDEF8]|\uD807[\uDC00-\uDC08\uDC0A-\uDC2E\uDC40\uDC50-\uDC6C\uDC72-\uDC8F\uDD00-\uDD06\uDD08\uDD09\uDD0B-\uDD30\uDD46\uDD50-\uDD59\uDD60-\uDD65\uDD67\uDD68\uDD6A-\uDD89\uDD98\uDDA0-\uDDA9\uDEE0-\uDEF2\uDFB0\uDFC0-\uDFD4]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|\uD80B[\uDF90-\uDFF0]|[\uD80C\uD81C-\uD820\uD822\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872\uD874-\uD879\uD880-\uD883][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDE70-\uDEBE\uDEC0-\uDEC9\uDED0-\uDEED\uDF00-\uDF2F\uDF40-\uDF43\uDF50-\uDF59\uDF5B-\uDF61\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDE40-\uDE96\uDF00-\uDF4A\uDF50\uDF93-\uDF9F\uDFE0\uDFE1\uDFE3]|\uD821[\uDC00-\uDFF7]|\uD823[\uDC00-\uDCD5\uDD00-\uDD08]|\uD82B[\uDFF0-\uDFF3\uDFF5-\uDFFB\uDFFD\uDFFE]|\uD82C[\uDC00-\uDD22\uDD50-\uDD52\uDD64-\uDD67\uDD70-\uDEFB]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99]|\uD834[\uDEE0-\uDEF3\uDF60-\uDF78]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD837[\uDF00-\uDF1E]|\uD838[\uDD00-\uDD2C\uDD37-\uDD3D\uDD40-\uDD49\uDD4E\uDE90-\uDEAD\uDEC0-\uDEEB\uDEF0-\uDEF9]|\uD839[\uDFE0-\uDFE6\uDFE8-\uDFEB\uDFED\uDFEE\uDFF0-\uDFFE]|\uD83A[\uDC00-\uDCC4\uDCC7-\uDCCF\uDD00-\uDD43\uDD4B\uDD50-\uDD59]|\uD83B[\uDC71-\uDCAB\uDCAD-\uDCAF\uDCB1-\uDCB4\uDD01-\uDD2D\uDD2F-\uDD3D\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD83C[\uDD00-\uDD0C]|\uD83E[\uDFF0-\uDFF9]|\uD869[\uDC00-\uDEDF\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF38\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1\uDEB0-\uDFFF]|\uD87A[\uDC00-\uDFE0]|\uD87E[\uDC00-\uDE1D]|\uD884[\uDC00-\uDF4A])/))){var r=n[1]||n[2]||"";if(!r||""===u||this.rules.inline.punctuation.exec(u)){var i,s=n[0].length-1,l=s,a=0,o="*"===n[0][0]?this.rules.inline.emStrong.rDelimAst:this.rules.inline.emStrong.rDelimUnd;for(o.lastIndex=0,t=t.slice(-1*e.length+s);null!=(n=o.exec(t));)if(i=n[1]||n[2]||n[3]||n[4]||n[5]||n[6])if(i=i.length,n[3]||n[4])l+=i;else if(!((n[5]||n[6])&&s%3)||(s+i)%3){if(!(0<(l-=i))){if(i=Math.min(i,i+l+a),Math.min(s,i)%2){var D=e.slice(1,s+n.index+i);return{type:"em",raw:e.slice(0,s+n.index+i+1),text:D,tokens:this.lexer.inlineTokens(D,[])}}D=e.slice(2,s+n.index+i-1);return{type:"strong",raw:e.slice(0,s+n.index+i+1),text:D,tokens:this.lexer.inlineTokens(D,[])}}}else a+=i}}},t.codespan=function(e){var t=this.rules.inline.code.exec(e);if(t){var u=t[2].replace(/\n/g," "),n=/[^ ]/.test(u),e=/^ /.test(u)&&/ $/.test(u),u=escape(u=n&&e?u.substring(1,u.length-1):u,!0);return{type:"codespan",raw:t[0],text:u}}},t.br=function(e){e=this.rules.inline.br.exec(e);if(e)return{type:"br",raw:e[0]}},t.del=function(e){e=this.rules.inline.del.exec(e);if(e)return{type:"del",raw:e[0],text:e[2],tokens:this.lexer.inlineTokens(e[2],[])}},t.autolink=function(e,t){e=this.rules.inline.autolink.exec(e);if(e){var u,t="@"===e[2]?"mailto:"+(u=escape(this.options.mangle?t(e[1]):e[1])):u=escape(e[1]);return{type:"link",raw:e[0],text:u,href:t,tokens:[{type:"text",raw:u,text:u}]}}},t.url=function(e,t){var u,n,r,i;if(u=this.rules.inline.url.exec(e)){if("@"===u[2])r="mailto:"+(n=escape(this.options.mangle?t(u[0]):u[0]));else{for(;i=u[0],u[0]=this.rules.inline._backpedal.exec(u[0])[0],i!==u[0];);n=escape(u[0]),r="www."===u[1]?"http://"+n:n}return{type:"link",raw:u[0],text:n,href:r,tokens:[{type:"text",raw:n,text:n}]}}},t.inlineText=function(e,t){e=this.rules.inline.text.exec(e);if(e){t=this.lexer.state.inRawBlock?this.options.sanitize?this.options.sanitizer?this.options.sanitizer(e[0]):escape(e[0]):e[0]:escape(this.options.smartypants?t(e[0]):e[0]);return{type:"text",raw:e[0],text:t}}},e}(),block={newline:/^(?: *(?:\n|$))+/,code:/^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/,fences:/^ {0,3}(`{3,}(?=[^`\n]*\n)|~{3,})([^\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?=\n|$)|$)/,hr:/^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,heading:/^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/,blockquote:/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,list:/^( {0,3}bull)( [^\n]+?)?(?:\n|$)/,html:"^ {0,3}(?:<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:[^\\n]*\\n+|$)|comment[^\\n]*(\\n+|$)|<\\?[\\s\\S]*?(?:\\?>\\n*|$)|\\n*|$)|\\n*|$)|)[\\s\\S]*?(?:(?:\\n *)+\\n|$)|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)|(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$))",def:/^ {0,3}\[(label)\]: *\n? *]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,table:noopTest,lheading:/^([^\n]+)\n {0,3}(=+|-+) *(?:\n+|$)/,_paragraph:/^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html| +\n)[^\n]+)*)/,text:/^[^\n]+/,_label:/(?!\s*\])(?:\\[\[\]]|[^\[\]])+/,_title:/(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/};block.def=edit(block.def).replace("label",block._label).replace("title",block._title).getRegex(),block.bullet=/(?:[*+-]|\d{1,9}[.)])/,block.listItemStart=edit(/^( *)(bull) */).replace("bull",block.bullet).getRegex(),block.list=edit(block.list).replace(/bull/g,block.bullet).replace("hr","\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$))").replace("def","\\n+(?="+block.def.source+")").getRegex(),block._tag="address|article|aside|base|basefont|blockquote|body|caption|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option|p|param|section|source|summary|table|tbody|td|tfoot|th|thead|title|tr|track|ul",block._comment=/|$)/,block.html=edit(block.html,"i").replace("comment",block._comment).replace("tag",block._tag).replace("attribute",/ +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/).getRegex(),block.paragraph=edit(block._paragraph).replace("hr",block.hr).replace("heading"," {0,3}#{1,6} ").replace("|lheading","").replace("blockquote"," {0,3}>").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html",")|<(?:script|pre|style|textarea|!--)").replace("tag",block._tag).getRegex(),block.blockquote=edit(block.blockquote).replace("paragraph",block.paragraph).getRegex(),block.normal=merge({},block),block.gfm=merge({},block.normal,{table:"^ *([^\\n ].*\\|.*)\\n {0,3}(?:\\| *)?(:?-+:? *(?:\\| *:?-+:? *)*)(?:\\| *)?(?:\\n((?:(?! *\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)"}),block.gfm.table=edit(block.gfm.table).replace("hr",block.hr).replace("heading"," {0,3}#{1,6} ").replace("blockquote"," {0,3}>").replace("code"," {4}[^\\n]").replace("fences"," {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n").replace("list"," {0,3}(?:[*+-]|1[.)]) ").replace("html",")|<(?:script|pre|style|textarea|!--)").replace("tag",block._tag).getRegex(),block.pedantic=merge({},block.normal,{html:edit("^ *(?:comment *(?:\\n|\\s*$)|<(tag)[\\s\\S]+? *(?:\\n{2,}|\\s*$)|\\s]*)*?/?> *(?:\\n{2,}|\\s*$))").replace("comment",block._comment).replace(/tag/g,"(?!(?:a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b").getRegex(),def:/^ *\[([^\]]+)\]: *]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/,heading:/^(#{1,6})(.*)(?:\n+|$)/,fences:noopTest,paragraph:edit(block.normal._paragraph).replace("hr",block.hr).replace("heading"," *#{1,6} *[^\n]").replace("lheading",block.lheading).replace("blockquote"," {0,3}>").replace("|fences","").replace("|list","").replace("|html","").getRegex()});var inline={escape:/^\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/,autolink:/^<(scheme:[^\s\x00-\x1f<>]*|email)>/,url:noopTest,tag:"^comment|^|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>|^<\\?[\\s\\S]*?\\?>|^|^",link:/^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/,reflink:/^!?\[(label)\]\[(?!\s*\])((?:\\[\[\]]?|[^\[\]\\])+)\]/,nolink:/^!?\[(?!\s*\])((?:\[[^\[\]]*\]|\\[\[\]]|[^\[\]])*)\](?:\[\])?/,reflinkSearch:"reflink|nolink(?!\\()",emStrong:{lDelim:/^(?:\*+(?:([punct_])|[^\s*]))|^_+(?:([punct*])|([^\s_]))/,rDelimAst:/^[^_*]*?\_\_[^_*]*?\*[^_*]*?(?=\_\_)|[punct_](\*+)(?=[\s]|$)|[^punct*_\s](\*+)(?=[punct_\s]|$)|[punct_\s](\*+)(?=[^punct*_\s])|[\s](\*+)(?=[punct_])|[punct_](\*+)(?=[punct_])|[^punct*_\s](\*+)(?=[^punct*_\s])/,rDelimUnd:/^[^_*]*?\*\*[^_*]*?\_[^_*]*?(?=\*\*)|[punct*](\_+)(?=[\s]|$)|[^punct*_\s](\_+)(?=[punct*\s]|$)|[punct*\s](\_+)(?=[^punct*_\s])|[\s](\_+)(?=[punct*])|[punct*](\_+)(?=[punct*])/},code:/^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/,br:/^( {2,}|\\)\n(?!\s*$)/,del:noopTest,text:/^(`+|[^`])(?:(?= {2,}\n)|[\s\S]*?(?:(?=[\\?@\\[\\]`^{|}~",inline.punctuation=edit(inline.punctuation).replace(/punctuation/g,inline._punctuation).getRegex(),inline.blockSkip=/\[[^\]]*?\]\([^\)]*?\)|`[^`]*?`|<[^>]*?>/g,inline.escapedEmSt=/\\\*|\\_/g,inline._comment=edit(block._comment).replace("(?:--\x3e|$)","--\x3e").getRegex(),inline.emStrong.lDelim=edit(inline.emStrong.lDelim).replace(/punct/g,inline._punctuation).getRegex(),inline.emStrong.rDelimAst=edit(inline.emStrong.rDelimAst,"g").replace(/punct/g,inline._punctuation).getRegex(),inline.emStrong.rDelimUnd=edit(inline.emStrong.rDelimUnd,"g").replace(/punct/g,inline._punctuation).getRegex(),inline._escapes=/\\([!"#$%&'()*+,\-./:;<=>?@\[\]\\^_`{|}~])/g,inline._scheme=/[a-zA-Z][a-zA-Z0-9+.-]{1,31}/,inline._email=/[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/,inline.autolink=edit(inline.autolink).replace("scheme",inline._scheme).replace("email",inline._email).getRegex(),inline._attribute=/\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/,inline.tag=edit(inline.tag).replace("comment",inline._comment).replace("attribute",inline._attribute).getRegex(),inline._label=/(?:\[(?:\\.|[^\[\]\\])*\]|\\.|`[^`]*`|[^\[\]\\`])*?/,inline._href=/<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/,inline._title=/"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/,inline.link=edit(inline.link).replace("label",inline._label).replace("href",inline._href).replace("title",inline._title).getRegex(),inline.reflink=edit(inline.reflink).replace("label",inline._label).getRegex(),inline.reflinkSearch=edit(inline.reflinkSearch,"g").replace("reflink",inline.reflink).replace("nolink",inline.nolink).getRegex(),inline.normal=merge({},inline),inline.pedantic=merge({},inline.normal,{strong:{start:/^__|\*\*/,middle:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,endAst:/\*\*(?!\*)/g,endUnd:/__(?!_)/g},em:{start:/^_|\*/,middle:/^()\*(?=\S)([\s\S]*?\S)\*(?!\*)|^_(?=\S)([\s\S]*?\S)_(?!_)/,endAst:/\*(?!\*)/g,endUnd:/_(?!_)/g},link:edit(/^!?\[(label)\]\((.*?)\)/).replace("label",inline._label).getRegex(),reflink:edit(/^!?\[(label)\]\s*\[([^\]]*)\]/).replace("label",inline._label).getRegex()}),inline.gfm=merge({},inline.normal,{escape:edit(inline.escape).replace("])","~|])").getRegex(),_extended_email:/[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/,url:/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9\-]+\.?)+[^\s<]*|^email/,_backpedal:/(?:[^?!.,:;*_~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_~)]+(?!$))+/,del:/^(~~?)(?=[^\s~])([\s\S]*?[^\s~])\1(?=[^~]|$)/,text:/^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)|[\s\S]*?(?:(?=[\\'+(u?e:escape(e,!0))+"\n":"
"+(u?e:escape(e,!0))+"
\n"},t.blockquote=function(e){return"
\n"+e+"
\n"},t.html=function(e){return e},t.heading=function(e,t,u,n){return this.options.headerIds?"'+e+"\n":""+e+"\n"},t.hr=function(){return this.options.xhtml?"
\n":"
\n"},t.list=function(e,t,u){var n=t?"ol":"ul";return"<"+n+(t&&1!==u?' start="'+u+'"':"")+">\n"+e+"\n"},t.listitem=function(e){return"
  • "+e+"
  • \n"},t.checkbox=function(e){return" "},t.paragraph=function(e){return"

    "+e+"

    \n"},t.table=function(e,t){return"\n\n"+e+"\n"+(t=t&&""+t+"")+"
    \n"},t.tablerow=function(e){return"\n"+e+"\n"},t.tablecell=function(e,t){var u=t.header?"th":"td";return(t.align?"<"+u+' align="'+t.align+'">':"<"+u+">")+e+"\n"},t.strong=function(e){return""+e+""},t.em=function(e){return""+e+""},t.codespan=function(e){return""+e+""},t.br=function(){return this.options.xhtml?"
    ":"
    "},t.del=function(e){return""+e+""},t.link=function(e,t,u){if(null===(e=cleanUrl(this.options.sanitize,this.options.baseUrl,e)))return u;e='"},t.image=function(e,t,u){if(null===(e=cleanUrl(this.options.sanitize,this.options.baseUrl,e)))return u;u=''+u+'":">"},t.text=function(e){return e},e}(),TextRenderer=function(){function e(){}var t=e.prototype;return t.strong=function(e){return e},t.em=function(e){return e},t.codespan=function(e){return e},t.del=function(e){return e},t.html=function(e){return e},t.text=function(e){return e},t.link=function(e,t,u){return""+u},t.image=function(e,t,u){return""+u},t.br=function(){return""},e}(),Slugger=function(){function e(){this.seen={}}var t=e.prototype;return t.serialize=function(e){return e.toLowerCase().trim().replace(/<[!\/a-z].*?>/gi,"").replace(/[\u2000-\u206F\u2E00-\u2E7F\\'!"#$%&()*+,./:;<=>?@[\]^`{|}~]/g,"").replace(/\s/g,"-")},t.getNextSafeSlug=function(e,t){var u=e,n=0;if(this.seen.hasOwnProperty(u))for(n=this.seen[e];u=e+"-"+ ++n,this.seen.hasOwnProperty(u););return t||(this.seen[e]=n,this.seen[u]=0),u},t.slug=function(e,t){void 0===t&&(t={});var u=this.serialize(e);return this.getNextSafeSlug(u,t.dryrun)},e}(),Parser=function(){function u(e){this.options=e||exports.defaults,this.options.renderer=this.options.renderer||new Renderer,this.renderer=this.options.renderer,this.renderer.options=this.options,this.textRenderer=new TextRenderer,this.slugger=new Slugger}u.parse=function(e,t){return new u(t).parse(e)},u.parseInline=function(e,t){return new u(t).parseInline(e)};var e=u.prototype;return e.parse=function(e,t){void 0===t&&(t=!0);for(var u,n,r,i,s,l,a,o,D,c,p,h,g,k,f,d,F="",A=e.length,C=0;CAn error occurred:

    "+escape(e.message+"",!0)+"
    ";throw e}}marked.options=marked.setOptions=function(e){return merge(marked.defaults,e),changeDefaults(marked.defaults),marked},marked.getDefaults=getDefaults,marked.defaults=exports.defaults,marked.use=function(){for(var e=arguments.length,t=new Array(e),u=0;uAn error occurred:

    "+escape(e.message+"",!0)+"
    ";throw e}},marked.Parser=Parser,marked.parser=Parser.parse,marked.Renderer=Renderer,marked.TextRenderer=TextRenderer,marked.Lexer=Lexer,marked.lexer=Lexer.lex,marked.Tokenizer=Tokenizer,marked.Slugger=Slugger;var options=(marked.parse=marked).options,setOptions=marked.setOptions,use=marked.use,walkTokens=marked.walkTokens,parseInline=marked.parseInline,parse=marked,parser=Parser.parse,lexer=Lexer.lex;exports.Lexer=Lexer,exports.Parser=Parser,exports.Renderer=Renderer,exports.Slugger=Slugger,exports.TextRenderer=TextRenderer,exports.Tokenizer=Tokenizer,exports.getDefaults=getDefaults,exports.lexer=lexer,exports.marked=marked,exports.options=options,exports.parse=parse,exports.parseInline=parseInline,exports.parser=parser,exports.setOptions=setOptions,exports.use=use,exports.walkTokens=walkTokens; \ No newline at end of file diff --git a/hive-fr0nt/assets/terminal.css b/hive-fr0nt/assets/terminal.css index 62f33d6..6b173e3 100644 --- a/hive-fr0nt/assets/terminal.css +++ b/hive-fr0nt/assets/terminal.css @@ -60,41 +60,54 @@ from { opacity: 0; transform: translateY(4px); } to { opacity: 1; transform: translateY(0); } } +/* Unified prefix column for every row kind. The glyph (`→ ← · ◆ ✓ ✗ ⌁ !`) + is the first character of the row's text content; `padding-left` reserves + the column and `text-indent: -1.4em` pulls the glyph back into it. Wrapped + continuation lines then start under the body, not under the glyph, so + wraps don't blur into the next row. `details.row` summaries reuse the + same metrics below. */ .live .row { white-space: pre-wrap; word-break: break-word; padding: 0.05em 0; line-height: 1.45; border-left: 2px solid transparent; - padding-left: 0.5em; + padding-left: 1.9em; + text-indent: -1.4em; margin: 0.1em 0; } .live .row + .row { border-top: 0; } /* Row-kind colours. Pages register renderers that emit these classes; - any class no page emits is just dead CSS, which is fine. */ -.live .turn-start { - color: var(--amber); - font-weight: bold; - margin-top: 1em; - border-left-color: var(--amber); - padding-top: 0.3em; -} -.live .turn-start:first-child { margin-top: 0; } -.live .turn-body { - color: var(--fg); - font-weight: normal; - margin-top: 0.15em; - padding-left: 1.2em; - opacity: 0.85; -} -.live .turn-end-ok { color: var(--green); border-left-color: var(--green); margin-bottom: 0.4em; } -.live .turn-end-fail { color: var(--red); border-left-color: var(--red); margin-bottom: 0.4em; } -.live .text { color: var(--fg); padding-left: 1.2em; } -.live .thinking { color: var(--muted); font-style: italic; padding-left: 1.2em; } -.live .tool-use { color: var(--cyan); padding-left: 1.2em; } -.live .tool-result { color: var(--muted); padding-left: 1.2em; } -.live .result { color: var(--green); padding-left: 0.5em; } -.live .sys, .live .note { color: var(--muted); } + any class no page emits is just dead CSS, which is fine. Turn-framing + classes carry their signal entirely on the coloured border-left rule — + no bold, no top/bottom margins, no background tint. The chrome was + overweight for what's just a "this is a boundary" marker. */ +.live .turn-start { color: var(--amber); border-left-color: var(--amber); } +/* turn-body is a child block under turn-start carrying the wake-prompt + body; reset text-indent so wrapped content stays under its own column + instead of pulling back into the parent's prefix. */ +.live .turn-body { color: var(--fg); text-indent: 0; margin-top: 0.15em; } +/* Any child block (markdown body, nested details) resets the parent + row's hanging indent so the content lays out from column 0 of the + body area. */ +.live .row .md, .live .row > details { text-indent: 0; } +.live .turn-end-ok { color: var(--green); border-left-color: var(--green); } +.live .turn-end-fail { color: var(--red); border-left-color: var(--red); } +.live .text { color: var(--fg); } +.live .thinking { color: var(--muted); font-style: italic; } +.live .tool-use { color: var(--cyan); } +.live .tool-result { color: var(--muted); } +.live .result { color: var(--green); } +.live .note { color: var(--muted); } +/* Distinguish stderr lines (orange) and operator-initiated notes + (mauve, lightly emphasised) from ambient harness chatter so the + eye picks out anomalies + operator actions in the scrollback. */ +.live .note.stderr { color: var(--amber); } +.live .note.op { color: var(--purple); font-style: italic; } +/* The .sys catch-all fires when renderStream landed an event shape it + couldn't classify. Make it visually loud so silently-dropped event + types surface for follow-up. */ +.live .sys { color: var(--amber); } .live .unread-badge { color: var(--amber); font-weight: normal; @@ -137,28 +150,31 @@ pointer-events: auto; } .tail-pill:hover { filter: brightness(1.1); } +/* Expandable rows reuse the flat-row prefix metrics (padding-left + + negative text-indent) so the disclosure glyph (`▸ / ▾`) lands in + exactly the same column as flat-row prefix glyphs (`→ ← · ◆ ✓ ✗`). + Summary text omits the per-row directional glyph (the row colour + already carries cyan = outbound tool, muted = inbound result) so + the prefix column doesn't have to fit two glyphs side-by-side. */ details.row { white-space: normal; - padding-left: 0.5em; } details.row > summary { cursor: pointer; - color: var(--muted); list-style: none; white-space: pre-wrap; word-break: break-word; } details.row > summary::before { content: '▸ '; - color: var(--muted); - display: inline-block; - width: 1em; + color: inherit; } details.row[open] > summary::before { content: '▾ '; } -details.row.tool-result-block > summary { color: var(--muted); } -details.row > pre.diff-body { - margin: 0.3em 0 0.4em 1.2em; +details.row > pre.diff-body, +details.row > pre.tool-body { + margin: 0.3em 0 0.4em 0; padding: 0.4em 0.6em; + text-indent: 0; background: rgba(255, 255, 255, 0.02); border-left: 2px solid var(--purple-dim); white-space: pre-wrap; @@ -166,17 +182,44 @@ details.row > pre.diff-body { max-height: 22em; overflow-y: auto; } +details.row > pre.tool-body { color: var(--fg); } details.row > pre.diff-body .diff-add { color: var(--green); } details.row > pre.diff-body .diff-del { color: var(--red); } details.row > pre.diff-body .diff-ctx { color: var(--fg); } -details.row > pre.tool-body { - margin: 0.3em 0 0.4em 1.2em; +/* Markdown body inside a row (assistant text, send/recv/ask/answer + message bodies). Inline elements get muted accents; block elements + reset the parent row's hanging indent so content lays out cleanly. */ +.live .row .md p { margin: 0.2em 0; } +.live .row .md p:first-child { margin-top: 0; } +.live .row .md p:last-child { margin-bottom: 0; } +.live .row .md code { + background: rgba(255, 255, 255, 0.06); + padding: 0.05em 0.3em; + border-radius: 3px; + font-size: 0.95em; +} +.live .row .md pre { + margin: 0.3em 0; padding: 0.4em 0.6em; - background: rgba(255, 255, 255, 0.03); + background: rgba(255, 255, 255, 0.04); border-left: 2px solid var(--purple-dim); - color: var(--fg); + text-indent: 0; white-space: pre-wrap; word-break: break-word; - max-height: 22em; - overflow-y: auto; +} +.live .row .md pre code { + background: transparent; + padding: 0; + border-radius: 0; +} +.live .row .md a { color: var(--cyan); text-decoration: underline; } +.live .row .md strong { color: inherit; font-weight: bold; } +.live .row .md em { color: inherit; font-style: italic; } +.live .row .md ul, .live .row .md ol { margin: 0.2em 0 0.2em 1.4em; padding: 0; } +.live .row .md li { margin: 0.05em 0; } +.live .row .md blockquote { + margin: 0.2em 0; + padding-left: 0.6em; + border-left: 2px solid var(--purple-dim); + color: var(--muted); } diff --git a/hive-fr0nt/src/lib.rs b/hive-fr0nt/src/lib.rs index 8bec6aa..87f9aae 100644 --- a/hive-fr0nt/src/lib.rs +++ b/hive-fr0nt/src/lib.rs @@ -32,3 +32,11 @@ pub const BASE_CSS: &str = include_str!("../assets/base.css"); pub const TERMINAL_CSS: &str = include_str!("../assets/terminal.css"); pub const TERMINAL_JS: &str = include_str!("../assets/terminal.js"); +/// Vendored [marked](https://github.com/markedjs/marked) v4.0.2 UMD bundle. +/// Exposes a global `marked` with `.parse(src, opts)` returning HTML. Used +/// by the per-agent terminal to render message bodies (`send` / `recv` / +/// `ask` / `answer` / assistant text) with basic markdown — paragraphs, +/// lists, fenced + inline code, bold/italic, links. Vendored rather than +/// CDN-loaded so the per-agent page works on operator machines without +/// internet egress (the container itself never fetches it). +pub const MARKED_JS: &str = include_str!("../assets/marked.min.js");