nolo-cli 0.33.0-alpha.20 → 0.33.0-alpha.21

package/{agentRunCommand-IWXLTYGK.js → agentRunCommand-OJX27NII.js}

@@ -7,7 +7,7 @@ import {
   prependSubjectDialogMarker,
   resolveWorkflowReference,
   runAgentRunCommand
-} from "./chunk-FR2AIV4Q.js";
+} from "./chunk-46JSKTPF.js";
 import {
   parseAgentRunArgs
 } from "./chunk-ZHYK3N56.js";

package/{chunk-FR2AIV4Q.js → chunk-46JSKTPF.js}

@@ -388,6 +388,9 @@ function displayWidth(str) {
   for (const char of str) {
     const code = char.codePointAt(0) ?? 0;
     if (code < 32 || code === 127) continue;
+    if (code >= 768 && code <= 879 || code >= 6832 && code <= 6911 || code >= 7616 && code <= 7679 || code >= 8203 && code <= 8207 || code >= 8234 && code <= 8238 || code >= 8288 && code <= 8303 || code >= 8400 && code <= 8447 || code >= 65024 && code <= 65039 || code >= 65056 && code <= 65071 || code >= 917760 && code <= 917999) {
+      continue;
+    }
     if (code >= 4352 && code <= 4447 || // 0x2768-0x2775 (ornamental brackets, incl. the ❯ prompt at U+276F)
     // render narrow in terminals; counting them wide drifts the cursor.
     code >= 9728 && code <= 10175 && !(code >= 10088 && code <= 10101) || // 0x2B00-0x2BFF (Misc Symbols and Arrows, incl. ⬢ U+2B22 used as the
@@ -474,6 +477,7 @@ function padOrTruncateToWidth(text, width) {
   return `${text}${" ".repeat(width - textWidth)}`;
 }
 var SGR_RESET_REGEX = /^\x1b\[0?m$/;
+var graphemeSegmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
 function tokenizeAnsiLine(line) {
   const tokens = [];
   let index = 0;
@@ -481,28 +485,119 @@ function tokenizeAnsiLine(line) {
     if (line[index] === "\x1B") {
       const osc = line.slice(index).match(/^\x1b\]8;;[^\x07\x1b]*(?:\x07|\x1b\\)/);
       if (osc) {
-        tokens.push({ kind: "sgr", value: osc[0], width: 0 });
+        tokens.push({ kind: "sgr", value: osc[0], width: 0, charIndex: index });
         index += osc[0].length;
         continue;
       }
       const sgr = SGR_SEQUENCE_REGEX.exec(line.slice(index));
       if (sgr) {
-        tokens.push({ kind: "sgr", value: sgr[0], width: 0 });
+        tokens.push({ kind: "sgr", value: sgr[0], width: 0, charIndex: index });
         index += sgr[0].length;
         continue;
       }
+      const csi = line.slice(index).match(/^\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]/);
+      if (csi) {
+        tokens.push({ kind: "sgr", value: csi[0], width: 0, charIndex: index });
+        index += csi[0].length;
+        continue;
+      }
+    }
+    let nextEsc = line.indexOf("\x1B", index);
+    if (nextEsc === -1) nextEsc = line.length;
+    const chunk = line.slice(index, nextEsc);
+    for (const item of graphemeSegmenter.segment(chunk)) {
+      tokens.push({
+        kind: "char",
+        value: item.segment,
+        width: displayWidth(item.segment),
+        charIndex: index + item.index
+      });
     }
-    const codePoint = line.codePointAt(index) ?? 0;
-    const value = String.fromCodePoint(codePoint);
-    tokens.push({ kind: "char", value, width: displayWidth(value) });
-    index += value.length;
+    index = nextEsc;
   }
   return tokens;
 }
-function wrapTranscriptLine(line, columns, hangingIndent = "") {
-  if (line === "") return [""];
+function buildSourceMapping(rawLine, styledLine, prefixCharCount) {
+  let contentStart = 0;
+  const headingMatch = rawLine.match(/^(#{1,3})\s+(.+)$/);
+  let lineToParse = rawLine;
+  if (headingMatch) {
+    contentStart = headingMatch[1].length + 1;
+    while (contentStart < rawLine.length && rawLine[contentStart] === " ") contentStart++;
+    lineToParse = rawLine.slice(contentStart);
+  }
+  const INLINE_RE = /(\[([^\]]+)\]\(([^)\s]+)\)|`([^`]+)`|\*\*(.+?)\*\*|(?<!\*)\*([^*]+?)\*(?!\*)|~~([^~]+?)~~)/g;
+  const mapping = [];
+  let lastIdx = 0;
+  let match;
+  while ((match = INLINE_RE.exec(lineToParse)) !== null) {
+    const plainBefore = lineToParse.slice(lastIdx, match.index);
+    for (let c = 0; c < plainBefore.length; c++) {
+      mapping.push(contentStart + lastIdx + c);
+    }
+    const fullMatch = match[0];
+    if (match[2] !== void 0 && match[3] !== void 0) {
+      const linkText = match[2];
+      const linkUrl = match[3];
+      const textOffset = contentStart + match.index + 1;
+      for (let c = 0; c < linkText.length; c++) {
+        mapping.push(textOffset + c);
+      }
+      const parenOffset = textOffset + linkText.length;
+      mapping.push(parenOffset);
+      mapping.push(parenOffset + 1);
+      const urlOffset = parenOffset + 2;
+      for (let c = 0; c < linkUrl.length; c++) {
+        mapping.push(urlOffset + c);
+      }
+      mapping.push(urlOffset + linkUrl.length);
+    } else if (match[4] !== void 0) {
+      const codeText = match[4];
+      const codeOffset = contentStart + match.index + 1;
+      for (let c = 0; c < codeText.length; c++) {
+        mapping.push(codeOffset + c);
+      }
+    } else if (match[5] !== void 0) {
+      const boldText = match[5];
+      const boldOffset = contentStart + match.index + 2;
+      for (let c = 0; c < boldText.length; c++) {
+        mapping.push(boldOffset + c);
+      }
+    } else if (match[6] !== void 0) {
+      const italicText = match[6];
+      const italicOffset = contentStart + match.index + 1;
+      for (let c = 0; c < italicText.length; c++) {
+        mapping.push(italicOffset + c);
+      }
+    } else if (match[7] !== void 0) {
+      const strikeText = match[7];
+      const strikeOffset = contentStart + match.index + 2;
+      for (let c = 0; c < strikeText.length; c++) {
+        mapping.push(strikeOffset + c);
+      }
+    }
+    lastIdx = match.index + fullMatch.length;
+  }
+  const plainRest = lineToParse.slice(lastIdx);
+  for (let c = 0; c < plainRest.length; c++) {
+    mapping.push(contentStart + lastIdx + c);
+  }
+  return mapping;
+}
+function wrapTranscriptLineWithLayout(line, columns, hangingIndent = "", lineSourceStart = 0, prefixWidth = 0, prefixCharCount = 0, sourceMapping, rawLineLength) {
+  if (line === "") {
+    const rawLen = rawLineLength ?? 0;
+    return [
+      {
+        rendered: "",
+        sourceStart: lineSourceStart,
+        sourceEnd: lineSourceStart + rawLen,
+        prefixWidth
+      }
+    ];
+  }
   const tokens = tokenizeAnsiLine(line);
-  const result = [];
+  const rows = [];
   let activeStyles = [];
   const applyStyleToken = (value) => {
     if (SGR_RESET_REGEX.test(value)) {
@@ -514,10 +609,11 @@ function wrapTranscriptLine(line, columns, hangingIndent = "") {
   let start = 0;
   while (start < tokens.length) {
     if (tokens.slice(start).every((token) => token.kind === "sgr")) {
-      if (result.length > 0) break;
+      if (rows.length > 0) break;
     }
     const openingStyles = [...activeStyles];
-    const isContinuation = result.length > 0 && hangingIndent.length > 0;
+    const isContinuation = rows.length > 0;
+    const currentPrefixWidth = isContinuation ? visibleWidth(hangingIndent) : prefixWidth;
     const indentWidth = isContinuation ? visibleWidth(hangingIndent) : 0;
     const maxSegmentWidth = Math.max(1, columns - indentWidth);
     let width = 0;
@@ -532,7 +628,7 @@ function wrapTranscriptLine(line, columns, hangingIndent = "") {
       if (width + token.width > maxSegmentWidth && width > 0) break;
       width += token.width;
       end += 1;
-      if (token.value === " " || token.value === "	") {
+      if ((token.value === " " || token.value === "	") && token.charIndex >= prefixCharCount) {
         lastBreak = end;
       }
     }
@@ -557,18 +653,71 @@ function wrapTranscriptLine(line, columns, hangingIndent = "") {
     const prefix = openingStyles.join("");
     const needsReset = (sawStyle || activeStyles.length > 0) && !segment.endsWith("\x1B[0m");
     const lineContent = `${prefix}${segment}${needsReset ? "\x1B[0m" : ""}`;
-    result.push(isContinuation ? `${hangingIndent}${lineContent}` : lineContent);
+    const rowRendered = isContinuation && hangingIndent.length > 0 ? `${hangingIndent}${lineContent}` : lineContent;
+    let segSourceStart = lineSourceStart;
+    let segSourceEnd = lineSourceStart;
+    let foundFirst = false;
+    const rowMapping = [];
+    let plainCharIndex = 0;
+    for (let i = 0; i < start; i++) {
+      const tok = tokens[i];
+      if (tok.kind === "char" && tok.charIndex >= prefixCharCount) {
+        plainCharIndex += tok.value.length;
+      }
+    }
+    for (let i = start; i < segmentEnd; i++) {
+      const tok = tokens[i];
+      if (tok.kind === "char" && tok.charIndex >= prefixCharCount) {
+        const mappedOffset = sourceMapping && sourceMapping[plainCharIndex] !== void 0 ? sourceMapping[plainCharIndex] : plainCharIndex;
+        if (!foundFirst) {
+          segSourceStart = lineSourceStart + mappedOffset;
+          foundFirst = true;
+        }
+        for (let c = 0; c < tok.value.length; c++) {
+          const idx = plainCharIndex + c;
+          const mapped = sourceMapping && sourceMapping[idx] !== void 0 ? sourceMapping[idx] : idx;
+          rowMapping.push(lineSourceStart + mapped);
+        }
+        const lastCharIdx = plainCharIndex + tok.value.length - 1;
+        const mappedEndOffset = sourceMapping && sourceMapping[lastCharIdx] !== void 0 ? sourceMapping[lastCharIdx] + 1 : plainCharIndex + tok.value.length;
+        segSourceEnd = lineSourceStart + mappedEndOffset;
+        plainCharIndex += tok.value.length;
+      }
+    }
     start = segmentEnd;
     while (start < tokens.length) {
       const token = tokens[start];
-      if (token.kind === "char" && token.value === " ") {
+      if (token.kind === "char" && token.value === " " && token.charIndex >= prefixCharCount) {
+        const mappedOffset = sourceMapping && sourceMapping[plainCharIndex] !== void 0 ? sourceMapping[plainCharIndex] + 1 : plainCharIndex + 1;
+        segSourceEnd = lineSourceStart + mappedOffset;
+        plainCharIndex += token.value.length;
         start += 1;
         continue;
       }
       break;
     }
+    if (start >= tokens.length && rawLineLength !== void 0) {
+      segSourceEnd = lineSourceStart + rawLineLength;
+    }
+    rows.push({
+      rendered: rowRendered,
+      sourceStart: segSourceStart,
+      sourceEnd: segSourceEnd,
+      prefixWidth: currentPrefixWidth,
+      sourceMapping: rowMapping.length > 0 ? rowMapping : void 0
+    });
   }
-  return result.length > 0 ? result : [""];
+  return rows.length > 0 ? rows : [
+    {
+      rendered: "",
+      sourceStart: lineSourceStart,
+      sourceEnd: lineSourceStart + (rawLineLength ?? 0),
+      prefixWidth
+    }
+  ];
+}
+function wrapTranscriptLine(line, columns, hangingIndent = "") {
+  return wrapTranscriptLineWithLayout(line, columns, hangingIndent).map((r) => r.rendered);
 }
 function buildWindowTitle(title) {
   const plain = stripAnsi(title).replace(/[\x00-\x1f\x7f]+/g, " ");
@@ -5371,6 +5520,9 @@ export {
   countPhysicalLines,
   takeDisplayWidth,
   padOrTruncateToWidth,
+  tokenizeAnsiLine,
+  buildSourceMapping,
+  wrapTranscriptLineWithLayout,
   wrapTranscriptLine,
   buildWindowTitle,
   wrapTextToLines,

package/index.js

@@ -126,7 +126,7 @@ function createDaemonShortcutCommand(path, description, command2) {
 // packages/cli/agentInternalCommandEntries.ts
 function getAgentInternalCommandEntries() {
   const createAgentRunCommand = (path, description) => createContextCommand(path, description, async (args2, ctx) => {
-    const { runAgentRunCommand } = await import("./agentRunCommand-IWXLTYGK.js");
+    const { runAgentRunCommand } = await import("./agentRunCommand-OJX27NII.js");
     return runAgentRunCommand(args2, {
       env: ctx.env,
       scriptDir: ctx.scriptDir,
@@ -796,7 +796,7 @@ async function runScript(script, forwardedArgs, env) {
   return proc.exited;
 }
 async function launchTuiWorkspace(args2) {
-  const { startTuiWorkspace } = await import("./readlineWorkspace-EH77JVMA.js");
+  const { startTuiWorkspace } = await import("./readlineWorkspace-J2ARMEUC.js");
   const { createTuiSummaryLlmCaller } = await import("./tuiSummaryLlmCaller-WUVAOIYU.js");
   return startTuiWorkspace({
     ...args2,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nolo-cli",
-  "version": "0.33.0-alpha.20",
+  "version": "0.33.0-alpha.21",
   "type": "module",
   "description": "Agent-first terminal workspace for Nolo",
   "bin": {

package/{readlineWorkspace-EH77JVMA.js → readlineWorkspace-J2ARMEUC.js}

@@ -24,6 +24,7 @@ import {
   applyDetectedBackground,
   applyTerminalOutputToText,
   buildSkillContextBlocks,
+  buildSourceMapping,
   buildWindowTitle,
   clearCollapsedPasteStore,
   countPhysicalLines,
@@ -65,12 +66,14 @@ import {
   takeDisplayWidth,
   themeColorSequence,
   themeText,
+  tokenizeAnsiLine,
   truncateAnsi,
   userSurfaceBackgroundSequence,
   visibleWidth,
   wrapTextToLines,
-  wrapTranscriptLine
-} from "./chunk-FR2AIV4Q.js";
+  wrapTranscriptLine,
+  wrapTranscriptLineWithLayout
+} from "./chunk-46JSKTPF.js";
 import "./chunk-ZHYK3N56.js";
 import {
   getReadableCliDb
@@ -1754,197 +1757,161 @@ function createSelectionState() {
   };
 }
 function compareSelectionPoints(a, b) {
-  if (a.turnIndex !== b.turnIndex) {
-    return a.turnIndex - b.turnIndex;
+  if (a.globalRow !== b.globalRow) {
+    return a.globalRow - b.globalRow;
   }
-  return a.sourceOffset - b.sourceOffset;
+  return a.col - b.col;
 }
 function areSelectionPointsEqual(a, b) {
   if (a === null && b === null) return true;
   if (a === null || b === null) return false;
-  return a.turnIndex === b.turnIndex && a.sourceOffset === b.sourceOffset;
-}
-function hitTestHistory(history, screenRow, screenCol, contentWidth, scrollTop) {
-  if (history.turns.length === 0) return null;
-  const { entries } = buildTurnOffsets2(history, contentWidth);
-  if (entries.length === 0) return null;
-  const globalRow = scrollTop + screenRow;
-  const firstEntry = entries[0];
-  if (globalRow < firstEntry.startRow) {
-    return { turnIndex: 0, sourceOffset: 0 };
-  }
-  const lastIdx = entries.length - 1;
-  const lastEntry = entries[lastIdx];
-  const lastTurn = history.turns[lastIdx];
-  if (globalRow >= lastEntry.startRow + lastEntry.lineCount) {
-    return { turnIndex: lastIdx, sourceOffset: lastTurn.content.length };
-  }
-  for (let i = 0; i < entries.length; i++) {
-    const entry = entries[i];
-    const turn = history.turns[i];
-    const turnStart = entry.startRow;
-    const turnEnd = turnStart + entry.lineCount;
-    if (entry.separatorAbove > 0 && globalRow === turnStart - 1) {
-      return { turnIndex: i, sourceOffset: 0 };
-    }
-    if (globalRow >= turnStart && globalRow < turnEnd) {
-      const rowInTurn = globalRow - turnStart;
-      const sourceOffset = mapRowColToSourceOffset(
-        turn.content,
-        turn.role,
-        contentWidth,
-        rowInTurn,
-        screenCol,
-        turn.command
-      );
-      return { turnIndex: i, sourceOffset };
-    }
-  }
-  return null;
-}
-function mapRowColToSourceOffset(content, role, contentWidth, targetRow, targetCol, command) {
-  const normalized = content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-  const logicalLines = normalized.split("\n");
-  let currentRow = 0;
-  let charAccumulator = 0;
-  if (role === "local" && command) {
-    const cmdWrapped = wrapTranscriptLine(`\u203A ${command}`, contentWidth);
-    if (targetRow < cmdWrapped.length) {
-      return 0;
-    }
-    currentRow += cmdWrapped.length;
-  }
-  for (let l = 0; l < logicalLines.length; l++) {
-    const lineText = logicalLines[l];
-    const lineLen = lineText.length;
-    let wrappedRows;
-    let prefixFirst = 0;
-    let prefixCont = 0;
-    if (role === "user") {
-      wrappedRows = wrapTranscriptLine(`\u2503  ${lineText}`, contentWidth, "\u2503  ");
-      prefixFirst = 3;
-      prefixCont = 3;
-    } else if (role === "local") {
-      wrappedRows = wrapTranscriptLine(`  ${lineText}`, contentWidth, "  ");
-      prefixFirst = 2;
-      prefixCont = 2;
-    } else {
-      if (l === 0 && !lineText.startsWith("[nolo]")) {
-        wrappedRows = wrapTranscriptLine(`\u25C8 ${lineText}`, contentWidth);
-        prefixFirst = 2;
-        prefixCont = 0;
-      } else {
-        wrappedRows = wrapTranscriptLine(lineText, contentWidth);
-        prefixFirst = 0;
-        prefixCont = 0;
-      }
-    }
-    const rowCount = Math.max(1, wrappedRows.length);
-    if (targetRow >= currentRow && targetRow < currentRow + rowCount) {
-      const subRow = targetRow - currentRow;
-      let offsetInLine = 0;
-      for (let s = 0; s < subRow; s++) {
-        const rowStr = stripAnsi(wrappedRows[s] ?? "");
-        const pLen2 = s === 0 ? prefixFirst : prefixCont;
-        const pureText = rowStr.slice(pLen2);
-        offsetInLine += pureText.length;
-      }
-      const targetRowStr = stripAnsi(wrappedRows[subRow] ?? "");
-      const pLen = subRow === 0 ? prefixFirst : prefixCont;
-      const pureTargetText = targetRowStr.slice(pLen);
-      const effectiveCol = Math.max(0, targetCol - pLen);
-      let colAccum = 0;
-      for (let c = 0; c < pureTargetText.length; c++) {
-        const char = pureTargetText[c];
-        const w = displayWidth(char);
-        if (colAccum + w > effectiveCol) {
-          break;
+  return a.globalRow === b.globalRow && a.col === b.col;
+}
+function highlightLineByColumns(line, selStartCol, selEndCol) {
+  if (selStartCol >= selEndCol) return line;
+  const tokens = tokenizeAnsiLine(line);
+  if (tokens.length === 0) return line;
+  let lastNonSpaceCol = 0;
+  let colScan = 0;
+  for (const tok of tokens) {
+    if (tok.kind === "char") {
+      if (tok.value.trim().length > 0) {
+        lastNonSpaceCol = colScan + tok.width;
+      }
+      colScan += tok.width;
+    }
+  }
+  const effectiveEndCol = Math.min(selEndCol, lastNonSpaceCol);
+  if (selStartCol >= effectiveEndCol) return line;
+  let out = "";
+  let currentCol = 0;
+  let isHighlightActive = false;
+  for (let i = 0; i < tokens.length; i++) {
+    const token = tokens[i];
+    if (token.kind === "sgr") {
+      if (isHighlightActive) {
+        if (/^\x1b\[0?m$/.test(token.value)) {
+          out += `${token.value}\x1B[7m`;
+        } else {
+          out += token.value;
         }
-        colAccum += w;
-        offsetInLine += char.length;
-      }
-      let finalOffset = Math.min(normalized.length, charAccumulator + Math.min(lineLen, offsetInLine));
-      if (finalOffset > 0 && finalOffset < normalized.length && normalized.charCodeAt(finalOffset - 1) >= 55296 && normalized.charCodeAt(finalOffset - 1) <= 56319) {
-        finalOffset += 1;
+      } else {
+        out += token.value;
       }
-      return finalOffset;
+      continue;
     }
-    currentRow += rowCount;
-    charAccumulator += lineLen + 1;
+    const charStartCol = currentCol;
+    const charEndCol = currentCol + token.width;
+    const isSelected = charStartCol >= selStartCol && charStartCol < effectiveEndCol;
+    if (isSelected && !isHighlightActive) {
+      out += "\x1B[7m";
+      isHighlightActive = true;
+    } else if (!isSelected && isHighlightActive) {
+      out += "\x1B[27m";
+      isHighlightActive = false;
+    }
+    out += token.value;
+    currentCol = charEndCol;
+  }
+  if (isHighlightActive) {
+    out += "\x1B[27m";
+  }
+  return out;
+}
+function hitTestHistory(history, screenRow, screenCol, _contentWidth, scrollTop) {
+  const globalRow = Math.max(0, scrollTop + screenRow);
+  const col = Math.max(0, screenCol);
+  return { globalRow, col };
+}
+function extractTextSliceByColumns(plain, startCol, endCol) {
+  let text = plain;
+  let textStartCol = 0;
+  if (text.startsWith("\u25C8 ")) {
+    text = text.slice(2);
+    textStartCol = 2;
+  } else if (text.startsWith("\u2503  ")) {
+    text = text.slice(3);
+    textStartCol = 3;
+  } else if (text.startsWith("\u203A ")) {
+    text = text.slice(2);
+    textStartCol = 2;
+  }
+  const effectiveStart = Math.max(0, startCol - textStartCol);
+  const effectiveEnd = Math.max(0, endCol - textStartCol);
+  if (effectiveStart >= effectiveEnd) return "";
+  let out = "";
+  let col = 0;
+  for (const char of text) {
+    const w = displayWidth(char);
+    if (col + w > effectiveStart && col < effectiveEnd) {
+      out += char;
+    }
+    col += w;
   }
-  return normalized.length;
+  return out;
 }
-function extractSelectedText(history, anchor, head) {
+function extractSelectedText(history, anchor, head, contentWidth = 80) {
   if (!anchor || !head) return "";
   const cmp = compareSelectionPoints(anchor, head);
   if (cmp === 0) return "";
   const start = cmp < 0 ? anchor : head;
   const end = cmp < 0 ? head : anchor;
-  if (start.turnIndex === end.turnIndex) {
-    const turn = history.turns[start.turnIndex];
-    if (!turn) return "";
-    const raw = turn.content.slice(start.sourceOffset, end.sourceOffset);
-    return stripAnsi(raw);
-  }
-  const pieces = [];
-  const startTurn2 = history.turns[start.turnIndex];
-  if (startTurn2) {
-    pieces.push(startTurn2.content.slice(start.sourceOffset));
-  }
-  for (let i = start.turnIndex + 1; i < end.turnIndex; i++) {
-    const midTurn = history.turns[i];
-    if (midTurn) {
-      pieces.push(midTurn.content);
+  const lines = buildHistoryLines(history, contentWidth);
+  const selectedLines = [];
+  for (let r = start.globalRow; r <= end.globalRow; r++) {
+    const rawLine = lines[r];
+    if (rawLine === void 0) continue;
+    const plain = stripAnsi(rawLine);
+    if (plain.trim().length === 0) {
+      if (selectedLines.length > 0 && selectedLines[selectedLines.length - 1] !== "") {
+        selectedLines.push("");
+      }
+      continue;
+    }
+    let lineStartCol = 0;
+    let lineEndCol = Infinity;
+    if (r === start.globalRow) {
+      lineStartCol = start.col;
+    }
+    if (r === end.globalRow) {
+      lineEndCol = end.col;
+    }
+    const extracted = extractTextSliceByColumns(plain, lineStartCol, lineEndCol);
+    if (extracted.length > 0) {
+      selectedLines.push(extracted);
     }
   }
-  const endTurn = history.turns[end.turnIndex];
-  if (endTurn) {
-    pieces.push(endTurn.content.slice(0, end.sourceOffset));
-  }
-  return stripAnsi(pieces.join("\n\n"));
+  return selectedLines.join("\n");
 }
-function applySelectionOverlay(visibleLines, history, contentWidth, scrollTop, selection) {
-  if (!selection.dragging || !selection.anchor || !selection.head) {
+function applySelectionOverlay(visibleLines, _history, _contentWidth, scrollTop, selection) {
+  if (!selection.anchor || !selection.head) {
     return visibleLines;
   }
   const cmp = compareSelectionPoints(selection.anchor, selection.head);
   if (cmp === 0) return visibleLines;
   const start = cmp < 0 ? selection.anchor : selection.head;
   const end = cmp < 0 ? selection.head : selection.anchor;
-  const { entries } = buildTurnOffsets2(history, contentWidth);
   const result = [...visibleLines];
   for (let screenRow = 0; screenRow < visibleLines.length; screenRow++) {
     const globalRow = scrollTop + screenRow;
-    let isSelectedRow = false;
-    for (let i = start.turnIndex; i <= end.turnIndex; i++) {
-      const entry = entries[i];
-      if (!entry) continue;
-      const turnStart = entry.startRow;
-      const turnEnd = turnStart + entry.lineCount;
-      if (i === start.turnIndex && i === end.turnIndex) {
-        if (globalRow >= turnStart && globalRow < turnEnd) {
-          isSelectedRow = true;
-        }
-      } else if (i === start.turnIndex) {
-        if (globalRow >= turnStart) {
-          isSelectedRow = true;
-        }
-      } else if (i === end.turnIndex) {
-        if (globalRow < turnEnd) {
-          isSelectedRow = true;
-        }
-      } else {
-        if (globalRow >= turnStart && globalRow < turnEnd) {
-          isSelectedRow = true;
-        }
-      }
+    if (globalRow < start.globalRow || globalRow > end.globalRow) {
+      continue;
     }
-    if (isSelectedRow) {
-      const line = result[screenRow] ?? "";
-      if (line.length > 0) {
-        result[screenRow] = `\x1B[7m${line}\x1B[27m`;
-      }
+    const currentLine = result[screenRow] ?? "";
+    if (currentLine.length === 0) continue;
+    let selStartCol = 0;
+    let selEndCol = Infinity;
+    if (globalRow === start.globalRow) {
+      selStartCol = start.col;
     }
+    if (globalRow === end.globalRow) {
+      selEndCol = end.col;
+    }
+    result[screenRow] = highlightLineByColumns(
+      currentLine,
+      selStartCol,
+      selEndCol
+    );
   }
   return result;
 }
@@ -1959,7 +1926,6 @@ function resetHistoryFrameDiffCache(output) {
     frameBufferByOutput.delete(output);
   }
 }
-var renderCacheMissCount = 0;
 function createTurnHistory() {
   return {
     turns: [],
@@ -1970,11 +1936,8 @@ function createTurnHistory() {
   };
 }
 function startTurn(history, role) {
-  if (history.currentRole !== null) {
-    history.turns.push({
-      role: history.currentRole,
-      content: history.currentContent
-    });
+  if (history.currentRole !== null && history.currentContent) {
+    finalizeCurrentTurn(history);
   }
   history.currentRole = role;
   history.currentContent = "";
@@ -2036,9 +1999,8 @@ function fillUserBubbleRow(row, surfaceSeq, contentWidth) {
   }
   return renderSurfaceLine({ text: row, surface: surfaceSeq, padTo: contentWidth });
 }
-function renderTurnBlock(role, content, contentWidth, colorEnabled, command) {
+function layoutTurnRows(role, content, contentWidth, colorEnabled, command) {
   content = content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-  const lines = [];
   if (role === "user") {
     const logicalLines = content.split("\n");
     const accentSeq = colorEnabled ? themeColorSequence("accent") : "";
@@ -2046,37 +2008,140 @@ function renderTurnBlock(role, content, contentWidth, colorEnabled, command) {
     const multilinePrefix = colorEnabled ? `${accentSeq}\x1B[1m\u2503  ` : "\u2503  ";
     const hangingIndent = colorEnabled ? `${accentSeq}\x1B[1m\u2503  ` : "\u2503  ";
     const surfaceSeq = colorEnabled ? userSurfaceBackgroundSequence() : "";
+    const prefixWidth = 3;
+    let lineSourceStart = 0;
+    const rows2 = [];
     for (let i = 0; i < logicalLines.length; i++) {
       const line = logicalLines[i];
       const prefix = i === 0 ? firstPrefix : multilinePrefix;
       const styledLine = `${prefix}${line}`;
-      const rows = wrapTranscriptLine(styledLine, contentWidth, hangingIndent);
-      lines.push(
-        ...surfaceSeq ? rows.map((row) => fillUserBubbleRow(row, surfaceSeq, contentWidth)) : rows
+      const prefixCharCount = prefix.length;
+      const wrappedRows = wrapTranscriptLineWithLayout(
+        styledLine,
+        contentWidth,
+        hangingIndent,
+        lineSourceStart,
+        prefixWidth,
+        prefixCharCount
       );
+      for (const r of wrappedRows) {
+        const rendered = surfaceSeq ? fillUserBubbleRow(r.rendered, surfaceSeq, contentWidth) : r.rendered;
+        rows2.push({
+          rendered,
+          sourceStart: r.sourceStart,
+          sourceEnd: r.sourceEnd,
+          prefixWidth: r.prefixWidth,
+          sourceMapping: r.sourceMapping
+        });
+      }
+      lineSourceStart += line.length + 1;
     }
-  } else if (role === "local") {
+    return rows2.length > 0 ? rows2 : [{ rendered: surfaceSeq ? fillUserBubbleRow(firstPrefix, surfaceSeq, contentWidth) : firstPrefix, sourceStart: 0, sourceEnd: 0, prefixWidth: 3 }];
+  }
+  if (role === "local") {
     const dimSeq = colorEnabled ? "\x1B[2m" : "";
     const resetSeq = colorEnabled ? "\x1B[0m" : "";
+    const rows2 = [];
     if (command) {
-      lines.push(
-        ...wrapTranscriptLine(`${dimSeq}\u203A ${command}${resetSeq}`, contentWidth)
+      const cmdPrefix = `${dimSeq}\u203A `;
+      const cmdLine = `${cmdPrefix}${command}${resetSeq}`;
+      const cmdRows = wrapTranscriptLineWithLayout(
+        cmdLine,
+        contentWidth,
+        "",
+        0,
+        2,
+        cmdPrefix.length
       );
+      for (const r of cmdRows) {
+        rows2.push({
+          rendered: r.rendered,
+          sourceStart: 0,
+          sourceEnd: 0,
+          prefixWidth: 2,
+          sourceMapping: void 0
+        });
+      }
     }
+    let lineSourceStart = 0;
     if (content) {
       for (const line of content.split("\n")) {
-        lines.push(
-          ...wrapTranscriptLine(`${dimSeq}  ${line}${resetSeq}`, contentWidth)
+        const prefix = `${dimSeq}  `;
+        const styledLine = `${prefix}${line}${resetSeq}`;
+        const prefixCharCount = prefix.length;
+        const wrappedRows = wrapTranscriptLineWithLayout(
+          styledLine,
+          contentWidth,
+          "  ",
+          lineSourceStart,
+          2,
+          prefixCharCount
         );
-      }
-    }
-  } else {
-    const styledEntry = styleAssistantTurn(content, colorEnabled);
-    for (const logicalLine of styledEntry.split("\n")) {
-      lines.push(...wrapTranscriptLine(logicalLine, contentWidth));
+        rows2.push(...wrappedRows);
+        lineSourceStart += line.length + 1;
+      }
+    }
+    return rows2.length > 0 ? rows2 : [{ rendered: "", sourceStart: 0, sourceEnd: 0, prefixWidth: 2 }];
+  }
+  const styledEntry = styleAssistantTurn(content, colorEnabled);
+  const styledLines = styledEntry.split("\n");
+  const rawLines = content.split("\n");
+  let rawIdx = 0;
+  let rawOffset = 0;
+  const rows = [];
+  for (let i = 0; i < styledLines.length; i++) {
+    const styledLine = styledLines[i];
+    const isFirstLine = i === 0 && !styledLine.startsWith("[nolo]");
+    const anchorPrefix = isFirstLine ? colorEnabled ? `${themeColorSequence("chrome")}\u25C8\x1B[39m ` : "\u25C8 " : "";
+    const prefixWidth = isFirstLine ? 2 : 0;
+    const prefixCharCount = anchorPrefix.length;
+    if (styledLine === "" && rawIdx < rawLines.length && rawLines[rawIdx] !== "") {
+      rows.push({
+        rendered: "",
+        sourceStart: rawOffset,
+        sourceEnd: rawOffset,
+        prefixWidth: 0
+      });
+      continue;
     }
-  }
-  return lines;
+    const rawLine = rawIdx < rawLines.length ? rawLines[rawIdx] : "";
+    const rawLineLen = rawLine.length;
+    const sourceMapping = buildSourceMapping(rawLine, styledLine, prefixCharCount);
+    const lineRows = wrapTranscriptLineWithLayout(
+      styledLine,
+      contentWidth,
+      "",
+      rawOffset,
+      prefixWidth,
+      prefixCharCount,
+      sourceMapping,
+      rawLineLen
+    );
+    rows.push(...lineRows);
+    rawIdx += 1;
+    rawOffset += rawLineLen + 1;
+  }
+  return rows.length > 0 ? rows : [{ rendered: "", sourceStart: 0, sourceEnd: 0, prefixWidth: 0 }];
+}
+function getTurnLayoutRows(turn, contentWidth, colorEnabled, density, surface) {
+  const cached = turnLineCache.get(turn);
+  if (cached && cached.width === contentWidth && cached.color === colorEnabled && cached.density === density && cached.surface === surface) {
+    return cached.layoutRows;
+  }
+  const layoutRows = layoutTurnRows(turn.role, turn.content, contentWidth, colorEnabled, turn.command);
+  const lines = layoutRows.map((r) => r.rendered);
+  turnLineCache.set(turn, {
+    width: contentWidth,
+    color: colorEnabled,
+    density,
+    surface,
+    lines,
+    layoutRows
+  });
+  return layoutRows;
+}
+function renderTurnBlock(role, content, contentWidth, colorEnabled, command) {
+  return layoutTurnRows(role, content, contentWidth, colorEnabled, command).map((r) => r.rendered);
 }
 var streamingTurnCache = null;
 function resetStreamingTurnCache() {
@@ -2104,12 +2169,12 @@ function renderPrefixTurnBlock(role, content, contentWidth, colorEnabled) {
 }
 function renderTailTurnBlock(role, content, contentWidth, colorEnabled) {
   content = content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-  const lines = [];
   if (role === "user") {
     const surfaceSeq = colorEnabled ? userSurfaceBackgroundSequence() : "";
     const accentSeq = colorEnabled ? themeColorSequence("accent") : "";
     const multilinePrefix = colorEnabled ? `${accentSeq}\x1B[1m\u2503  ` : "\u2503  ";
     const hangingIndent = colorEnabled ? `${accentSeq}\x1B[1m\u2503  ` : "\u2503  ";
+    const lines = [];
     for (const rawLine of content.split("\n")) {
       const styledLine = `${multilinePrefix}${rawLine}`;
       const rows = wrapTranscriptLine(styledLine, contentWidth, hangingIndent);
@@ -2117,17 +2182,19 @@ function renderTailTurnBlock(role, content, contentWidth, colorEnabled) {
         ...surfaceSeq ? rows.map((row) => fillUserBubbleRow(row, surfaceSeq, contentWidth)) : rows
       );
     }
+    return lines;
   } else {
-    const highlighted = colorEnabled ? formatAssistantDisplay(content) : stripAnsi(formatAssistantDisplay(content));
+    const highlighted = colorEnabled ? formatAssistantDisplay(content, { trimEdges: false }) : stripAnsi(formatAssistantDisplay(content, { trimEdges: false }));
     const rawLines = highlighted.split("\n");
     const styledLines = rawLines.map((line) => {
       return line.startsWith("[nolo]") && colorEnabled ? themeText(line, "chrome", true) : line;
     });
+    const lines = [];
     for (const logicalLine of styledLines) {
       lines.push(...wrapTranscriptLine(logicalLine, contentWidth));
     }
+    return lines;
   }
-  return lines;
 }
 function getStreamingTurnLines(role, content, contentWidth, colorEnabled, density, surface) {
   if (streamingTurnCache && (streamingTurnCache.role !== role || streamingTurnCache.contentWidth !== contentWidth || streamingTurnCache.colorEnabled !== colorEnabled || streamingTurnCache.density !== density || streamingTurnCache.surface !== surface || !content.startsWith(streamingTurnCache.fullContent.slice(0, streamingTurnCache.prefixLength)))) {
@@ -2185,51 +2252,10 @@ function getStreamingTurnLines(role, content, contentWidth, colorEnabled, densit
   const tailLines = renderTailTurnBlock(role, tailContent, contentWidth, colorEnabled);
   return [...streamingTurnCache.prefixLines, ...tailLines];
 }
-var assistantPlainLinesCache = /* @__PURE__ */ new Map();
-function getAssistantPlainLines(content) {
-  let plainLines = assistantPlainLinesCache.get(content);
-  if (plainLines !== void 0) {
-    return plainLines;
-  }
-  if (!/[\r\x00#|\-*_~`>+\[\]()•☐☑]|\b\d+\./.test(content)) {
-    plainLines = content.trim().split("\n");
-  } else {
-    plainLines = stripAnsi(formatAssistantDisplay(content)).split("\n");
-  }
-  if (assistantPlainLinesCache.size > 2e3) {
-    const firstKey = assistantPlainLinesCache.keys().next().value;
-    if (firstKey !== void 0) assistantPlainLinesCache.delete(firstKey);
-  }
-  assistantPlainLinesCache.set(content, plainLines);
-  return plainLines;
-}
 function countTurnLines(role, content, contentWidth, command) {
-  content = content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-  let count = 0;
-  if (role === "user") {
-    for (const line of content.split("\n")) {
-      count += wrapTranscriptLine(`\u2503  ${line}`, contentWidth, "\u2503  ").length;
-    }
-  } else if (role === "local") {
-    if (command) {
-      count += wrapTranscriptLine(`\u203A ${command}`, contentWidth).length;
-    }
-    if (content) {
-      for (const line of content.split("\n")) {
-        count += wrapTranscriptLine(`  ${line}`, contentWidth).length;
-      }
-    }
-  } else {
-    const plainLines = getAssistantPlainLines(content);
-    for (let i = 0; i < plainLines.length; i++) {
-      const line = plainLines[i];
-      const wrapped = i === 0 && !line.startsWith("[nolo]") ? wrapTranscriptLine(`\u25C8 ${line}`, contentWidth) : wrapTranscriptLine(line, contentWidth);
-      count += wrapped.length;
-    }
-  }
-  return count;
+  return layoutTurnRows(role, content, contentWidth, false, command).length;
 }
-function buildTurnOffsets2(history, contentWidth) {
+function buildTurnOffsets(history, contentWidth) {
   const density = getActiveDensity();
   const entries = [];
   let offset = 0;
@@ -2250,6 +2276,36 @@ function buildTurnOffsets2(history, contentWidth) {
   }
   return { entries, totalLines: offset };
 }
+function getAllTurnEntries(history, contentWidth) {
+  const { entries, totalLines: finalizedLines } = buildTurnOffsets(history, contentWidth);
+  const turns = [...history.turns];
+  if (history.currentRole !== null && history.currentContent) {
+    const density = getActiveDensity();
+    const colorEnabled = resolveCliColorEnabled();
+    const surface = colorEnabled ? userSurfaceBackgroundSequence() : "";
+    const streamingLines = getStreamingTurnLines(
+      history.currentRole,
+      history.currentContent,
+      contentWidth,
+      colorEnabled,
+      density,
+      surface
+    );
+    const sep = currentTurnSeparator(history, density);
+    const startRow = finalizedLines + sep;
+    entries.push({
+      startRow,
+      lineCount: streamingLines.length,
+      separatorAbove: sep
+    });
+    turns.push({
+      role: history.currentRole,
+      content: history.currentContent
+    });
+    return { entries, totalLines: startRow + streamingLines.length, turns };
+  }
+  return { entries, totalLines: finalizedLines, turns };
+}
 function currentTurnSeparator(history, density) {
   return density === "spacious" && (history.turns.length > 0 || history.currentRole === "user") ? 1 : 0;
 }
@@ -2273,6 +2329,37 @@ function buildCopyViewLines(history) {
   }
   return lines;
 }
+function buildHistoryLines(history, contentWidth) {
+  const colorEnabled = resolveCliColorEnabled();
+  const density = getActiveDensity();
+  const surface = colorEnabled ? userSurfaceBackgroundSequence() : "";
+  const wrapped = [];
+  for (let i = 0; i < history.turns.length; i++) {
+    const turn = history.turns[i];
+    if (density === "spacious" && (i > 0 || turn.role === "user")) {
+      wrapped.push("");
+    }
+    const layoutRows = getTurnLayoutRows(turn, contentWidth, colorEnabled, density, surface);
+    wrapped.push(...layoutRows.map((r) => r.rendered));
+  }
+  if (history.currentRole !== null && history.currentContent) {
+    const i = history.turns.length;
+    if (density === "spacious" && (i > 0 || history.currentRole === "user")) {
+      wrapped.push("");
+    }
+    const streamingLines = getStreamingTurnLines(
+      history.currentRole,
+      history.currentContent,
+      contentWidth,
+      colorEnabled,
+      density,
+      surface
+    );
+    wrapped.push(...streamingLines);
+  }
+  return wrapped;
+}
+var renderCacheMissCount = 0;
 function renderHistory(output, history, inputLines, selection) {
   const tty = output;
   if (!tty.isTTY) return;
@@ -2283,13 +2370,9 @@ function renderHistory(output, history, inputLines, selection) {
   const colorEnabled = resolveCliColorEnabled();
   const density = getActiveDensity();
   const surface = colorEnabled ? userSurfaceBackgroundSequence() : "";
-  const { entries, totalLines: finalizedLines } = buildTurnOffsets2(
-    history,
-    contentWidth
-  );
-  let totalLines = finalizedLines;
-  let currentStart = -1;
+  const { entries, totalLines: finalizedLines } = buildTurnOffsets(history, contentWidth);
   let currentLines = [];
+  let currentStart = -1;
   if (history.currentRole !== null && history.currentContent) {
     currentLines = getStreamingTurnLines(
       history.currentRole,
@@ -2299,16 +2382,17 @@ function renderHistory(output, history, inputLines, selection) {
       density,
       surface
     );
-    currentStart = finalizedLines + currentTurnSeparator(history, density);
-    totalLines = currentStart + currentLines.length;
+    const sep = currentTurnSeparator(history, density);
+    currentStart = finalizedLines + sep;
   }
+  const totalLines = currentStart >= 0 ? currentStart + currentLines.length : finalizedLines;
   if (history.followBottom) {
     history.scrollTop = Math.max(0, totalLines - visibleHeight);
   } else {
-    history.scrollTop = Math.max(
-      0,
-      Math.min(history.scrollTop, Math.max(0, totalLines - visibleHeight))
-    );
+    const maxScroll = Math.max(0, totalLines - visibleHeight);
+    if (history.scrollTop > maxScroll) {
+      history.scrollTop = maxScroll;
+    }
   }
   history.hasMoreAbove = history.scrollTop > 0;
   history.hasMoreBelow = history.scrollTop + visibleHeight < totalLines;
@@ -2328,20 +2412,14 @@ function renderHistory(output, history, inputLines, selection) {
     if (turnEnd <= winStart || turnStart >= winEnd) continue;
     const turn = history.turns[i];
     const cached = turnLineCache.get(turn);
-    let lines;
+    let layoutRows;
     if (cached && cached.width === contentWidth && cached.color === colorEnabled && cached.density === density && cached.surface === surface) {
-      lines = cached.lines;
+      layoutRows = cached.layoutRows;
     } else {
       renderCacheMissCount += 1;
-      lines = renderTurnBlock(turn.role, turn.content, contentWidth, colorEnabled, turn.command);
-      turnLineCache.set(turn, {
-        width: contentWidth,
-        color: colorEnabled,
-        density,
-        surface,
-        lines
-      });
+      layoutRows = getTurnLayoutRows(turn, contentWidth, colorEnabled, density, surface);
     }
+    const lines = layoutRows.map((r) => r.rendered);
     const interStart = Math.max(turnStart, winStart);
     const interEnd = Math.min(turnEnd, winEnd);
     for (let r = interStart; r < interEnd; r++) {
@@ -2365,7 +2443,7 @@ function renderHistory(output, history, inputLines, selection) {
       }
     }
   }
-  if (selection && selection.dragging) {
+  if (selection && selection.anchor && selection.head) {
     visibleLines = applySelectionOverlay(
       visibleLines,
       history,
@@ -2377,11 +2455,11 @@ function renderHistory(output, history, inputLines, selection) {
   const prevBuffer = typeof output === "object" && output !== null ? frameBufferByOutput.get(output) : void 0;
   const isGeometryCompatible = prevBuffer !== void 0 && prevBuffer.rows === rows && prevBuffer.columns === columns && prevBuffer.inputLines === inputLines && prevBuffer.lines.length === visibleHeight;
   const prevLines = isGeometryCompatible ? prevBuffer.lines : void 0;
-  const nextLines = new Array(visibleHeight);
   let frame = "";
+  const nextLines = new Array(visibleHeight);
   for (let i = 0; i < visibleHeight; i++) {
-    const line = visibleLines[i] ?? "";
-    const padded = padOrTruncateToWidth(line, contentWidth);
+    const content = visibleLines[i] ?? "";
+    const padded = padOrTruncateToWidth(content, contentWidth);
     const thumb = renderScrollbarRow(i, visibleHeight, totalLines, history.scrollTop);
     const scrollbarPrefix = colorEnabled ? themeColorSequence("chrome") : "";
     const scrollbarSuffix = colorEnabled ? "\x1B[39m" : "";
@@ -2407,9 +2485,6 @@ function renderHistory(output, history, inputLines, selection) {
 }
 function createHistoryOutputStream(history, onUpdate) {
   return {
-    // Virtual TTY: Spinner uses \\r in-place updates. We honor that via
-    // applyTerminalOutputToText so frames collapse to one status line instead
-    // of spamming the transcript. Do not fall through to process.stdout here.
     isTTY: true,
     write(chunk) {
       const text = typeof chunk === "string" ? chunk : chunk.toString();
@@ -2426,7 +2501,7 @@ function applyScrollAction(history, action, output, inputLines) {
   const columns = tty.columns ?? 80;
   const visibleHeight = Math.max(1, rows - inputLines);
   const contentWidth = Math.max(1, columns - 1);
-  const { totalLines: finalizedLines } = buildTurnOffsets2(history, contentWidth);
+  const { totalLines: finalizedLines } = buildTurnOffsets(history, contentWidth);
   let totalLines = finalizedLines;
   if (history.currentRole !== null && history.currentContent) {
     totalLines += currentTurnSeparator(history, getActiveDensity()) + countTurnLines(history.currentRole, history.currentContent, contentWidth);
@@ -7406,7 +7481,7 @@ ${err.message}` : ""}`
             stopAutoScroll();
           }
         } else {
-          const { totalLines } = buildTurnOffsets(history, contentWidth);
+          const { totalLines } = getAllTurnEntries(history, contentWidth);
           const maxScroll = Math.max(0, totalLines - visibleHeight);
           if (history.scrollTop < maxScroll) {
             history.scrollTop = Math.min(maxScroll, history.scrollTop + 1);
@@ -7573,13 +7648,18 @@ ${merged}` : merged;
               import("./clipboardy-MMBYVRLF.js").then(({ default: clipboard }) => clipboard.write(textToCopy)).catch(() => {
               });
             }
+            selectionState.dragging = false;
+          } else {
+            clearSelection();
           }
-          clearSelection();
           paintFrame(buffer);
           return;
         }
         return;
       }
+      if (selectionState.anchor) {
+        clearSelection();
+      }
       const scrollAction = parseScrollAction(sequence);
       if (scrollAction) {
         if (fixedInput.isPaused()) return;