promptimizer-cli 0.1.50 → 0.1.52

package/bin/promptimizer.mjs

@@ -28,16 +28,39 @@ const color = process.stdout.isTTY
 
 const ANSI_OK = Boolean(process.stdout.isTTY);
 
-/** Inline markdown → ANSI (bold, italic, code, links). */
+/** Inline markdown → ANSI (bold, italic, code, links). Strips markers even without a TTY. */
 function styleInline(text) {
   let s = String(text);
-  // code first so we don't style inside backticks
-  s = s.replace(/`([^`]+)`/g, (_, code) => color(ANSI.cyan, code));
-  s = s.replace(/\*\*([^*]+)\*\*/g, (_, t) => color(ANSI.bold, t));
-  s = s.replace(/__([^_]+)__/g, (_, t) => color(ANSI.bold, t));
-  s = s.replace(/(?<!\*)\*([^*\n]+)\*(?!\*)/g, (_, t) => color(ANSI.dim, t));
-  s = s.replace(/(?<!_)_([^_\n]+)_(?!_)/g, (_, t) => color(ANSI.dim, t));
-  s = s.replace(/\[([^\]]+)\]\(([^)]+)\)/g, (_, label, url) => `${color(ANSI.blue, label)} ${color(ANSI.dim, `(${url})`)}`);
+  // Protect code spans first
+  const codes = [];
+  s = s.replace(/`([^`]+)`/g, (_, code) => {
+    const token = `\u0000C${codes.length}\u0000`;
+    codes.push(color(ANSI.cyan, code));
+    return token;
+  });
+  // Bold before italic so ** wins over *
+  s = s.replace(/\*\*((?:[^*]|\*(?!\*))+?)\*\*/g, (_, t) => color(ANSI.bold, t));
+  s = s.replace(/__((?:[^_]|_(?!_))+?)__/g, (_, t) => color(ANSI.bold, t));
+  s = s.replace(/(?<!\*)\*([^*\n]+?)\*(?!\*)/g, (_, t) => color(ANSI.dim, t));
+  s = s.replace(/(?<!_)_([^_\n]+?)_(?!_)/g, (_, t) => color(ANSI.dim, t));
+  s = s.replace(
+    /\[([^\]]+)\]\(([^)]+)\)/g,
+    (_, label, url) => `${color(ANSI.blue, label)} ${color(ANSI.dim, `(${url})`)}`,
+  );
+  // Restore code
+  s = s.replace(/\u0000C(\d+)\u0000/g, (_, i) => codes[Number(i)] ?? "");
+  return s;
+}
+
+/** Soft-normalize messy model markdown before line parsing. */
+function normalizeMarkdownSource(source) {
+  let s = String(source).replace(/\r\n/g, "\n");
+  // Break glued heading markers: "---### Title" / "text### Title"
+  s = s.replace(/([^\n#])(#{1,6}\s)/g, "$1\n$2");
+  // Break glued thematic break before heading: "---###"
+  s = s.replace(/(-{3,}|_{3,}|\*{3,})(#{1,6}\s)/g, "$1\n$2");
+  // Ensure list markers start on their own line when jammed after text
+  s = s.replace(/([.:;!?])\s*([-*+]\s+\*\*)/g, "$1\n$2");
   return s;
 }
 
@@ -47,7 +70,7 @@ function styleInline(text) {
  */
 function renderMarkdown(source) {
   if (!source) return "";
-  const lines = String(source).replace(/\r\n/g, "\n").split("\n");
+  const lines = normalizeMarkdownSource(source).split("\n");
   const outLines = [];
   let i = 0;
   let inFence = false;
@@ -56,10 +79,10 @@ function renderMarkdown(source) {
   while (i < lines.length) {
     const line = lines[i];
 
-    if (line.startsWith("```")) {
+    if (line.trimStart().startsWith("```")) {
       if (!inFence) {
         inFence = true;
-        fenceLang = line.slice(3).trim();
+        fenceLang = line.trimStart().slice(3).trim();
         outLines.push(color(ANSI.dim, fenceLang ? `┌─ ${fenceLang}` : "┌─"));
       } else {
         inFence = false;
@@ -80,7 +103,7 @@ function renderMarkdown(source) {
       const level = line.match(/^#+/)[0].length;
       const title = line.replace(/^#{1,6}\s+/, "");
       const styled = styleInline(title);
-      outLines.push(level <= 2 ? color(ANSI.bold, styled) : styled);
+      outLines.push(level <= 2 ? color(ANSI.bold, styled) : color(ANSI.bold, styled));
       i += 1;
       continue;
     }
@@ -115,14 +138,13 @@ function renderMarkdown(source) {
     }
 
     if (line.includes("|") && line.trim().startsWith("|")) {
-      // simple table row — strip pipes, pad lightly
       const cells = line
         .split("|")
         .slice(1, -1)
         .map((c) => c.trim());
       if (cells.every((c) => /^:?-+:?$/.test(c))) {
         i += 1;
-        continue; // separator
+        continue;
       }
       outLines.push(`  ${cells.map((c) => styleInline(c)).join(color(ANSI.dim, " · "))}`);
       i += 1;
@@ -139,7 +161,6 @@ function renderMarkdown(source) {
     i += 1;
   }
 
-  // Trim trailing blank lines
   while (outLines.length && outLines[outLines.length - 1] === "") outLines.pop();
   return outLines.join("\n");
 }
@@ -149,8 +170,70 @@ function printAnswer(text) {
     out(color(ANSI.dim, "(empty)"));
     return;
   }
-  const rendered = ANSI_OK ? renderMarkdown(text) : text;
-  process.stdout.write(`${rendered}\n`);
+  process.stdout.write(`${renderMarkdown(text)}\n`);
+}
+
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+/** Split so ANSI escapes stay intact while typewriting. */
+function ansiChunks(text) {
+  const parts = [];
+  const re = /\x1b\[[0-9;]*m|[^\x1b]+/g;
+  let match;
+  while ((match = re.exec(String(text)))) parts.push(match[0]);
+  return parts;
+}
+
+/**
+ * Stream clean markdown to the terminal. Cache hits use a very high CPS so
+ * the replay feels snappy instead of dumping raw markdown source.
+ */
+async function streamAnswer(text, opts = {}) {
+  if (!text) {
+    out(color(ANSI.dim, "(empty)"));
+    return;
+  }
+  const rendered = renderMarkdown(text);
+  if (!ANSI_OK) {
+    process.stdout.write(`${rendered}\n`);
+    return;
+  }
+  const cacheHit = Boolean(opts.cacheHit);
+  const cps = cacheHit ? 16_000 : opts.fast ? 10_000 : 6_000;
+  const chunkSize = Math.max(12, Math.floor(cps / 90));
+  let pending = "";
+
+  for (const part of ansiChunks(rendered)) {
+    if (part.startsWith("\x1b")) {
+      process.stdout.write(part);
+      continue;
+    }
+    for (let i = 0; i < part.length; ) {
+      const slice = part.slice(i, i + chunkSize);
+      pending += slice;
+      i += slice.length;
+      if (pending.length >= chunkSize || slice.includes("\n")) {
+        process.stdout.write(pending);
+        pending = "";
+        await sleep(Math.max(3, Math.round((1000 * chunkSize) / cps)));
+      }
+    }
+  }
+  if (pending) process.stdout.write(pending);
+  process.stdout.write("\n");
+}
+
+function isCacheHit(meta) {
+  if (!meta || typeof meta !== "object") return false;
+  return Boolean(
+    meta.exact_cache_hit ||
+      meta.prompt_cache_hit ||
+      meta.semantic_cache_hit ||
+      meta.prefix_cache_hit ||
+      meta.cache_hit,
+  );
 }
 
 const COMMANDS = [
@@ -462,7 +545,7 @@ async function complete(flags, config, messages) {
   });
 }
 
-/** Stream a completion; buffers tokens then returns { text, result }. */
+/** Stream a completion; buffers tokens (no raw dump), returns { text, result }. */
 async function completeStream(flags, config, messages) {
   const gatewayURL = gateway(flags, config);
   const { apiKey, sessionId } = authFromConfig(flags, config);
@@ -500,6 +583,7 @@ async function completeStream(flags, config, messages) {
   };
   let spinTimer = null;
   let spinFrame = 0;
+  const started = Date.now();
   const frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
   if (ANSI_OK) {
     spinTimer = setInterval(() => {
@@ -542,7 +626,7 @@ async function completeStream(flags, config, messages) {
   }
 
   result.choices = [{ message: { role: "assistant", content: text } }];
-  return { text, result };
+  return { text, result, elapsedMs: Date.now() - started };
 }
 
 async function cmdLogin(flags) {
@@ -684,8 +768,14 @@ async function cmdChat(flags, positional) {
   if (!prompt) die('Usage: promptimizer chat "What is 17 * 24?"');
   out();
   out(color(ANSI.magenta, "✦"));
-  const { text, result } = await completeStream(flags, config, [{ role: "user", content: prompt }]);
-  printAnswer(text);
+  const { text, result, elapsedMs } = await completeStream(flags, config, [
+    { role: "user", content: prompt },
+  ]);
+  const meta = result.promptimizer ?? {};
+  await streamAnswer(text, {
+    cacheHit: isCacheHit(meta),
+    fast: (elapsedMs ?? 0) < 500,
+  });
   out();
   printMeta(result);
   out();
@@ -893,8 +983,12 @@ async function interactive(flags) {
       out();
       out(color(ANSI.magenta, "✦"));
       try {
-        const { text, result } = await completeStream(flags, readConfig(), history);
-        printAnswer(text);
+        const { text, result, elapsedMs } = await completeStream(flags, readConfig(), history);
+        const meta = result.promptimizer ?? {};
+        await streamAnswer(text, {
+          cacheHit: isCacheHit(meta),
+          fast: (elapsedMs ?? 0) < 500,
+        });
         history.push({ role: "assistant", content: text });
         out();
         printMeta(result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "promptimizer-cli",
-  "version": "0.1.50",
+  "version": "0.1.52",
   "description": "Interactive Promptimizer CLI — Gemini-style REPL for quality-aware routing.",
   "type": "module",
   "bin": {