@mjasnikovs/pi-task 0.17.20 → 0.17.22

package/README.md

@@ -7,7 +7,7 @@
 **Deterministic spec-orchestration for local models — with bundled web, docs, fetch, and worker sub-agent tools.**
 
 [![npm](https://img.shields.io/npm/v/@mjasnikovs/pi-task?color=cb3837&logo=npm)](https://www.npmjs.com/package/@mjasnikovs/pi-task)
-[![license](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE)
+[![license](https://img.shields.io/badge/license-AGPL--3.0-blue.svg)](./LICENSE)
 [![pi extension](https://img.shields.io/badge/pi-extension-7c3aed)](https://www.npmjs.com/package/@earendil-works/pi-coding-agent)
 [![tests](https://img.shields.io/badge/tests-993%20passing-3fb950)](#development)
 [![types](https://img.shields.io/badge/TypeScript-strict-3178c6?logo=typescript&logoColor=white)](./tsconfig.json)
@@ -177,4 +177,12 @@ Built with [Bun](https://bun.sh), TypeScript (strict), and [TypeBox](https://git
 
 ## License
 
-[MIT](./LICENSE) © Edgars Mjasnikovs
+[AGPL-3.0-only](./LICENSE) © Edgars Mjasnikovs
+
+Free and open source under the GNU Affero General Public License v3.0: you may
+use, modify, and redistribute it, but any modified version you run — **including
+over a network as a hosted service** — must make its complete source available
+under the same license. Contributions are accepted under the
+[Contributor License Agreement](./CLA.md), which allows dual-licensing;
+for a commercial license that does not carry the AGPL's copyleft obligations,
+contact the author.

package/dist/remote/history.d.ts

@@ -11,6 +11,8 @@ export interface ToolPart {
     isError: boolean;
     /** false while the tool is still running (result not in yet). */
     done: boolean;
+    /** Wall-clock duration once finished, shown dimly in the tool summary. */
+    elapsedMs?: number;
 }
 export type Part = TextPart | ToolPart;
 export interface Turn {

package/dist/remote/session-state.d.ts

@@ -24,6 +24,9 @@ interface SessionState {
     taskWidget: string[] | null;
     prompt: PromptMessage | null;
     context: ContextUsage | null;
+    /** tool start timestamps (ms), keyed by toolCallId — kept off the serialized
+     *  parts so it never reaches the client; used only to compute elapsedMs. */
+    toolStarts: Record<string, number>;
     /** Broadcast sink — swapped in tests via _setSink. */
     sink: (msg: unknown) => void;
 }

package/dist/remote/session-state.js

@@ -20,6 +20,7 @@ function fresh() {
         taskWidget: null,
         prompt: null,
         context: null,
+        toolStarts: {},
         sink: wsBroadcast
     };
 }
@@ -76,6 +77,7 @@ export function startTool(toolCallId, toolName, args) {
         isError: false,
         done: false
     });
+    s.toolStarts[toolCallId] = Date.now();
     s.sink({ type: 'tool_start', toolCallId, toolName, args });
 }
 export function updateTool(toolCallId, partialResult) {
@@ -85,10 +87,18 @@ export function endTool(toolCallId, toolName, result, isError) {
     const s = getState();
     const live = ensureLive(s);
     const part = live.parts.find((p) => p.kind === 'tool' && p.toolCallId === toolCallId);
+    const startedAt = s.toolStarts[toolCallId];
+    let elapsedMs;
+    if (startedAt != null) {
+        elapsedMs = Date.now() - startedAt;
+        delete s.toolStarts[toolCallId];
+    }
     if (part) {
         part.result = result;
         part.isError = isError;
         part.done = true;
+        if (elapsedMs != null)
+            part.elapsedMs = elapsedMs;
     }
     else {
         // tool_end without a matching start (shouldn't happen) — append a done tool.
@@ -102,7 +112,7 @@ export function endTool(toolCallId, toolName, result, isError) {
             done: true
         });
     }
-    s.sink({ type: 'tool_end', toolCallId, toolName, result, isError });
+    s.sink({ type: 'tool_end', toolCallId, toolName, result, isError, elapsedMs });
 }
 export function agentEnd(context) {
     const s = getState();

package/dist/remote/ui-highlight.d.ts

@@ -0,0 +1,2 @@
+/** Emitted client JS (top-level function declarations + language tables). */
+export declare function highlightModule(): string;

package/dist/remote/ui-highlight.js

@@ -0,0 +1,119 @@
+// Generalized single-pass syntax highlighter, shipped as a JS string and
+// concatenated into the page by ui.ts. It grew out of the client's original
+// JS-only tokenizer: the string/comment/number/identifier logic is now shared and
+// parameterized by a per-language config (keyword set + comment markers + string
+// flavors). Unknown languages fall back to escaped plain text (unchanged).
+//
+// Depends on escHtml (ui-render.ts) — both land in the same <script>.
+/** Emitted client JS (top-level function declarations + language tables). */
+export function highlightModule() {
+    return `    var HL_JS_KW = new Set(('break case catch class const continue debugger default delete do else export '
+      + 'extends finally for from function if import in instanceof let new of return static super switch this '
+      + 'throw try typeof var void while with yield async await type interface enum implements abstract as declare '
+      + 'namespace readonly undefined null true false override satisfies public private protected get set').split(' '));
+    var HL_PY_KW = new Set(('def return if elif else for while in not and or import from as class try except finally '
+      + 'raise with lambda yield pass break continue global nonlocal assert del None True False async await is print self').split(' '));
+    var HL_SH_KW = new Set(('if then else elif fi for while do done case esac in function return echo export local read '
+      + 'cd set unset source alias exit test').split(' '));
+    var HL_SQL_KW = new Set(('select from where insert into values update set delete create table drop alter add column '
+      + 'join left right inner outer full on group by order having limit offset union and or not null is as distinct '
+      + 'count sum avg min max primary key foreign references index unique default int integer text varchar char boolean '
+      + 'timestamp date time serial begin commit rollback').split(' '));
+    var HL_GO_KW = new Set(('func package import var const type struct interface map chan go defer return if else for range '
+      + 'switch case default break continue select nil true false make new append len cap string int int64 float64 bool byte rune error').split(' '));
+    var HL_RUST_KW = new Set(('fn let mut const static struct enum impl trait pub use mod match if else for while loop return '
+      + 'break continue self Self super crate as where move ref dyn async await unsafe true false None Some Ok Err String Vec Option Result Box').split(' '));
+    var HL_YAML_KW = new Set('true false null yes no on off'.split(' '));
+    var HL_JSON_KW = new Set('true false null'.split(' '));
+
+    var HL_LANGS = {
+      js:     {kw: HL_JS_KW,   line: '//', block: ['/*', '*/'], tmpl: true},
+      ts:     {kw: HL_JS_KW,   line: '//', block: ['/*', '*/'], tmpl: true},
+      python: {kw: HL_PY_KW,   line: '#',  block: null,         triple: true},
+      sh:     {kw: HL_SH_KW,   line: '#',  block: null},
+      sql:    {kw: HL_SQL_KW,  line: '--', block: ['/*', '*/'], ci: true},
+      go:     {kw: HL_GO_KW,   line: '//', block: ['/*', '*/'], tmpl: true},
+      rust:   {kw: HL_RUST_KW, line: '//', block: ['/*', '*/']},
+      yaml:   {kw: HL_YAML_KW, line: '#',  block: null},
+      json:   {kw: HL_JSON_KW, line: null, block: null},
+      css:    {kw: null,       line: null, block: ['/*', '*/']}
+    };
+    var HL_ALIAS = {javascript: 'js', jsx: 'js', mjs: 'js', cjs: 'js', node: 'js', typescript: 'ts', tsx: 'ts',
+      py: 'python', python3: 'python', bash: 'sh', shell: 'sh', shellscript: 'sh', zsh: 'sh', console: 'sh',
+      yml: 'yaml', rs: 'rust', golang: 'go', htm: 'html', xml: 'html', svg: 'html', scss: 'css'};
+
+    function hlSpan(cls, text) { return '<span class="' + cls + '">' + escHtml(text) + '</span>'; }
+
+    function tokenize(code, cfg) {
+      var BT = String.fromCharCode(96);
+      var r = '', i = 0, n = code.length;
+      while (i < n) {
+        var ch = code[i];
+        if (cfg.block && code.startsWith(cfg.block[0], i)) {
+          var end = code.indexOf(cfg.block[1], i + cfg.block[0].length);
+          var je = end < 0 ? n : end + cfg.block[1].length;
+          r += hlSpan('hl-cmt', code.slice(i, je)); i = je; continue;
+        }
+        if (cfg.line && code.startsWith(cfg.line, i)) {
+          var jl = i; while (jl < n && code[jl] !== '\\n') jl++;
+          r += hlSpan('hl-cmt', code.slice(i, jl)); i = jl; continue;
+        }
+        if (ch === '"' || ch === "'" || (cfg.tmpl && ch === BT)) {
+          if (cfg.triple && code[i + 1] === ch && code[i + 2] === ch) {
+            var close = code.indexOf(ch + ch + ch, i + 3);
+            var jt = close < 0 ? n : close + 3;
+            r += hlSpan('hl-str', code.slice(i, jt)); i = jt; continue;
+          }
+          var js = i + 1;
+          while (js < n) { if (code[js] === '\\\\') { js += 2; continue; } if (code[js] === ch || code[js] === '\\n') break; js++; }
+          if (code[js] === ch) js++;
+          r += hlSpan('hl-str', code.slice(i, js)); i = js; continue;
+        }
+        if (ch >= '0' && ch <= '9') {
+          var jn = i;
+          if (code[i] === '0' && /[xXoObB]/.test(code[i + 1] || '')) {
+            jn += 2; while (jn < n && /[0-9a-fA-F_]/.test(code[jn])) jn++;
+          } else {
+            while (jn < n && ((code[jn] >= '0' && code[jn] <= '9') || code[jn] === '_')) jn++;
+            if (code[jn] === '.') { jn++; while (jn < n && code[jn] >= '0' && code[jn] <= '9') jn++; }
+            if (code[jn] === 'e' || code[jn] === 'E') { jn++; if (code[jn] === '+' || code[jn] === '-') jn++; while (jn < n && code[jn] >= '0' && code[jn] <= '9') jn++; }
+            if (code[jn] === 'n') jn++;
+          }
+          r += hlSpan('hl-num', code.slice(i, jn)); i = jn; continue;
+        }
+        if (/[a-zA-Z_$]/.test(ch)) {
+          var jw = i; while (jw < n && /[a-zA-Z0-9_$]/.test(code[jw])) jw++;
+          var word = code.slice(i, jw);
+          var kwHit = cfg.kw && (cfg.kw.has(word) || (cfg.ci && cfg.kw.has(word.toLowerCase())));
+          if (kwHit) r += hlSpan('hl-kw', word);
+          else if (code[jw] === '(') r += hlSpan('hl-fn', word);
+          else r += escHtml(word);
+          i = jw; continue;
+        }
+        r += escHtml(ch); i++;
+      }
+      return r;
+    }
+
+    // Markup languages don't fit the identifier tokenizer; highlight tag names and
+    // attribute names off the already-escaped text.
+    function highlightMarkup(code) {
+      var e = escHtml(code);
+      // Attribute names first (before any spans exist), then tag names — otherwise
+      // the attribute pass would re-match the class="" inside the spans it inserted.
+      e = e.replace(/([a-zA-Z-]+)=("|&quot;)/g, function (_, a, q) { return '<span class="hl-fn">' + a + '</span>=' + q; });
+      e = e.replace(/(&lt;\\/?)([a-zA-Z][\\w-]*)/g, function (_, p, t) { return p + '<span class="hl-kw">' + t + '</span>'; });
+      return e;
+    }
+
+    function syntaxHighlight(code, lang) {
+      code = String(code == null ? '' : code);
+      lang = (lang || '').toLowerCase();
+      lang = HL_ALIAS[lang] || lang;
+      if (lang === 'html') return highlightMarkup(code);
+      var cfg = HL_LANGS[lang];
+      if (!cfg) return escHtml(code);
+      return tokenize(code, cfg);
+    }
+`;
+}

package/dist/remote/ui-render.d.ts

@@ -0,0 +1,2 @@
+/** Emitted client JS (top-level function declarations). */
+export declare function renderModule(): string;

package/dist/remote/ui-render.js

@@ -0,0 +1,169 @@
+// Pure string→HTML render helpers, shipped to the browser as a JS string and
+// concatenated into the page by ui.ts BEFORE clientScript. Splitting these out
+// of the 900-line client template gives them a testability seam: each emitted
+// function is `new Function`-eval'd in a unit test and asserted on its return
+// value, with no DOM needed. (The shipped fence bug survived because the client
+// JS was never executed by any test — only string-matched.)
+//
+// Exposes (as top-level fn declarations in the page's single <script>):
+//   escHtml(s)           — HTML-escape & < >
+//   parseBlocks(text)    — line-based fence scanner (text vs code segments)
+//   renderInline(s)      — inline markdown (bold/italic/strike/code/links)
+//   renderMarkdown(text) — full block-level markdown → HTML string
+// renderMarkdown calls syntaxHighlight (ui-highlight.ts); both land in the same
+// <script>, so declaration order across the concatenated modules doesn't matter.
+/** Emitted client JS (top-level function declarations). */
+export function renderModule() {
+    return `    function escHtml(s) {
+      return String(s == null ? '' : s).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+    }
+
+    // Split text into ordered {type:'text'|'code', ...} blocks by scanning lines
+    // for a fenced code marker at line start. This replaces a RegExp that was built
+    // from a string where '[\\\\s\\\\S]' collapsed to '[sS]', so it matched nothing
+    // and every code block rendered as raw text. A line scanner also tolerates an
+    // unclosed trailing fence, which the regex never could.
+    function parseBlocks(text) {
+      var FENCE = String.fromCharCode(96, 96, 96);
+      var lines = String(text == null ? '' : text).split('\\n');
+      var blocks = [];
+      var textBuf = [];
+      function flushText() {
+        if (textBuf.length) { blocks.push({type: 'text', content: textBuf.join('\\n')}); textBuf = []; }
+      }
+      var i = 0;
+      while (i < lines.length) {
+        var line = lines[i];
+        if (line.slice(0, 3) === FENCE) {
+          flushText();
+          var lang = line.slice(3).trim();
+          var codeLines = [];
+          i++;
+          while (i < lines.length && lines[i].trim() !== FENCE) { codeLines.push(lines[i]); i++; }
+          if (i < lines.length) i++; // consume the closing fence; tolerate EOF (unclosed)
+          blocks.push({type: 'code', lang: lang, content: codeLines.join('\\n')});
+        } else {
+          textBuf.push(line);
+          i++;
+        }
+      }
+      flushText();
+      return blocks;
+    }
+
+    // Inline formatting on ONE line's worth of text. Code spans are extracted first
+    // (and protected with a NUL placeholder) so emphasis inside them is left alone.
+    function renderInline(s) {
+      s = escHtml(String(s == null ? '' : s));
+      var BT = String.fromCharCode(96);
+      var codes = [];
+      var codeRe = new RegExp(BT + '([^' + BT + ']+)' + BT, 'g');
+      s = s.replace(codeRe, function (_, c) { codes.push(c); return '\\u0000' + (codes.length - 1) + '\\u0000'; });
+      s = s.replace(/\\[([^\\]]+)\\]\\(([^)\\s]+)\\)/g, function (_, t, u) {
+        var safe = /^(https?:|mailto:)/i.test(u) ? u : '#';
+        return '<a href="' + safe + '" target="_blank" rel="noopener">' + t + '</a>';
+      });
+      s = s.replace(/\\*\\*([^*]+)\\*\\*/g, '<strong>$1</strong>');
+      s = s.replace(/__([^_]+)__/g, '<strong>$1</strong>');
+      s = s.replace(/\\*([^*]+)\\*/g, '<em>$1</em>');
+      s = s.replace(/~~([^~]+)~~/g, '<del>$1</del>');
+      s = s.replace(/\\u0000(\\d+)\\u0000/g, function (_, n) { return '<code class="md-code">' + codes[n] + '</code>'; });
+      return s;
+    }
+
+    // A line that begins a block-level construct — used to stop paragraph grouping.
+    function mdIsSpecial(l) {
+      return /^(#{1,6})\\s+/.test(l)
+        || /^\\s*>\\s?/.test(l)
+        || /^\\s*([-*+]|\\d+\\.)\\s+/.test(l)
+        || /^\\s*([-*_])\\s*(\\1\\s*){2,}$/.test(l);
+    }
+
+    function mdParseList(lines, i) {
+      var ordered = /^\\s*\\d+\\.\\s+/.test(lines[i]);
+      var tag = ordered ? 'ol' : 'ul';
+      var items = '';
+      while (i < lines.length && /^\\s*([-*+]|\\d+\\.)\\s+/.test(lines[i])) {
+        var content = lines[i].replace(/^\\s*([-*+]|\\d+\\.)\\s+/, '');
+        var task = /^\\[([ xX])\\]\\s+(.*)$/.exec(content);
+        if (task) {
+          var checked = task[1].toLowerCase() === 'x';
+          items += '<li class="md-task"><span class="md-check">' + (checked ? '\\u2611' : '\\u2610') + '</span> ' + renderInline(task[2]) + '</li>';
+        } else {
+          items += '<li>' + renderInline(content) + '</li>';
+        }
+        i++;
+      }
+      return {html: '<' + tag + ' class="md-list">' + items + '</' + tag + '>', next: i};
+    }
+
+    function mdParseTable(lines, i) {
+      function cells(l) {
+        var s = l.trim().replace(/^\\|/, '').replace(/\\|$/, '');
+        return s.split('|').map(function (c) { return c.trim(); });
+      }
+      var head = cells(lines[i]);
+      i += 2; // skip the header row and the |---| separator
+      var body = '';
+      while (i < lines.length && /\\|/.test(lines[i]) && lines[i].trim() !== '') {
+        var row = cells(lines[i]);
+        var tds = '';
+        for (var c = 0; c < row.length; c++) tds += '<td>' + renderInline(row[c]) + '</td>';
+        body += '<tr>' + tds + '</tr>';
+        i++;
+      }
+      var ths = '';
+      for (var c2 = 0; c2 < head.length; c2++) ths += '<th>' + renderInline(head[c2]) + '</th>';
+      return {html: '<table class="md-table"><thead><tr>' + ths + '</tr></thead><tbody>' + body + '</tbody></table>', next: i};
+    }
+
+    // Block-level markdown for one text segment (no fences — those are split off by
+    // renderMarkdown first). Headers, hr, blockquotes, tables, lists, paragraphs.
+    function renderProse(src) {
+      var lines = String(src == null ? '' : src).split('\\n');
+      var html = '';
+      var i = 0;
+      while (i < lines.length) {
+        var line = lines[i];
+        if (line.trim() === '') { i++; continue; }
+        var h = /^(#{1,6})\\s+(.*)$/.exec(line);
+        if (h) { var lvl = h[1].length; html += '<h' + lvl + ' class="md-h md-h' + lvl + '">' + renderInline(h[2]) + '</h' + lvl + '>'; i++; continue; }
+        if (/^\\s*([-*_])\\s*(\\1\\s*){2,}$/.test(line)) { html += '<hr class="md-hr">'; i++; continue; }
+        if (/^\\s*>\\s?/.test(line)) {
+          var q = [];
+          while (i < lines.length && /^\\s*>\\s?/.test(lines[i])) { q.push(lines[i].replace(/^\\s*>\\s?/, '')); i++; }
+          html += '<blockquote class="md-quote">' + renderProse(q.join('\\n')) + '</blockquote>';
+          continue;
+        }
+        if (/\\|/.test(line) && i + 1 < lines.length && /^\\s*\\|?[\\s:|-]*-[\\s:|-]*\\|?\\s*$/.test(lines[i + 1])) {
+          var t = mdParseTable(lines, i); html += t.html; i = t.next; continue;
+        }
+        if (/^\\s*([-*+]|\\d+\\.)\\s+/.test(line)) {
+          var lst = mdParseList(lines, i); html += lst.html; i = lst.next; continue;
+        }
+        var para = [];
+        while (i < lines.length && lines[i].trim() !== '' && !mdIsSpecial(lines[i])) { para.push(lines[i]); i++; }
+        var inner = [];
+        for (var p = 0; p < para.length; p++) inner.push(renderInline(para[p]));
+        html += '<p class="md-p">' + inner.join('<br>') + '</p>';
+      }
+      return html;
+    }
+
+    function renderMarkdown(text) {
+      var blocks = parseBlocks(text);
+      var out = '';
+      for (var k = 0; k < blocks.length; k++) {
+        var b = blocks[k];
+        if (b.type === 'code') {
+          out += '<div class="code-block">'
+            + (b.lang ? '<div class="code-lang">' + escHtml(b.lang) + '</div>' : '')
+            + '<pre><code>' + syntaxHighlight(b.content, b.lang) + '</code></pre></div>';
+        } else {
+          out += renderProse(b.content);
+        }
+      }
+      return out;
+    }
+`;
+}

package/dist/remote/ui-script.js

@@ -56,119 +56,14 @@ export function clientScript(wsUrl) {
     let reconnectTimer = null;
     let ws = null;
 
-    const BT = String.fromCharCode(96);
-    const JS_LANGS = new Set(['js','jsx','mjs','cjs','javascript','ts','tsx','typescript']);
-    const JS_KW = new Set(['break','case','catch','class','const','continue','debugger',
-      'default','delete','do','else','export','extends','finally','for','from','function',
-      'if','import','in','instanceof','let','new','of','return','static','super','switch',
-      'this','throw','try','typeof','var','void','while','with','yield','async','await',
-      'type','interface','enum','implements','abstract','as','declare','namespace',
-      'readonly','undefined','null','true','false','override','satisfies']);
-
-    function escHtml(s) {
-      return s.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
-    }
-
-    function syntaxHighlight(code, lang) {
-      if (!JS_LANGS.has((lang || '').toLowerCase())) return escHtml(code);
-      let r = '', i = 0;
-      while (i < code.length) {
-        const ch = code[i];
-        // Template literal
-        if (ch === BT) {
-          let j = i + 1;
-          while (j < code.length) {
-            if (code[j] === '\\\\') { j += 2; continue; }
-            if (code[j] === BT) { j++; break; }
-            j++;
-          }
-          r += '<span class="hl-str">' + escHtml(code.slice(i, j)) + '</span>';
-          i = j; continue;
-        }
-        // Single / double quoted string
-        if (ch === '"' || ch === "'") {
-          let j = i + 1;
-          while (j < code.length) {
-            if (code[j] === '\\\\') { j += 2; continue; }
-            if (code[j] === ch || code[j] === '\\n') break;
-            j++;
-          }
-          if (code[j] === ch) j++;
-          r += '<span class="hl-str">' + escHtml(code.slice(i, j)) + '</span>';
-          i = j; continue;
-        }
-        // Line comment
-        if (ch === '/' && code[i + 1] === '/') {
-          let j = i + 2;
-          while (j < code.length && code[j] !== '\\n') j++;
-          r += '<span class="hl-cmt">' + escHtml(code.slice(i, j)) + '</span>';
-          i = j; continue;
-        }
-        // Block comment
-        if (ch === '/' && code[i + 1] === '*') {
-          let j = i + 2;
-          while (j < code.length && !(code[j] === '*' && code[j + 1] === '/')) j++;
-          j += 2;
-          r += '<span class="hl-cmt">' + escHtml(code.slice(i, j)) + '</span>';
-          i = j; continue;
-        }
-        // Number
-        if (ch >= '0' && ch <= '9') {
-          let j = i;
-          if (code[i] === '0' && /[xXoObB]/.test(code[i + 1] || '')) {
-            j += 2; while (j < code.length && /[0-9a-fA-F_]/.test(code[j])) j++;
-          } else {
-            while (j < code.length && (code[j] >= '0' && code[j] <= '9' || code[j] === '_')) j++;
-            if (code[j] === '.') { j++; while (j < code.length && code[j] >= '0' && code[j] <= '9') j++; }
-            if (code[j] === 'e' || code[j] === 'E') {
-              j++; if (code[j] === '+' || code[j] === '-') j++;
-              while (j < code.length && code[j] >= '0' && code[j] <= '9') j++;
-            }
-            if (code[j] === 'n') j++;
-          }
-          r += '<span class="hl-num">' + escHtml(code.slice(i, j)) + '</span>';
-          i = j; continue;
-        }
-        // Identifier / keyword / function call
-        if (/[a-zA-Z_$]/.test(ch)) {
-          let j = i;
-          while (j < code.length && /[a-zA-Z0-9_$]/.test(code[j])) j++;
-          const word = code.slice(i, j);
-          if (JS_KW.has(word)) {
-            r += '<span class="hl-kw">' + word + '</span>';
-          } else if (code[j] === '(') {
-            r += '<span class="hl-fn">' + escHtml(word) + '</span>';
-          } else {
-            r += escHtml(word);
-          }
-          i = j; continue;
-        }
-        r += escHtml(ch); i++;
-      }
-      return r;
-    }
-
+    // Render assistant text as markdown (headers, lists, tables, emphasis, links)
+    // with fenced code blocks syntax-highlighted. renderMarkdown/syntaxHighlight are
+    // the pure functions from ui-render.ts / ui-highlight.ts, concatenated into this
+    // same <script> ahead of clientScript. innerHTML is safe because renderMarkdown
+    // escapes every span of literal text and only emits a fixed set of known tags.
     function setContent(el, text) {
-      el.innerHTML = '';
-      const BT3 = BT + BT + BT;
-      const re = new RegExp(BT3 + '([^\\n' + BT + ']*)\\n([\\s\\S]*?)' + BT3, 'g');
-      let last = 0, m;
-      while ((m = re.exec(text)) !== null) {
-        if (m.index > last) el.appendChild(document.createTextNode(text.slice(last, m.index)));
-        const lang = m[1].trim();
-        const code = m[2];
-        const wrap = document.createElement('div');
-        wrap.className = 'code-block';
-        if (lang) { const lb = document.createElement('div'); lb.className = 'code-lang'; lb.textContent = lang; wrap.appendChild(lb); }
-        const pre = document.createElement('pre');
-        const codeEl = document.createElement('code');
-        codeEl.innerHTML = syntaxHighlight(code, lang);
-        pre.appendChild(codeEl);
-        wrap.appendChild(pre);
-        el.appendChild(wrap);
-        last = m.index + m[0].length;
-      }
-      if (last < text.length) el.appendChild(document.createTextNode(text.slice(last)));
+      el.classList.add('md');
+      el.innerHTML = renderMarkdown(text);
     }
 
     const COMMANDS = [
@@ -247,7 +142,10 @@ export function clientScript(wsUrl) {
     function addBubble(role, text) {
       const el = document.createElement('div');
       el.className = 'bubble ' + role;
-      setContent(el, text);
+      // Only assistant text is markdown-rendered; user/error bubbles stay plain so a
+      // user's literal *asterisks* or backticks show verbatim.
+      if (role === 'assistant') setContent(el, text);
+      else el.textContent = text;
       chatLog.appendChild(el);
       scrollBottom();
       return el;
@@ -293,20 +191,50 @@ export function clientScript(wsUrl) {
       stopSpinIfIdle();
     }
 
-    function addToolCall(toolName, argsStr, isError) {
-      // argsStr can be undefined (no args / JSON.stringify(undefined)); don't let
-      // that render as the literal "name: undefined" in the collapsed summary.
-      const label = (toolName + (argsStr ? ': ' + argsStr : '')).slice(0, 64);
+    // A finished/running tool card. args is the RAW args (object or JSON string) —
+    // toolSummary/toolBadge/toolDiffHtml (ui-tools.ts) turn it into a readable
+    // one-line summary, a +N −M badge, and (for edit/write) an expandable line diff.
+    function addToolCall(toolName, args, isError) {
       const d = document.createElement('details');
       d.className = 'tool-call' + (isError ? ' error' : '');
       const s = document.createElement('summary');
-      s.textContent = label;
+      const label = document.createElement('span');
+      label.className = 'tool-label';
+      label.textContent = toolSummary(toolName, args);
+      s.title = label.textContent;
+      s.appendChild(label);
+      const badge = toolBadge(toolName, args);
+      if (badge && (badge.added || badge.removed)) {
+        const b = document.createElement('span');
+        b.className = 'tool-badge';
+        b.textContent = '+' + badge.added + ' \\u2212' + badge.removed;
+        s.appendChild(b);
+      }
       d.appendChild(s);
+      const diffHtml = toolDiffHtml(toolName, args);
+      if (diffHtml) {
+        const dv = document.createElement('div');
+        dv.className = 'tool-diff';
+        dv.innerHTML = diffHtml;
+        d.appendChild(dv);
+      }
       chatLog.appendChild(d);
       scrollBottom();
       return d;
     }
 
+    // Dim "· 1.2s" appended to a finished tool summary.
+    function appendElapsed(d, elapsedMs) {
+      const txt = fmtElapsed(elapsedMs);
+      if (!txt) return;
+      const s = d.querySelector('summary');
+      if (!s || s.querySelector('.tool-elapsed')) return;
+      const e = document.createElement('span');
+      e.className = 'tool-elapsed';
+      e.textContent = '\\u00B7 ' + txt;
+      s.appendChild(e);
+    }
+
     function setEnabled(on) {
       const allow = on && activePromptId === null;
       inputEl.disabled = !allow;
@@ -345,9 +273,9 @@ export function clientScript(wsUrl) {
 
     // Render one tool part from the ordered parts list (running or finished).
     function renderToolPart(p) {
-      const argsStr = typeof p.args === 'string' ? p.args : JSON.stringify(p.args);
-      const d = addToolCall(p.toolName, argsStr, p.isError);
+      const d = addToolCall(p.toolName, p.args, p.isError);
       if (p.done) {
+        appendElapsed(d, p.elapsedMs);
         const pre = document.createElement('pre');
         pre.textContent = toolResultText(p.result);
         d.appendChild(pre);
@@ -604,8 +532,9 @@ export function clientScript(wsUrl) {
       activeRecommended = msg.recommended || '';
       activeRecommended2 = msg.recommended2 || '';
       if (msg.recommended) {
-        // Mode A: recommendation(s) present.
-        promptRecText.textContent = msg.recommended;
+        // Mode A: recommendation(s) present. Render markdown in the panel so a
+        // recommendation with code/emphasis reads the same as an assistant bubble.
+        setContent(promptRecText, msg.recommended);
         showRecommendation();
       } else {
         // Mode B: no recommendation — the user must type an answer (or skip).
@@ -685,8 +614,7 @@ export function clientScript(wsUrl) {
           break;
         case 'tool_start': {
           hideThinking();
-          const argsStr = typeof msg.args === 'string' ? msg.args : JSON.stringify(msg.args);
-          const d = addToolCall(msg.toolName, argsStr, false);
+          const d = addToolCall(msg.toolName, msg.args, false);
           const sp = document.createElement('span');
           sp.className = 'tool-spin spin';
           d.querySelector('summary').appendChild(sp);
@@ -700,6 +628,7 @@ export function clientScript(wsUrl) {
             const sp = d.querySelector('.tool-spin');
             if (sp) { sp.remove(); stopSpinIfIdle(); }
             if (msg.isError) d.classList.add('error');
+            appendElapsed(d, msg.elapsedMs);
             const pre = document.createElement('pre');
             pre.textContent = toolResultText(msg.result);
             d.appendChild(pre);