@zhin.js/client 2.1.9 → 2.1.10

package/client/index.ts

@@ -19,6 +19,23 @@ export {
 // Media URL resolution
 export { resolveMediaSrc, pickMediaRawUrl, type MediaKind } from "./mediaSrc";
 
+// Safe rich message rendering (Markdown + code blocks; no raw HTML execution)
+export {
+  MarkdownContent,
+  CodeBlock,
+  type MarkdownContentProps,
+} from "./message-content/MarkdownContent.js";
+export {
+  parseMarkdown,
+  parseMarkdownInline,
+  highlightCodeLine,
+  isSafeMarkdownHref,
+  type MarkdownBlock,
+  type MarkdownInline,
+  type CodeToken,
+  type CodeTokenKind,
+} from "./message-content/markdown.js";
+
 // Segment IM visibility (inbox vs agent panel)
 export { segmentsForImDelivery, segmentsForAgentPanel } from "./segments.js";
 
@@ -67,8 +84,8 @@ export {
   type LoadConsoleEntriesOptions,
 } from "./bootstrap/loadConsoleEntries.js";
 
-export { registerOrchestrationConsole } from "./orchestration/registerOrchestrationConsole.js";
-export { default as OrchestrationRunsPage } from "./orchestration/OrchestrationRunsPage.js";
+export { registerWorkroomConsole } from "./workroom/registerWorkroomConsole.js";
+export { default as WorkroomRunsPage } from "./workroom/WorkroomRunsPage.js";
 
 export {
   startAgentSession,

package/client/mediaSrc.test.ts

@@ -31,4 +31,19 @@ describe('pickMediaRawUrl', () => {
     expect(pickMediaRawUrl(undefined)).toBeUndefined();
     expect(pickMediaRawUrl({})).toBeUndefined();
   });
+
+  it('rejects executable data URLs, credentials, and malformed base64', () => {
+    expect(resolveMediaSrc('data:text/html;base64,PHNjcmlwdD4=', 'image')).toBeUndefined();
+    expect(resolveMediaSrc('data:image/svg+xml;base64,PHN2Zz4=', 'image')).toBeUndefined();
+    expect(resolveMediaSrc('https://user:secret@example.com/a.png', 'image')).toBeUndefined();
+    expect(resolveMediaSrc('base64://not:base64', 'image')).toBeUndefined();
+  });
+
+  it('accepts only data MIME types matching the rendered media kind', () => {
+    expect(resolveMediaSrc('data:image/png;base64,aGVsbG8=', 'image')).toBe(
+      'data:image/png;base64,aGVsbG8=',
+    );
+    expect(resolveMediaSrc('data:image/png;base64,aGVsbG8=', 'video')).toBeUndefined();
+    expect(resolveMediaSrc('javascript:alert(1)', 'image')).toBeUndefined();
+  });
 });

package/client/mediaSrc.ts

@@ -3,10 +3,54 @@ export type MediaKind = 'image' | 'video' | 'audio'
 
 const BASE64_PROTO = 'base64://'
 
-const SAFE_URL_SCHEMES = ['data:', 'blob:', 'http://', 'https://']
+const SAFE_DATA_MIME: Readonly<Record<MediaKind, ReadonlySet<string>>> = Object.freeze({
+  image: new Set(['image/avif', 'image/gif', 'image/jpeg', 'image/png', 'image/webp']),
+  video: new Set(['video/mp4', 'video/ogg', 'video/webm']),
+  audio: new Set(['audio/mpeg', 'audio/mp4', 'audio/ogg', 'audio/wav', 'audio/webm']),
+})
 
-function isSafeUrl(url: string): boolean {
-  return SAFE_URL_SCHEMES.some((scheme) => url.startsWith(scheme))
+function resolveSafeRemoteUrl(value: string): string | undefined {
+  try {
+    const parsed = new URL(value)
+    if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:' && parsed.protocol !== 'blob:') {
+      return undefined
+    }
+    if (parsed.username || parsed.password) return undefined
+    return parsed.href
+  } catch {
+    return undefined
+  }
+}
+
+function resolveSafeDataUrl(value: string, kind: MediaKind): string | undefined {
+  if (!value.startsWith('data:')) return undefined
+  const separator = value.indexOf(',')
+  if (separator < 0) return undefined
+  const header = value.slice('data:'.length, separator).toLowerCase()
+  if (!header.endsWith(';base64')) return undefined
+  const mime = header.slice(0, -';base64'.length)
+  if (!SAFE_DATA_MIME[kind].has(mime)) return undefined
+  const payload = compactBase64(value.slice(separator + 1))
+  return payload ? `data:${mime};base64,${payload}` : undefined
+}
+
+function compactBase64(value: string): string | undefined {
+  let compact = ''
+  for (const character of value) {
+    if (character === ' ' || character === '\n' || character === '\r' || character === '\t') continue
+    const code = character.charCodeAt(0)
+    const allowed = (code >= 48 && code <= 57)
+      || (code >= 65 && code <= 90)
+      || (code >= 97 && code <= 122)
+      || character === '+' || character === '/' || character === '='
+    if (!allowed) return undefined
+    compact += character
+  }
+  const padding = compact.indexOf('=')
+  if (padding >= 0 && (compact.length - padding > 2 || compact.slice(padding).replace(/=/g, '') !== '')) {
+    return undefined
+  }
+  return compact || undefined
 }
 
 /**
@@ -27,26 +71,29 @@ export function resolveMediaSrc(
   const s = raw.trim()
   if (!s) return undefined
 
-  if (isSafeUrl(s)) {
-    return s
-  }
+  const dataUrl = resolveSafeDataUrl(s, kind)
+  if (dataUrl) return dataUrl
+
+  const remoteUrl = resolveSafeRemoteUrl(s)
+  if (remoteUrl) return remoteUrl
 
   if (!s.startsWith(BASE64_PROTO)) {
-    return isSafeUrl(s) ? s : undefined
+    return undefined
   }
 
-  const payload = s.slice(BASE64_PROTO.length).replace(/^\s+/, '')
+  const payload = s.slice(BASE64_PROTO.length).trimStart()
   if (!payload) return undefined
 
   // 已是 type/subtype;base64, 片段（不含 data: 前缀）
-  if (/^[\w+.-]+\/[\w+.-]+;base64,/i.test(payload)) {
-    return `data:${payload}`
+  const declared = resolveSafeDataUrl(`data:${payload}`, kind)
+  if (declared) {
+    return declared
   }
 
   const defaultMime =
     kind === 'image' ? 'image/png' : kind === 'video' ? 'video/mp4' : 'audio/mpeg'
-  const b64 = payload.replace(/\s/g, '')
-  return `data:${defaultMime};base64,${b64}`
+  const b64 = compactBase64(payload)
+  return b64 ? `data:${defaultMime};base64,${b64}` : undefined
 }
 
 /** 从 segment.data 取常见媒体字段（优先 canonical MediaRef） */

package/client/message-content/MarkdownContent.tsx

@@ -0,0 +1,128 @@
+import { Fragment, useMemo, useState, type ReactNode } from 'react';
+import {
+  highlightCodeLine,
+  parseMarkdown,
+  type MarkdownInline,
+} from './markdown.js';
+
+export interface MarkdownContentProps {
+  readonly text: string;
+  readonly className?: string;
+}
+
+function InlineContent({ content }: { readonly content: readonly MarkdownInline[] }) {
+  const nodes: ReactNode[] = [];
+  content.forEach((token, index) => {
+    const key = `${token.type}-${index}`;
+    const value = token.value.split('\n').map((line, lineIndex, lines) => (
+      <Fragment key={`${key}-line-${lineIndex}`}>
+        {line}
+        {lineIndex < lines.length - 1 ? <br /> : null}
+      </Fragment>
+    ));
+    if (token.type === 'strong') nodes.push(<strong key={key}>{value}</strong>);
+    else if (token.type === 'emphasis') nodes.push(<em key={key}>{value}</em>);
+    else if (token.type === 'strike') nodes.push(<del key={key}>{value}</del>);
+    else if (token.type === 'code') nodes.push(<code key={key} className="im-inline-code">{token.value}</code>);
+    else if (token.type === 'link') nodes.push(
+      <a key={key} href={token.href} target={token.href.startsWith('#') ? undefined : '_blank'} rel="noreferrer" className="im-message-link">{value}</a>,
+    );
+    else nodes.push(<Fragment key={key}>{value}</Fragment>);
+  });
+  return <>{nodes}</>;
+}
+
+export function CodeBlock({ code, language = '', closed = true }: { readonly code: string; readonly language?: string; readonly closed?: boolean }) {
+  const [copied, setCopied] = useState(false);
+  const [wrapped, setWrapped] = useState(false);
+  const [expanded, setExpanded] = useState(false);
+  const lines = useMemo(() => code.split('\n'), [code]);
+  const isLong = lines.length > 18 || code.length > 1800;
+  const visibleLines = isLong && !expanded ? lines.slice(0, 18) : lines;
+
+  const copy = async () => {
+    try {
+      await navigator.clipboard.writeText(code);
+      setCopied(true);
+      window.setTimeout(() => setCopied(false), 1600);
+    } catch {
+      setCopied(false);
+    }
+  };
+
+  return (
+    <figure className="zhin-code-block">
+      <figcaption className="zhin-code-toolbar">
+        <span className="zhin-code-language">{language || 'plain text'}</span>
+        {!closed ? <span className="zhin-code-streaming">生成中</span> : null}
+        <span className="zhin-code-actions">
+          <button type="button" onClick={() => setWrapped((value) => !value)} aria-pressed={wrapped}>{wrapped ? '不折行' : '折行'}</button>
+          <button type="button" onClick={() => void copy()}>{copied ? '已复制' : '复制'}</button>
+        </span>
+      </figcaption>
+      <pre className={wrapped ? 'zhin-code-pre zhin-code-pre--wrap' : 'zhin-code-pre'}>
+        <code>
+          {visibleLines.map((line, lineIndex) => (
+            <span className="zhin-code-line" key={`${lineIndex}-${line}`}>
+              <span className="zhin-code-line-number" aria-hidden="true">{lineIndex + 1}</span>
+              <span className="zhin-code-line-content">
+                {highlightCodeLine(line, language).map((token, tokenIndex) => (
+                  <span key={`${token.kind}-${tokenIndex}`} className={`zhin-code-token zhin-code-token--${token.kind}`}>{token.value}</span>
+                ))}
+                {'\n'}
+              </span>
+            </span>
+          ))}
+        </code>
+      </pre>
+      {isLong ? (
+        <button type="button" className="zhin-code-expand" onClick={() => setExpanded((value) => !value)}>
+          {expanded ? '收起代码' : `展开其余 ${lines.length - visibleLines.length} 行`}
+        </button>
+      ) : null}
+    </figure>
+  );
+}
+
+export function MarkdownContent({ text, className }: MarkdownContentProps) {
+  const blocks = useMemo(() => parseMarkdown(text), [text]);
+
+  return (
+    <div className={['im-markdown-body', 'zhin-markdown', className].filter(Boolean).join(' ')}>
+      {blocks.map((block, index) => {
+        if (block.type === 'heading') {
+          const Heading = `h${block.level}` as keyof React.JSX.IntrinsicElements;
+          return <Heading key={index} className={`im-markdown-heading im-markdown-heading-${block.level}`}><InlineContent content={block.content} /></Heading>;
+        }
+        if (block.type === 'paragraph') return <p key={index} className="im-markdown-paragraph"><InlineContent content={block.content} /></p>;
+        if (block.type === 'quote') return <blockquote key={index} className="im-markdown-quote"><InlineContent content={block.content} /></blockquote>;
+        if (block.type === 'rule') return <hr key={index} className="zhin-markdown-rule" />;
+        if (block.type === 'code') return <CodeBlock key={index} code={block.value} language={block.language} closed={block.closed} />;
+        if (block.type === 'list') {
+          const List = block.ordered ? 'ol' : 'ul';
+          return (
+            <List key={index} className={`im-markdown-list${block.ordered ? ' im-markdown-list-ordered' : ''}`}>
+              {block.items.map((item, itemIndex) => (
+                <li key={itemIndex} className={item.checked === undefined ? undefined : 'zhin-markdown-task'}>
+                  {item.checked === undefined ? null : <input type="checkbox" checked={item.checked} readOnly aria-label={item.checked ? '已完成' : '未完成'} />}
+                  <InlineContent content={item.content} />
+                </li>
+              ))}
+            </List>
+          );
+        }
+        if (block.type === 'table') {
+          return (
+            <div className="zhin-markdown-table-wrap" key={index}>
+              <table className="zhin-markdown-table">
+                <thead><tr>{block.header.map((cell, cellIndex) => <th key={cellIndex}><InlineContent content={cell} /></th>)}</tr></thead>
+                <tbody>{block.rows.map((row, rowIndex) => <tr key={rowIndex}>{row.map((cell, cellIndex) => <td key={cellIndex}><InlineContent content={cell} /></td>)}</tr>)}</tbody>
+              </table>
+            </div>
+          );
+        }
+        return null;
+      })}
+    </div>
+  );
+}

package/client/message-content/markdown.test.ts

@@ -0,0 +1,48 @@
+import { highlightCodeLine, isSafeMarkdownHref, parseMarkdown, parseMarkdownInline } from './markdown.js';
+
+describe('message markdown', () => {
+  it('parses rich blocks including tables and tasks', () => {
+    const blocks = parseMarkdown(`# Result
+
+- [x] inspect runtime
+- [ ] publish patch
+
+| field | value |
+| --- | --- |
+| status | **ready** |`);
+
+    expect(blocks.map((block) => block.type)).toEqual(['heading', 'list', 'table']);
+    expect(blocks[1]).toMatchObject({ type: 'list', items: [{ checked: true }, { checked: false }] });
+  });
+
+  it('keeps incomplete streaming fences renderable', () => {
+    expect(parseMarkdown('```ts\nconst ready = true')).toEqual([
+      { type: 'code', language: 'ts', value: 'const ready = true', closed: false },
+    ]);
+  });
+
+  it('rejects unsafe markdown links without emitting active links', () => {
+    expect(isSafeMarkdownHref('javascript:alert(1)')).toBe(false);
+    expect(isSafeMarkdownHref('https://zhin.dev/docs')).toBe(true);
+    expect(parseMarkdownInline('[run](javascript:alert(1))')).toEqual([
+      { type: 'text', value: '[run](javascript:alert(1))' },
+    ]);
+  });
+
+  it('treats repeated unmatched link openers as plain text', () => {
+    const value = '['.repeat(20_000);
+    expect(parseMarkdownInline(value)).toEqual([{ type: 'text', value }]);
+  });
+
+  it('tokenizes common code without producing html', () => {
+    expect(highlightCodeLine('const answer = "<safe>" // note', 'ts')).toEqual([
+      { kind: 'keyword', value: 'const' },
+      { kind: 'plain', value: ' ' },
+      { kind: 'plain', value: 'answer' },
+      { kind: 'plain', value: ' = ' },
+      { kind: 'string', value: '"<safe>"' },
+      { kind: 'plain', value: ' ' },
+      { kind: 'comment', value: '// note' },
+    ]);
+  });
+});

package/client/message-content/markdown.ts

@@ -0,0 +1,247 @@
+export type MarkdownInline =
+  | { readonly type: 'text'; readonly value: string }
+  | { readonly type: 'strong' | 'emphasis' | 'strike' | 'code'; readonly value: string }
+  | { readonly type: 'link'; readonly value: string; readonly href: string };
+
+export type MarkdownBlock =
+  | { readonly type: 'heading'; readonly level: number; readonly content: MarkdownInline[] }
+  | { readonly type: 'paragraph' | 'quote'; readonly content: MarkdownInline[] }
+  | { readonly type: 'list'; readonly ordered: boolean; readonly items: ReadonlyArray<{ readonly content: MarkdownInline[]; readonly checked?: boolean }> }
+  | { readonly type: 'code'; readonly language: string; readonly value: string; readonly closed: boolean }
+  | { readonly type: 'table'; readonly header: ReadonlyArray<MarkdownInline[]>; readonly rows: ReadonlyArray<ReadonlyArray<MarkdownInline[]>> }
+  | { readonly type: 'rule' };
+
+export type CodeTokenKind = 'plain' | 'comment' | 'string' | 'number' | 'keyword' | 'literal';
+
+export interface CodeToken {
+  readonly kind: CodeTokenKind;
+  readonly value: string;
+}
+
+// Excluding another opening bracket from link labels prevents the regexp
+// engine from rescanning an attacker-controlled run of `[` characters.
+const INLINE_PATTERN = /(`[^`\n]+`)|(\*\*[^*\n]+\*\*|__[^_\n]+__)|(~~[^~\n]+~~)|(\*[^*\n]+\*|_[^_\n]+_)|(\[[^\[\]\n]+\]\([^\s()]+(?:\s+"[^"\n]*")?\))|(https?:\/\/[^\s<>()]+)/g;
+const TABLE_DIVIDER = /^\s*\|?\s*:?-{3,}:?\s*(?:\|\s*:?-{3,}:?\s*)+\|?\s*$/;
+
+export function isSafeMarkdownHref(href: string): boolean {
+  const value = href.trim();
+  if (!value) return false;
+  if (/^(https?:|mailto:)/i.test(value)) return true;
+  return /^(\/|#|\.\/|\.\.\/)/.test(value);
+}
+
+export function parseMarkdownInline(value: string): MarkdownInline[] {
+  const tokens: MarkdownInline[] = [];
+  let cursor = 0;
+  let match: RegExpExecArray | null;
+  INLINE_PATTERN.lastIndex = 0;
+
+  while ((match = INLINE_PATTERN.exec(value)) !== null) {
+    if (match.index > cursor) tokens.push({ type: 'text', value: value.slice(cursor, match.index) });
+    const raw = match[0];
+    if (match[1]) {
+      tokens.push({ type: 'code', value: raw.slice(1, -1) });
+    } else if (match[2]) {
+      tokens.push({ type: 'strong', value: raw.slice(2, -2) });
+    } else if (match[3]) {
+      tokens.push({ type: 'strike', value: raw.slice(2, -2) });
+    } else if (match[4]) {
+      tokens.push({ type: 'emphasis', value: raw.slice(1, -1) });
+    } else if (match[5]) {
+      const parsed = raw.match(/^\[([^\[\]]+)\]\(([^\s()]+)(?:\s+"[^"\n]*")?\)$/);
+      if (parsed && isSafeMarkdownHref(parsed[2])) {
+        tokens.push({ type: 'link', value: parsed[1], href: parsed[2] });
+      } else {
+        tokens.push({ type: 'text', value: raw });
+      }
+    } else if (match[6]) {
+      tokens.push({ type: 'link', value: raw, href: raw });
+    }
+    cursor = INLINE_PATTERN.lastIndex;
+  }
+
+  if (cursor < value.length) tokens.push({ type: 'text', value: value.slice(cursor) });
+  const merged: MarkdownInline[] = [];
+  for (const token of tokens) {
+    const previous = merged.at(-1);
+    if (token.type === 'text' && previous?.type === 'text') {
+      merged[merged.length - 1] = { type: 'text', value: previous.value + token.value };
+    } else {
+      merged.push(token);
+    }
+  }
+  return merged.length > 0 ? merged : [{ type: 'text', value }];
+}
+
+function splitTableRow(line: string): string[] {
+  return line
+    .trim()
+    .replace(/^\|/, '')
+    .replace(/\|$/, '')
+    .split(/(?<!\\)\|/)
+    .map((cell) => cell.trim().replace(/\\\|/g, '|'));
+}
+
+function startsBlock(lines: readonly string[], index: number): boolean {
+  const line = lines[index] ?? '';
+  return /^(?:```|~~~|#{1,6}\s+|>\s?|\s*(?:[-+*]|\d+[.)])\s+|\s*(?:-{3,}|\*{3,}|_{3,})\s*$)/.test(line)
+    || (line.includes('|') && TABLE_DIVIDER.test(lines[index + 1] ?? ''));
+}
+
+export function parseMarkdown(value: string): MarkdownBlock[] {
+  const lines = value.replace(/\r\n?/g, '\n').split('\n');
+  const blocks: MarkdownBlock[] = [];
+  let index = 0;
+
+  while (index < lines.length) {
+    const line = lines[index];
+    if (!line.trim()) {
+      index += 1;
+      continue;
+    }
+
+    const fence = line.match(/^\s*(```|~~~)\s*([^\s`]*)?.*$/);
+    if (fence) {
+      const marker = fence[1];
+      const language = (fence[2] ?? '').toLowerCase();
+      const code: string[] = [];
+      let closed = false;
+      index += 1;
+      while (index < lines.length) {
+        if (lines[index].trim() === marker) {
+          closed = true;
+          index += 1;
+          break;
+        }
+        code.push(lines[index]);
+        index += 1;
+      }
+      blocks.push({ type: 'code', language, value: code.join('\n'), closed });
+      continue;
+    }
+
+    const heading = line.match(/^(#{1,6})\s+(.+)$/);
+    if (heading) {
+      blocks.push({ type: 'heading', level: heading[1].length, content: parseMarkdownInline(heading[2]) });
+      index += 1;
+      continue;
+    }
+
+    if (/^\s*(?:-{3,}|\*{3,}|_{3,})\s*$/.test(line)) {
+      blocks.push({ type: 'rule' });
+      index += 1;
+      continue;
+    }
+
+    if (/^>\s?/.test(line)) {
+      const quoted: string[] = [];
+      while (index < lines.length && /^>\s?/.test(lines[index])) {
+        quoted.push(lines[index].replace(/^>\s?/, ''));
+        index += 1;
+      }
+      blocks.push({ type: 'quote', content: parseMarkdownInline(quoted.join('\n')) });
+      continue;
+    }
+
+    const listMatch = line.match(/^\s*([-+*]|\d+[.)])\s+(.+)$/);
+    if (listMatch) {
+      const ordered = /^\d/.test(listMatch[1]);
+      const items: Array<{ content: MarkdownInline[]; checked?: boolean }> = [];
+      while (index < lines.length) {
+        const item = lines[index].match(/^\s*([-+*]|\d+[.)])\s+(.+)$/);
+        if (!item || /^\d/.test(item[1]) !== ordered) break;
+        const task = item[2].match(/^\[([ xX])\]\s+(.+)$/);
+        items.push({
+          content: parseMarkdownInline(task ? task[2] : item[2]),
+          ...(task ? { checked: task[1].toLowerCase() === 'x' } : {}),
+        });
+        index += 1;
+      }
+      blocks.push({ type: 'list', ordered, items });
+      continue;
+    }
+
+    if (line.includes('|') && TABLE_DIVIDER.test(lines[index + 1] ?? '')) {
+      const header = splitTableRow(line).map(parseMarkdownInline);
+      const rows: MarkdownInline[][][] = [];
+      index += 2;
+      while (index < lines.length && lines[index].includes('|') && lines[index].trim()) {
+        rows.push(splitTableRow(lines[index]).map(parseMarkdownInline));
+        index += 1;
+      }
+      blocks.push({ type: 'table', header, rows });
+      continue;
+    }
+
+    const paragraph = [line];
+    index += 1;
+    while (index < lines.length && lines[index].trim() && !startsBlock(lines, index)) {
+      paragraph.push(lines[index]);
+      index += 1;
+    }
+    blocks.push({ type: 'paragraph', content: parseMarkdownInline(paragraph.join('\n')) });
+  }
+
+  return blocks;
+}
+
+const KEYWORDS: Record<string, ReadonlySet<string>> = {
+  javascript: new Set(['async', 'await', 'break', 'case', 'catch', 'class', 'const', 'continue', 'default', 'delete', 'do', 'else', 'export', 'extends', 'finally', 'for', 'from', 'function', 'if', 'import', 'in', 'instanceof', 'let', 'new', 'of', 'return', 'static', 'switch', 'throw', 'try', 'typeof', 'var', 'void', 'while', 'yield']),
+  typescript: new Set(['abstract', 'any', 'as', 'asserts', 'async', 'await', 'boolean', 'break', 'case', 'catch', 'class', 'const', 'continue', 'declare', 'default', 'delete', 'do', 'else', 'enum', 'export', 'extends', 'finally', 'for', 'from', 'function', 'if', 'implements', 'import', 'in', 'infer', 'instanceof', 'interface', 'keyof', 'let', 'namespace', 'never', 'new', 'number', 'object', 'of', 'readonly', 'return', 'satisfies', 'static', 'string', 'switch', 'symbol', 'throw', 'try', 'type', 'typeof', 'undefined', 'unknown', 'var', 'void', 'while', 'yield']),
+  python: new Set(['and', 'as', 'assert', 'async', 'await', 'break', 'class', 'continue', 'def', 'del', 'elif', 'else', 'except', 'finally', 'for', 'from', 'global', 'if', 'import', 'in', 'is', 'lambda', 'nonlocal', 'not', 'or', 'pass', 'raise', 'return', 'try', 'while', 'with', 'yield']),
+  shell: new Set(['case', 'do', 'done', 'elif', 'else', 'esac', 'export', 'fi', 'for', 'function', 'if', 'in', 'local', 'then', 'while']),
+  css: new Set(['@import', '@media', '@supports', 'and', 'important', 'not', 'only']),
+};
+
+const LANGUAGE_ALIASES: Record<string, string> = {
+  js: 'javascript', jsx: 'javascript', mjs: 'javascript', cjs: 'javascript',
+  ts: 'typescript', tsx: 'typescript', mts: 'typescript', cts: 'typescript',
+  py: 'python', bash: 'shell', sh: 'shell', zsh: 'shell', jsonc: 'json',
+};
+
+export function highlightCodeLine(line: string, language = ''): CodeToken[] {
+  const normalized = LANGUAGE_ALIASES[language] ?? language;
+  const keywords = KEYWORDS[normalized] ?? KEYWORDS.javascript;
+  const tokens: CodeToken[] = [];
+  let index = 0;
+
+  const push = (kind: CodeTokenKind, value: string) => {
+    if (value) tokens.push({ kind, value });
+  };
+
+  while (index < line.length) {
+    const rest = line.slice(index);
+    const comment = normalized === 'python' || normalized === 'shell'
+      ? rest.match(/^#.*/)
+      : rest.match(/^\/\/.*|^\/\*.*?\*\//);
+    if (comment) {
+      push('comment', comment[0]);
+      index += comment[0].length;
+      continue;
+    }
+    const string = rest.match(/^(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|`(?:\\.|[^`\\])*`)/);
+    if (string) {
+      push('string', string[0]);
+      index += string[0].length;
+      continue;
+    }
+    const number = rest.match(/^(?:0x[\da-f]+|\d+(?:\.\d+)?(?:e[+-]?\d+)?)/i);
+    if (number) {
+      push('number', number[0]);
+      index += number[0].length;
+      continue;
+    }
+    const word = rest.match(/^[A-Za-z_$@][\w$-]*/);
+    if (word) {
+      const literal = /^(?:true|false|null|undefined|None|True|False)$/.test(word[0]);
+      push(literal ? 'literal' : keywords.has(word[0]) ? 'keyword' : 'plain', word[0]);
+      index += word[0].length;
+      continue;
+    }
+    const plain = rest.match(/^[^A-Za-z_$@'"`\d/#]+/) ?? rest.match(/^./);
+    push('plain', plain?.[0] ?? '');
+    index += plain?.[0].length ?? 1;
+  }
+
+  return tokens;
+}