@ridit/lens 0.1.7 → 0.1.8

package/dist/index.mjs

@@ -44359,6 +44359,14 @@ var build_default = Spinner;
 
 // src/colors.ts
 var ACCENT = "#DA7758";
+var TOKEN_KEYWORD = "#B385C9";
+var TOKEN_STRING = "#85C98A";
+var TOKEN_NUMBER = "#E8C170";
+var TOKEN_PROPERTY = "#79C5D4";
+var TOKEN_ENTITY = "#7AABDB";
+var TOKEN_TEXT = "#E8E8E8";
+var TOKEN_MUTED = "#888888";
+var TOKEN_COMMENT = "#777777";
 
 // src/utils/thinking.tsx
 var import_react30 = __toESM(require_react(), 1);
@@ -48707,10 +48715,10 @@ More content."}
 ### 11. search — search the internet for anything you are unsure about
 <search>how to use React useEffect cleanup function</search>
 
-### 11. clone — clone a GitHub repo so you can explore and discuss it
+### 12. clone — clone a GitHub repo so you can explore and discuss it
 <clone>https://github.com/owner/repo</clone>
 
-### 12. changes — propose code edits (shown as a diff for user approval)
+### 13. changes — propose code edits (shown as a diff for user approval)
 <changes>
 {"summary": "what changed and why", "patches": [{"path": "src/foo.ts", "content": "COMPLETE file content", "isNew": false}]}
 </changes>
@@ -48729,16 +48737,19 @@ More content."}
 10. shell is ONLY for running code, installing packages, building, testing — not for filesystem inspection
 11. write-file content field must be the COMPLETE file content, never empty or placeholder
 12. After a write-file succeeds, do NOT repeat it — trust the result and move on
-13. After a write-file succeeds, use read-file to verify the content before telling the user it is done
+13. After a write-file succeeds, tell the user it is done immediately — do NOT auto-read the file back to verify
 14. NEVER apologize and redo a tool call you already made — if write-file or shell ran and returned a result, it worked, do not run it again
 15. NEVER say "I made a mistake" and repeat the same tool — one attempt is enough, trust the output
 16. NEVER second-guess yourself mid-response — commit to your answer
 17. If a read-folder or read-file returns "not found", accept it and move on — do NOT retry the same path
 18. If you have already retrieved a result for a path in this conversation, do NOT request it again — use the result you already have
-17. Every shell command runs from the repo root — \`cd\` has NO persistent effect. NEVER use \`cd\` alone. Use full paths or combine with && e.g. \`cd list && bun run index.ts\`
-18. write-file paths are relative to the repo root — if creating files in a subfolder write the full relative path e.g. \`list/src/index.tsx\` NOT \`src/index.tsx\`
-19. When scaffolding a new project in a subfolder, ALL write-file paths must start with that subfolder name e.g. \`list/package.json\`, \`list/src/index.tsx\`
-20. For JSX/TSX files always use \`.tsx\` extension and include \`/** @jsxImportSource react */\` or ensure tsconfig has jsx set — bun needs this to parse JSX
+19. Every shell command runs from the repo root — \`cd\` has NO persistent effect. NEVER use \`cd\` alone. Use full paths or combine with && e.g. \`cd list && bun run index.ts\`
+20. write-file paths are relative to the repo root — if creating files in a subfolder write the full relative path e.g. \`list/src/index.tsx\` NOT \`src/index.tsx\`
+21. When scaffolding a new project in a subfolder, ALL write-file paths must start with that subfolder name e.g. \`list/package.json\`, \`list/src/index.tsx\`
+22. For JSX/TSX files always use \`.tsx\` extension and include \`/** @jsxImportSource react */\` or ensure tsconfig has jsx set — bun needs this to parse JSX
+23. When explaining how to use a tool in text, use [tag] bracket notation or a fenced code block — NEVER emit a real XML tool tag as part of an explanation or example
+24. NEVER chain tool calls unless the user's request explicitly requires multiple steps
+25. NEVER read files, list folders, or run tools that were not asked for in the current user message
 
 ## CRITICAL: READ BEFORE YOU WRITE
 
@@ -48952,6 +48963,22 @@ Please continue your response based on this output.`
     role: "assistant",
     content: "`useInput` is used in `src/components/chat/ChatRunner.tsx` — imported on line 5 and called on line 210."
   },
+  {
+    role: "user",
+    content: "show me how to use the read-file tool"
+  },
+  {
+    role: "assistant",
+    content: "To read a file, emit the tag alone in your response — nothing else on that turn:\n\n```text\n[read-file]src/components/Header.tsx[/read-file]\n```\n\nThe result comes back as the next user message and you can then analyze it."
+  },
+  {
+    role: "user",
+    content: "show me an example of the shell tool"
+  },
+  {
+    role: "assistant",
+    content: "To run a shell command, emit only the tag:\n\n```text\n[shell]node -v[/shell]\n```\n\nThe stdout/stderr is returned and you can read it in the next turn."
+  },
   {
     role: "user",
     content: "read src folder"
@@ -49187,21 +49214,29 @@ Please continue your response based on this output.`
   },
   {
     role: "assistant",
-    content: "<read-file>ts-info.json</read-file>"
+    content: "Done — `ts-info.json` has been saved."
   },
   {
     role: "user",
-    content: `Here is the output from read-file of ts-info.json:
-
-File: ts-info.json (1 lines)
+    content: "write it to a file called hello.py"
+  },
+  {
+    role: "assistant",
+    content: `<write-file>
+{"path": "hello.py", "content": "# hello.py\\nprint('hello')"}
+</write-file>`
+  },
+  {
+    role: "user",
+    content: `Here is the output from write-file to hello.py:
 
-{"name":"TypeScript","stars":100000}
+Written: /repo/hello.py (2 lines, 32 bytes)
 
 Please continue your response based on this output.`
   },
   {
     role: "assistant",
-    content: "Done — saved and verified `ts-info.json`. Data looks correct."
+    content: "Done — `hello.py` has been written."
   },
   {
     role: "user",
@@ -49286,6 +49321,7 @@ Please continue your response based on this output.`
   }
 ];
 function parseResponse(text) {
+  const scanText = text.replace(/```[\s\S]*?```/g, (m) => " ".repeat(m.length));
   const candidates = [];
   const patterns = [
     { kind: "fetch", re: /<fetch>([\s\S]*?)<\/fetch>/g },
@@ -49314,16 +49350,25 @@ function parseResponse(text) {
   ];
   for (const { kind: kind2, re } of patterns) {
     re.lastIndex = 0;
-    const m = re.exec(text);
-    if (m)
-      candidates.push({ index: m.index, kind: kind2, match: m });
+    const m = re.exec(scanText);
+    if (m) {
+      const originalRe = new RegExp(re.source, re.flags.replace("g", ""));
+      const originalMatch = originalRe.exec(text.slice(m.index));
+      if (originalMatch) {
+        const fakeMatch = Object.assign([
+          text.slice(m.index, m.index + originalMatch[0].length),
+          originalMatch[1]
+        ], { index: m.index, input: text, groups: undefined });
+        candidates.push({ index: m.index, kind: kind2, match: fakeMatch });
+      }
+    }
   }
   if (candidates.length === 0)
     return { kind: "text", content: text.trim() };
   candidates.sort((a, b) => a.index - b.index);
   const { kind, match } = candidates[0];
   const before2 = text.slice(0, match.index).replace(/<(fetch|shell|read-file|read-folder|write-file|search|clone|changes)[^>]*>[\s\S]*?<\/\1>/g, "").trim();
-  const body = match[1].trim();
+  const body = (match[1] ?? "").trim();
   if (kind === "changes") {
     try {
       const parsed = JSON.parse(body);
@@ -49426,7 +49471,7 @@ Please continue your response based on this output.`
     return { role: m.role, content: m.content };
   });
 }
-async function callChat(provider, systemPrompt, messages) {
+async function callChat(provider, systemPrompt, messages, abortSignal) {
   const apiMessages = [...FEW_SHOT_MESSAGES, ...buildApiMessages(messages)];
   let url;
   let headers;
@@ -49459,6 +49504,7 @@ async function callChat(provider, systemPrompt, messages) {
   }
   const controller = new AbortController;
   const timer = setTimeout(() => controller.abort(), 60000);
+  abortSignal?.addEventListener("abort", () => controller.abort());
   const res = await fetch(url, {
     method: "POST",
     headers,
@@ -50010,7 +50056,6 @@ for line in raw.split("\\n"):
     elif s == "":
         story.append(Spacer(1, 6))
     else:
-        # handle **bold** inline
         import re
         s = re.sub(r"\\*\\*(.+?)\\*\\*", r"<b>\\1</b>", s)
         s = re.sub(r"\\*(.+?)\\*", r"<i>\\1</i>", s)
@@ -50034,113 +50079,1014 @@ print("OK")
   }
 }
 
+// node_modules/sugar-high/lib/index.js
+var JSXBrackets = new Set(["<", ">", "{", "}", "[", "]"]);
+var Keywords_Js = new Set([
+  "for",
+  "do",
+  "while",
+  "if",
+  "else",
+  "return",
+  "function",
+  "var",
+  "let",
+  "const",
+  "true",
+  "false",
+  "undefined",
+  "this",
+  "new",
+  "delete",
+  "typeof",
+  "in",
+  "instanceof",
+  "void",
+  "break",
+  "continue",
+  "switch",
+  "case",
+  "default",
+  "throw",
+  "try",
+  "catch",
+  "finally",
+  "debugger",
+  "with",
+  "yield",
+  "async",
+  "await",
+  "class",
+  "extends",
+  "super",
+  "import",
+  "export",
+  "from",
+  "static"
+]);
+var Signs = new Set([
+  "+",
+  "-",
+  "*",
+  "/",
+  "%",
+  "=",
+  "!",
+  "&",
+  "|",
+  "^",
+  "~",
+  "!",
+  "?",
+  ":",
+  ".",
+  ",",
+  ";",
+  `'`,
+  '"',
+  ".",
+  "(",
+  ")",
+  "[",
+  "]",
+  "#",
+  "@",
+  "\\",
+  ...JSXBrackets
+]);
+var DefaultOptions = {
+  keywords: Keywords_Js,
+  onCommentStart: isCommentStart_Js,
+  onCommentEnd: isCommentEnd_Js
+};
+var TokenTypes = [
+  "identifier",
+  "keyword",
+  "string",
+  "class",
+  "property",
+  "entity",
+  "jsxliterals",
+  "sign",
+  "comment",
+  "break",
+  "space"
+];
+var [
+  T_IDENTIFIER,
+  T_KEYWORD,
+  T_STRING,
+  T_CLS_NUMBER,
+  T_PROPERTY,
+  T_ENTITY,
+  T_JSX_LITERALS,
+  T_SIGN,
+  T_COMMENT,
+  T_BREAK,
+  T_SPACE
+] = TokenTypes.map((_, i) => i);
+function isSpaces(str) {
+  return /^[^\S\r\n]+$/g.test(str);
+}
+function isSign(ch) {
+  return Signs.has(ch);
+}
+function isWord(chr) {
+  return /^[\w_]+$/.test(chr) || hasUnicode(chr);
+}
+function isCls(str) {
+  const chr0 = str[0];
+  return isWord(chr0) && chr0 === chr0.toUpperCase() || str === "null";
+}
+function hasUnicode(s) {
+  return /[^\u0000-\u007f]/.test(s);
+}
+function isAlpha(chr) {
+  return /^[a-zA-Z]$/.test(chr);
+}
+function isIdentifierChar(chr) {
+  return isAlpha(chr) || hasUnicode(chr);
+}
+function isIdentifier(str) {
+  return isIdentifierChar(str[0]) && (str.length === 1 || isWord(str.slice(1)));
+}
+function isStrTemplateChr(chr) {
+  return chr === "`";
+}
+function isSingleQuotes(chr) {
+  return chr === '"' || chr === "'";
+}
+function isStringQuotation(chr) {
+  return isSingleQuotes(chr) || isStrTemplateChr(chr);
+}
+function isCommentStart_Js(curr, next) {
+  const str = curr + next;
+  if (str === "/*")
+    return 2;
+  return str === "//" ? 1 : 0;
+}
+function isCommentEnd_Js(prev, curr) {
+  return prev + curr === "*/" ? 2 : curr === `
+` ? 1 : 0;
+}
+function isRegexStart(str) {
+  return str[0] === "/" && !isCommentStart_Js(str[0], str[1]);
+}
+function tokenize3(code, options) {
+  const {
+    keywords,
+    onCommentStart,
+    onCommentEnd
+  } = { ...DefaultOptions, ...options };
+  let current = "";
+  let type = -1;
+  let last2 = [-1, ""];
+  let beforeLast = [-2, ""];
+  const tokens = [];
+  let __jsxEnter = false;
+  let __jsxTag = 0;
+  let __jsxExpr = false;
+  let __jsxStack = 0;
+  const __jsxChild = () => __jsxEnter && !__jsxExpr && !__jsxTag;
+  const inJsxTag = () => __jsxTag && !__jsxChild();
+  const inJsxLiterals = () => !__jsxTag && __jsxChild() && !__jsxExpr && __jsxStack > 0;
+  let __strQuote = null;
+  let __regexQuoteStart = false;
+  let __strTemplateExprStack = 0;
+  let __strTemplateQuoteStack = 0;
+  const inStringQuotes = () => __strQuote !== null;
+  const inRegexQuotes = () => __regexQuoteStart;
+  const inStrTemplateLiterals = () => __strTemplateQuoteStack > __strTemplateExprStack;
+  const inStrTemplateExpr = () => __strTemplateQuoteStack > 0 && __strTemplateQuoteStack === __strTemplateExprStack;
+  const inStringContent = () => inStringQuotes() || inStrTemplateLiterals();
+  function classify(token) {
+    const isLineBreak = token === `
+`;
+    if (inJsxTag()) {
+      if (inStringQuotes()) {
+        return T_STRING;
+      }
+      const [, lastToken] = last2;
+      if (isIdentifier(token)) {
+        if (lastToken === "<" || lastToken === "</")
+          return T_ENTITY;
+      }
+    }
+    const isJsxLiterals = inJsxLiterals();
+    if (isJsxLiterals)
+      return T_JSX_LITERALS;
+    if (inStringQuotes() || inStrTemplateLiterals()) {
+      return T_STRING;
+    } else if (keywords.has(token)) {
+      return last2[1] === "." ? T_IDENTIFIER : T_KEYWORD;
+    } else if (isLineBreak) {
+      return T_BREAK;
+    } else if (isSpaces(token)) {
+      return T_SPACE;
+    } else if (token.split("").every(isSign)) {
+      return T_SIGN;
+    } else if (isCls(token)) {
+      return inJsxTag() ? T_IDENTIFIER : T_CLS_NUMBER;
+    } else {
+      if (isIdentifier(token)) {
+        const isLastPropDot = last2[1] === "." && isIdentifier(beforeLast[1]);
+        if (!inStringContent() && !isLastPropDot)
+          return T_IDENTIFIER;
+        if (isLastPropDot)
+          return T_PROPERTY;
+      }
+      return T_STRING;
+    }
+  }
+  const append = (type_, token_) => {
+    if (token_) {
+      current = token_;
+    }
+    if (current) {
+      type = type_ || classify(current);
+      const pair = [type, current];
+      if (type !== T_SPACE && type !== T_BREAK) {
+        beforeLast = last2;
+        last2 = pair;
+      }
+      tokens.push(pair);
+    }
+    current = "";
+  };
+  for (let i = 0;i < code.length; i++) {
+    const curr = code[i];
+    const prev = code[i - 1];
+    const next = code[i + 1];
+    const p_c = prev + curr;
+    const c_n = curr + next;
+    if (isSingleQuotes(curr) && !inJsxLiterals() && !inStrTemplateLiterals()) {
+      append();
+      if (prev !== `\\`) {
+        if (__strQuote && curr === __strQuote) {
+          __strQuote = null;
+        } else if (!__strQuote) {
+          __strQuote = curr;
+        }
+      }
+      append(T_STRING, curr);
+      continue;
+    }
+    if (!inStrTemplateLiterals()) {
+      if (prev !== "\\n" && isStrTemplateChr(curr)) {
+        append();
+        append(T_STRING, curr);
+        __strTemplateQuoteStack++;
+        continue;
+      }
+    }
+    if (inStrTemplateLiterals()) {
+      if (prev !== "\\n" && isStrTemplateChr(curr)) {
+        if (__strTemplateQuoteStack > 0) {
+          append();
+          __strTemplateQuoteStack--;
+          append(T_STRING, curr);
+          continue;
+        }
+      }
+      if (c_n === "${") {
+        __strTemplateExprStack++;
+        append(T_STRING);
+        append(T_SIGN, c_n);
+        i++;
+        continue;
+      }
+    }
+    if (inStrTemplateExpr() && curr === "}") {
+      append();
+      __strTemplateExprStack--;
+      append(T_SIGN, curr);
+      continue;
+    }
+    if (__jsxChild()) {
+      if (curr === "{") {
+        append();
+        append(T_SIGN, curr);
+        __jsxExpr = true;
+        continue;
+      }
+    }
+    if (__jsxEnter) {
+      if (!__jsxTag && curr === "<") {
+        append();
+        if (next === "/") {
+          __jsxTag = 2;
+          current = c_n;
+          i++;
+        } else {
+          __jsxTag = 1;
+          current = curr;
+        }
+        append(T_SIGN);
+        continue;
+      }
+      if (__jsxTag) {
+        if (curr === ">" && !"/=".includes(prev)) {
+          append();
+          if (__jsxTag === 1) {
+            __jsxTag = 0;
+            __jsxStack++;
+          } else {
+            __jsxTag = 0;
+            __jsxEnter = false;
+          }
+          append(T_SIGN, curr);
+          continue;
+        }
+        if (c_n === "/>" || c_n === "</") {
+          if (current !== "<" && current !== "/") {
+            append();
+          }
+          if (c_n === "/>") {
+            __jsxTag = 0;
+          } else {
+            __jsxStack--;
+          }
+          if (!__jsxStack)
+            __jsxEnter = false;
+          current = c_n;
+          i++;
+          append(T_SIGN);
+          continue;
+        }
+        if (curr === "<") {
+          append();
+          current = curr;
+          append(T_SIGN);
+          continue;
+        }
+        if (next === "-" && !inStringContent() && !inJsxLiterals()) {
+          if (current) {
+            append(T_PROPERTY, current + curr + next);
+            i++;
+            continue;
+          }
+        }
+        if (next === "=" && !inStringContent()) {
+          if (!isSpaces(curr)) {
+            if (isSpaces(current)) {
+              append();
+            }
+            const prop = current + curr;
+            if (isIdentifier(prop)) {
+              append(T_PROPERTY, prop);
+              continue;
+            }
+          }
+        }
+      }
+    }
+    if (!__jsxTag && (curr === "<" && isIdentifierChar(next) || c_n === "</")) {
+      __jsxTag = next === "/" ? 2 : 1;
+      if (curr === "<" && (next === "/" || isAlpha(next))) {
+        if (!inStringContent() && !inJsxLiterals() && !inRegexQuotes()) {
+          __jsxEnter = true;
+        }
+      }
+    }
+    const isQuotationChar = isStringQuotation(curr);
+    const isStringTemplateLiterals = inStrTemplateLiterals();
+    const isRegexChar = !__jsxEnter && isRegexStart(c_n);
+    const isJsxLiterals = inJsxLiterals();
+    if (isQuotationChar || isStringTemplateLiterals || isSingleQuotes(__strQuote)) {
+      current += curr;
+    } else if (isRegexChar) {
+      append();
+      const [lastType, lastToken] = last2;
+      if (isRegexChar && lastType !== -1 && !(lastType === T_SIGN && lastToken !== ")" || lastType === T_COMMENT)) {
+        current = curr;
+        append();
+        continue;
+      }
+      __regexQuoteStart = true;
+      const start = i++;
+      const isEof = () => i >= code.length;
+      const isEol = () => isEof() || code[i] === `
+`;
+      let foundClose = false;
+      for (;!isEol(); i++) {
+        if (code[i] === "/" && code[i - 1] !== "\\") {
+          foundClose = true;
+          while (start !== i && /^[a-z]$/.test(code[i + 1]) && !isEol()) {
+            i++;
+          }
+          break;
+        }
+      }
+      __regexQuoteStart = false;
+      if (start !== i && foundClose) {
+        current = code.slice(start, i + 1);
+        append(T_STRING);
+      } else {
+        current = curr;
+        append();
+        i = start;
+      }
+    } else if (onCommentStart(curr, next)) {
+      append();
+      const start = i;
+      const startCommentType = onCommentStart(curr, next);
+      if (startCommentType) {
+        for (;i < code.length; i++) {
+          const endCommentType = onCommentEnd(code[i - 1], code[i]);
+          if (endCommentType == startCommentType)
+            break;
+        }
+      }
+      current = code.slice(start, i + 1);
+      append(T_COMMENT);
+    } else if (curr === " " || curr === `
+`) {
+      if (curr === " " && (isSpaces(current) || !current || isJsxLiterals)) {
+        current += curr;
+        if (next === "<") {
+          append();
+        }
+      } else {
+        append();
+        current = curr;
+        append();
+      }
+    } else {
+      if (__jsxExpr && curr === "}") {
+        append();
+        current = curr;
+        append();
+        __jsxExpr = false;
+      } else if (isJsxLiterals && !JSXBrackets.has(curr) || inStrTemplateLiterals() || (isWord(curr) === isWord(current[current.length - 1]) || __jsxChild()) && !Signs.has(curr)) {
+        current += curr;
+      } else {
+        if (p_c === "</") {
+          current = p_c;
+        }
+        append();
+        if (p_c !== "</") {
+          current = curr;
+        }
+        if (c_n === "</" || c_n === "/>") {
+          current = c_n;
+          append();
+          i++;
+        } else if (JSXBrackets.has(curr))
+          append();
+      }
+    }
+  }
+  append();
+  return tokens;
+}
+var SugarHigh = {
+  TokenTypes,
+  TokenMap: new Map(TokenTypes.map((type, i) => [type, i]))
+};
+
 // src/components/chat/ChatMessage.tsx
 var jsx_dev_runtime19 = __toESM(require_jsx_dev_runtime(), 1);
+var T_IDENTIFIER2 = 0;
+var T_KEYWORD2 = 1;
+var T_STRING2 = 2;
+var T_CLS_NUMBER2 = 3;
+var T_PROPERTY2 = 4;
+var T_ENTITY2 = 5;
+var T_JSX_LITERAL = 6;
+var T_SIGN2 = 7;
+var T_COMMENT2 = 8;
+var T_BREAK2 = 9;
+var T_SPACE2 = 10;
+var JS_LANGS = new Set([
+  "js",
+  "javascript",
+  "jsx",
+  "ts",
+  "typescript",
+  "tsx",
+  "mjs",
+  "cjs"
+]);
+function tokenColor(type) {
+  switch (type) {
+    case T_KEYWORD2:
+      return TOKEN_KEYWORD;
+    case T_STRING2:
+      return TOKEN_STRING;
+    case T_CLS_NUMBER2:
+      return TOKEN_NUMBER;
+    case T_PROPERTY2:
+      return TOKEN_PROPERTY;
+    case T_ENTITY2:
+      return TOKEN_ENTITY;
+    case T_JSX_LITERAL:
+      return TOKEN_TEXT;
+    case T_SIGN2:
+      return TOKEN_MUTED;
+    case T_COMMENT2:
+      return TOKEN_COMMENT;
+    case T_IDENTIFIER2:
+      return TOKEN_TEXT;
+    default:
+      return TOKEN_TEXT;
+  }
+}
+var PYTHON_KW = new Set([
+  "def",
+  "class",
+  "import",
+  "from",
+  "return",
+  "if",
+  "elif",
+  "else",
+  "for",
+  "while",
+  "in",
+  "not",
+  "and",
+  "or",
+  "is",
+  "None",
+  "True",
+  "False",
+  "try",
+  "except",
+  "finally",
+  "with",
+  "as",
+  "pass",
+  "break",
+  "continue",
+  "raise",
+  "yield",
+  "lambda",
+  "async",
+  "await",
+  "del",
+  "global",
+  "nonlocal",
+  "assert"
+]);
+var RUST_KW = new Set([
+  "fn",
+  "let",
+  "mut",
+  "const",
+  "struct",
+  "enum",
+  "impl",
+  "trait",
+  "pub",
+  "use",
+  "mod",
+  "match",
+  "if",
+  "else",
+  "loop",
+  "while",
+  "for",
+  "in",
+  "return",
+  "self",
+  "Self",
+  "super",
+  "where",
+  "type",
+  "as",
+  "ref",
+  "move",
+  "unsafe",
+  "extern",
+  "dyn",
+  "async",
+  "await",
+  "true",
+  "false",
+  "Some",
+  "None",
+  "Ok",
+  "Err"
+]);
+var GO_KW = new Set([
+  "func",
+  "var",
+  "const",
+  "type",
+  "struct",
+  "interface",
+  "package",
+  "import",
+  "return",
+  "if",
+  "else",
+  "for",
+  "range",
+  "switch",
+  "case",
+  "default",
+  "break",
+  "continue",
+  "goto",
+  "defer",
+  "go",
+  "chan",
+  "map",
+  "make",
+  "new",
+  "nil",
+  "true",
+  "false",
+  "error"
+]);
+var SHELL_KW = new Set([
+  "if",
+  "then",
+  "else",
+  "elif",
+  "fi",
+  "for",
+  "do",
+  "done",
+  "while",
+  "case",
+  "esac",
+  "in",
+  "function",
+  "return",
+  "echo",
+  "export",
+  "local",
+  "source",
+  "exit"
+]);
+var CSS_AT = /^@[\w-]+/;
+var CSS_PROP = /^[\w-]+(?=\s*:)/;
+function tokenizeGeneric(code, lang) {
+  const keywords = lang === "python" || lang === "py" ? PYTHON_KW : lang === "rust" || lang === "rs" ? RUST_KW : lang === "go" ? GO_KW : lang === "bash" || lang === "sh" || lang === "shell" || lang === "zsh" ? SHELL_KW : new Set;
+  const lines = code.split(`
+`);
+  return lines.map((line) => {
+    const tokens = [];
+    let i = 0;
+    const push = (color, text) => {
+      if (text)
+        tokens.push({ color, text });
+    };
+    while (i < line.length) {
+      const rest2 = line.slice(i);
+      const commentPrefixes = lang === "python" || lang === "py" ? ["#"] : lang === "bash" || lang === "sh" || lang === "shell" || lang === "zsh" ? ["#"] : lang === "css" || lang === "scss" ? ["//", "/*"] : lang === "html" || lang === "xml" ? ["<!--"] : lang === "sql" ? ["--", "#"] : ["//", "#"];
+      let matchedComment = false;
+      for (const prefix of commentPrefixes) {
+        if (rest2.startsWith(prefix)) {
+          push(TOKEN_COMMENT, line.slice(i));
+          i = line.length;
+          matchedComment = true;
+          break;
+        }
+      }
+      if (matchedComment)
+        continue;
+      if (line[i] === '"' || line[i] === "'" || line[i] === "`") {
+        const quote = line[i];
+        let j = i + 1;
+        while (j < line.length) {
+          if (line[j] === "\\") {
+            j += 2;
+            continue;
+          }
+          if (line[j] === quote) {
+            j++;
+            break;
+          }
+          j++;
+        }
+        push(TOKEN_STRING, line.slice(i, j));
+        i = j;
+        continue;
+      }
+      const numMatch = rest2.match(/^-?\d+\.?\d*/);
+      if (numMatch && (i === 0 || !/\w/.test(line[i - 1] ?? ""))) {
+        push(TOKEN_NUMBER, numMatch[0]);
+        i += numMatch[0].length;
+        continue;
+      }
+      if (lang === "css" || lang === "scss") {
+        const atMatch = rest2.match(CSS_AT);
+        if (atMatch) {
+          push(TOKEN_KEYWORD, atMatch[0]);
+          i += atMatch[0].length;
+          continue;
+        }
+        const propMatch = rest2.match(CSS_PROP);
+        if (propMatch) {
+          push(TOKEN_PROPERTY, propMatch[0]);
+          i += propMatch[0].length;
+          continue;
+        }
+      }
+      if ((lang === "html" || lang === "xml") && line[i] === "<") {
+        const tagMatch = rest2.match(/^<\/?[\w:-]+/);
+        if (tagMatch) {
+          push(TOKEN_ENTITY, tagMatch[0]);
+          i += tagMatch[0].length;
+          continue;
+        }
+      }
+      const wordMatch = rest2.match(/^[a-zA-Z_$][\w$]*/);
+      if (wordMatch) {
+        const word = wordMatch[0];
+        push(keywords.has(word) ? TOKEN_KEYWORD : TOKEN_TEXT, word);
+        i += word.length;
+        continue;
+      }
+      const opMatch = rest2.match(/^[^\w\s"'`]+/);
+      if (opMatch) {
+        push(TOKEN_MUTED, opMatch[0]);
+        i += opMatch[0].length;
+        continue;
+      }
+      push(TOKEN_TEXT, line[i]);
+      i++;
+    }
+    return tokens;
+  });
+}
+function HighlightedLine({ tokens }) {
+  return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+    children: [
+      "  ",
+      tokens.map((t, i) => /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+        color: t.color,
+        children: t.text
+      }, i, false, undefined, this))
+    ]
+  }, undefined, true, undefined, this);
+}
+function CodeBlock({ lang, code }) {
+  const normalizedLang = lang.toLowerCase().trim();
+  let lines;
+  if (JS_LANGS.has(normalizedLang)) {
+    const tokens = tokenize3(code);
+    const lineAccum = [[]];
+    for (const [type, value] of tokens) {
+      if (type === T_BREAK2) {
+        lineAccum.push([]);
+      } else if (type !== T_SPACE2) {
+        lineAccum[lineAccum.length - 1].push({
+          color: tokenColor(type),
+          text: value
+        });
+      } else {
+        lineAccum[lineAccum.length - 1].push({
+          color: TOKEN_TEXT,
+          text: value
+        });
+      }
+    }
+    lines = lineAccum;
+  } else if (normalizedLang) {
+    lines = tokenizeGeneric(code, normalizedLang);
+  } else {
+    lines = code.split(`
+`).map((l) => [{ color: TOKEN_TEXT, text: l }]);
+  }
+  return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+    flexDirection: "column",
+    marginY: 1,
+    marginLeft: 2,
+    children: [
+      normalizedLang ? /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+        color: TOKEN_MUTED,
+        dimColor: true,
+        children: normalizedLang
+      }, undefined, false, undefined, this) : null,
+      lines.map((lineTokens, i) => /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(HighlightedLine, {
+        tokens: lineTokens
+      }, i, false, undefined, this))
+    ]
+  }, undefined, true, undefined, this);
+}
 function InlineText({ text }) {
-  const parts = text.split(/(`[^`]+`|\*\*[^*]+\*\*)/g);
+  const parts = text.split(/(\*\*[^*]+\*\*|\*[^*]+\*|`[^`]+`)/g);
   return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(jsx_dev_runtime19.Fragment, {
     children: parts.map((part, i) => {
-      if (part.startsWith("`") && part.endsWith("`")) {
+      if (part.startsWith("**") && part.endsWith("**")) {
         return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
-          color: ACCENT,
+          bold: true,
+          color: TOKEN_TEXT,
+          children: part.slice(2, -2)
+        }, i, false, undefined, this);
+      }
+      if (part.startsWith("*") && part.endsWith("*") && part.length > 2) {
+        return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+          italic: true,
+          color: TOKEN_TEXT,
           children: part.slice(1, -1)
         }, i, false, undefined, this);
       }
-      if (part.startsWith("**") && part.endsWith("**")) {
+      if (part.startsWith("`") && part.endsWith("`")) {
         return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
-          bold: true,
-          color: "white",
-          children: part.slice(2, -2)
+          color: ACCENT,
+          children: part.slice(1, -1)
         }, i, false, undefined, this);
       }
       return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
-        color: "white",
+        color: TOKEN_TEXT,
         children: part
       }, i, false, undefined, this);
     })
   }, undefined, false, undefined, this);
 }
-function CodeBlock({ lang, code }) {
+function Heading({ level, text }) {
+  if (level === 1) {
+    return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+      marginTop: 1,
+      children: /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+        color: ACCENT,
+        bold: true,
+        underline: true,
+        children: text
+      }, undefined, false, undefined, this)
+    }, undefined, false, undefined, this);
+  }
+  if (level === 2) {
+    return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+      marginTop: 1,
+      children: /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+        color: ACCENT,
+        bold: true,
+        children: text
+      }, undefined, false, undefined, this)
+    }, undefined, false, undefined, this);
+  }
   return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
-    flexDirection: "column",
-    marginY: 1,
-    marginLeft: 2,
+    marginTop: 1,
+    children: /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+      color: TOKEN_TEXT,
+      bold: true,
+      children: text
+    }, undefined, false, undefined, this)
+  }, undefined, false, undefined, this);
+}
+function BulletItem({ text }) {
+  return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+    gap: 1,
     children: [
-      lang && /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
-        color: "gray",
-        children: lang
-      }, undefined, false, undefined, this),
-      code.split(`
-`).map((line, i) => /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
         color: ACCENT,
+        children: "*"
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+        flexShrink: 1,
+        children: /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(InlineText, {
+          text
+        }, undefined, false, undefined, this)
+      }, undefined, false, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
+}
+function NumberedItem({ num, text }) {
+  return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+    gap: 1,
+    children: [
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+        color: TOKEN_MUTED,
         children: [
-          "  ",
-          line
+          num,
+          "."
         ]
-      }, i, true, undefined, this))
+      }, undefined, true, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+        flexShrink: 1,
+        children: /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(InlineText, {
+          text
+        }, undefined, false, undefined, this)
+      }, undefined, false, undefined, this)
     ]
   }, undefined, true, undefined, this);
 }
-function MessageBody({ content }) {
-  const segments = content.split(/(```[\s\S]*?```)/g);
+function BlockQuote({ text }) {
   return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
-    flexDirection: "column",
-    children: segments.map((seg, si) => {
-      if (seg.startsWith("```")) {
-        const lines2 = seg.slice(3).split(`
+    gap: 1,
+    marginLeft: 1,
+    children: [
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+        color: TOKEN_MUTED,
+        children: "│"
+      }, undefined, false, undefined, this),
+      /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+        color: TOKEN_MUTED,
+        dimColor: true,
+        children: text
+      }, undefined, false, undefined, this)
+    ]
+  }, undefined, true, undefined, this);
+}
+function parseBlocks(content) {
+  const blocks = [];
+  const segments = content.split(/(```[\s\S]*?```)/g);
+  for (const seg of segments) {
+    if (seg.startsWith("```")) {
+      const lines = seg.slice(3).split(`
 `);
-        const lang = lines2[0]?.trim() ?? "";
-        const code = lines2.slice(1).join(`
+      const lang = lines[0]?.trim() ?? "";
+      const code = lines.slice(1).join(`
 `).replace(/```\s*$/, "").trimEnd();
-        return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(CodeBlock, {
-          lang,
-          code
-        }, si, false, undefined, this);
-      }
-      const lines = seg.split(`
-`).filter((l) => l.trim() !== "");
-      return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
-        flexDirection: "column",
-        children: lines.map((line, li) => {
-          if (line.match(/^[-*•]\s/)) {
-            return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
-              gap: 1,
-              children: [
-                /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
-                  color: ACCENT,
-                  children: "*"
-                }, undefined, false, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(InlineText, {
-                  text: line.slice(2).trim()
-                }, undefined, false, undefined, this)
-              ]
-            }, li, true, undefined, this);
-          }
-          if (line.match(/^\d+\.\s/)) {
-            const num = line.match(/^(\d+)\.\s/)[1];
-            return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
-              gap: 1,
-              children: [
-                /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
-                  color: "gray",
-                  children: [
-                    num,
-                    "."
-                  ]
-                }, undefined, true, undefined, this),
-                /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(InlineText, {
-                  text: line.replace(/^\d+\.\s/, "").trim()
-                }, undefined, false, undefined, this)
-              ]
-            }, li, true, undefined, this);
-          }
+      blocks.push({ type: "code", lang, code });
+      continue;
+    }
+    for (const line of seg.split(`
+`)) {
+      const trimmed = line.trim();
+      if (!trimmed)
+        continue;
+      const h3 = trimmed.match(/^### (.+)$/);
+      const h2 = trimmed.match(/^## (.+)$/);
+      const h1 = trimmed.match(/^# (.+)$/);
+      if (h3) {
+        blocks.push({ type: "heading", level: 3, text: h3[1] });
+        continue;
+      }
+      if (h2) {
+        blocks.push({ type: "heading", level: 2, text: h2[1] });
+        continue;
+      }
+      if (h1) {
+        blocks.push({ type: "heading", level: 1, text: h1[1] });
+        continue;
+      }
+      if (/^[-*_]{3,}$/.test(trimmed)) {
+        blocks.push({ type: "hr" });
+        continue;
+      }
+      if (trimmed.startsWith("> ")) {
+        blocks.push({ type: "blockquote", text: trimmed.slice(2).trim() });
+        continue;
+      }
+      if (/^[-*•]\s/.test(trimmed)) {
+        blocks.push({ type: "bullet", text: trimmed.slice(2).trim() });
+        continue;
+      }
+      const numMatch = trimmed.match(/^(\d+)\.\s(.+)/);
+      if (numMatch) {
+        blocks.push({
+          type: "numbered",
+          num: numMatch[1],
+          text: numMatch[2]
+        });
+        continue;
+      }
+      blocks.push({ type: "paragraph", text: trimmed });
+    }
+  }
+  return blocks;
+}
+function MessageBody({ content }) {
+  const blocks = parseBlocks(content);
+  return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+    flexDirection: "column",
+    children: blocks.map((block, i) => {
+      switch (block.type) {
+        case "heading":
+          return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Heading, {
+            level: block.level,
+            text: block.text
+          }, i, false, undefined, this);
+        case "code":
+          return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(CodeBlock, {
+            lang: block.lang,
+            code: block.code
+          }, i, false, undefined, this);
+        case "bullet":
+          return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(BulletItem, {
+            text: block.text
+          }, i, false, undefined, this);
+        case "numbered":
+          return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(NumberedItem, {
+            num: block.num,
+            text: block.text
+          }, i, false, undefined, this);
+        case "blockquote":
+          return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(BlockQuote, {
+            text: block.text
+          }, i, false, undefined, this);
+        case "hr":
+          return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
+            marginY: 1,
+            children: /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
+              color: TOKEN_MUTED,
+              dimColor: true,
+              children: "─".repeat(40)
+            }, undefined, false, undefined, this)
+          }, i, false, undefined, this);
+        case "paragraph":
           return /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
             children: /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(InlineText, {
-              text: line
+              text: block.text
             }, undefined, false, undefined, this)
-          }, li, false, undefined, this);
-        })
-      }, si, false, undefined, this);
+          }, i, false, undefined, this);
+      }
     })
   }, undefined, false, undefined, this);
 }
@@ -50151,11 +51097,11 @@ function StaticMessage({ msg }) {
       gap: 1,
       children: [
         /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
-          color: "gray",
+          color: TOKEN_MUTED,
           children: ">"
         }, undefined, false, undefined, this),
         /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
-          color: "white",
+          color: TOKEN_TEXT,
           bold: true,
           children: msg.content
         }, undefined, false, undefined, this)
@@ -50190,7 +51136,7 @@ function StaticMessage({ msg }) {
               children: icon
             }, undefined, false, undefined, this),
             /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
-              color: msg.approved ? "gray" : "red",
+              color: msg.approved ? TOKEN_MUTED : "red",
               dimColor: !msg.approved,
               children: label
             }, undefined, false, undefined, this),
@@ -50203,7 +51149,7 @@ function StaticMessage({ msg }) {
         msg.approved && msg.result && /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Box_default, {
           marginLeft: 2,
           children: /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
-            color: "gray",
+            color: TOKEN_MUTED,
             children: [
               msg.result.split(`
 `)[0]?.slice(0, 120),
@@ -50237,11 +51183,11 @@ function StaticMessage({ msg }) {
           gap: 1,
           children: [
             /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
-              color: msg.applied ? "green" : "gray",
+              color: msg.applied ? "green" : TOKEN_MUTED,
               children: msg.applied ? "✓" : "·"
             }, undefined, false, undefined, this),
             /* @__PURE__ */ jsx_dev_runtime19.jsxDEV(Text, {
-              color: msg.applied ? "green" : "gray",
+              color: msg.applied ? "green" : TOKEN_MUTED,
               dimColor: !msg.applied,
               children: msg.applied ? "changes applied" : "changes skipped"
             }, undefined, false, undefined, this)
@@ -52349,6 +53295,7 @@ var ChatRunner = ({ repoPath }) => {
   const [showTimeline, setShowTimeline] = import_react48.useState(false);
   const [showReview, setShowReview] = import_react48.useState(false);
   const [autoApprove, setAutoApprove] = import_react48.useState(false);
+  const abortControllerRef = import_react48.useRef(null);
   const toolResultCache = import_react48.useRef(new Map);
   const inputBuffer = import_react48.useRef("");
   const flushTimer = import_react48.useRef(null);
@@ -52369,6 +53316,10 @@ var ChatRunner = ({ repoPath }) => {
     }, 16);
   };
   const handleError = (currentAll) => (err) => {
+    if (err instanceof Error && err.name === "AbortError") {
+      setStage({ type: "idle" });
+      return;
+    }
     const errMsg = {
       role: "assistant",
       content: `Error: ${err instanceof Error ? err.message : "Something went wrong"}`,
@@ -52378,7 +53329,11 @@ var ChatRunner = ({ repoPath }) => {
     setCommitted((prev) => [...prev, errMsg]);
     setStage({ type: "idle" });
   };
-  const processResponse = (raw, currentAll) => {
+  const processResponse = (raw, currentAll, signal) => {
+    if (signal.aborted) {
+      setStage({ type: "idle" });
+      return;
+    }
     const parsed = parseResponse(raw);
     if (parsed.kind === "changes") {
       if (parsed.patches.length === 0) {
@@ -52532,8 +53487,10 @@ var ChatRunner = ({ repoPath }) => {
         const withTool = [...currentAll, toolMsg];
         setAllMessages(withTool);
         setCommitted((prev) => [...prev, toolMsg]);
+        const nextAbort = new AbortController;
+        abortControllerRef.current = nextAbort;
         setStage({ type: "thinking" });
-        callChat(provider, systemPrompt, withTool).then((r) => processResponse(r, withTool)).catch(handleError(withTool));
+        callChat(provider, systemPrompt, withTool, nextAbort.signal).then((r) => processResponse(r, withTool, nextAbort.signal)).catch(handleError(withTool));
       };
       if (autoApprove && isSafeTool) {
         executeAndContinue(true);
@@ -52621,12 +53578,20 @@ var ChatRunner = ({ repoPath }) => {
     setCommitted((prev) => [...prev, userMsg]);
     setAllMessages(nextAll);
     toolResultCache.current.clear();
+    const abort = new AbortController;
+    abortControllerRef.current = abort;
     setStage({ type: "thinking" });
-    callChat(provider, systemPrompt, nextAll).then((raw) => processResponse(raw, nextAll)).catch(handleError(nextAll));
+    callChat(provider, systemPrompt, nextAll, abort.signal).then((raw) => processResponse(raw, nextAll, abort.signal)).catch(handleError(nextAll));
   };
   use_input_default((input, key) => {
     if (showTimeline)
       return;
+    if (stage.type === "thinking" && key.escape) {
+      abortControllerRef.current?.abort();
+      abortControllerRef.current = null;
+      setStage({ type: "idle" });
+      return;
+    }
     if (stage.type === "idle") {
       if (key.ctrl && input === "c") {
         process.exit(0);
@@ -52958,6 +53923,11 @@ Tip: type /timeline to browse commit history.`,
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(TypewriterText, {
             text: thinkingPhrase
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime22.jsxDEV(Text, {
+            color: "gray",
+            dimColor: true,
+            children: "· esc cancel"
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),