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

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

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

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

@@ -318,10 +318,241 @@ function dimCliText(text, enabled = resolveCliColorEnabled()) {
   return styleCliText(text, "dim", enabled);
 }
 
+// node_modules/strip-ansi/node_modules/ansi-regex/index.js
+function ansiRegex({ onlyFirst = false } = {}) {
+  const ST = "(?:\\u0007|\\u001B\\u005C|\\u009C)";
+  const osc = `(?:\\u001B\\][^\\u0007\\u001B\\u009C]*${ST})`;
+  const csi = "[\\u001B\\u009B][[\\]()#;?]*(?:\\d{1,4}(?:[;:]\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]";
+  const pattern = `${osc}|${csi}`;
+  return new RegExp(pattern, onlyFirst ? void 0 : "g");
+}
+
+// node_modules/strip-ansi/index.js
+var regex = ansiRegex();
+function stripAnsi(string) {
+  if (typeof string !== "string") {
+    throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
+  }
+  if (!string.includes("\x1B") && !string.includes("\x9B")) {
+    return string;
+  }
+  return string.replace(regex, "");
+}
+
+// node_modules/get-east-asian-width/lookup-data.js
+var ambiguousMinimalCodePoint = 161;
+var ambiguousMaximumCodePoint = 1114109;
+var ambiguousRanges = [161, 161, 164, 164, 167, 168, 170, 170, 173, 174, 176, 180, 182, 186, 188, 191, 198, 198, 208, 208, 215, 216, 222, 225, 230, 230, 232, 234, 236, 237, 240, 240, 242, 243, 247, 250, 252, 252, 254, 254, 257, 257, 273, 273, 275, 275, 283, 283, 294, 295, 299, 299, 305, 307, 312, 312, 319, 322, 324, 324, 328, 331, 333, 333, 338, 339, 358, 359, 363, 363, 462, 462, 464, 464, 466, 466, 468, 468, 470, 470, 472, 472, 474, 474, 476, 476, 593, 593, 609, 609, 708, 708, 711, 711, 713, 715, 717, 717, 720, 720, 728, 731, 733, 733, 735, 735, 768, 879, 913, 929, 931, 937, 945, 961, 963, 969, 1025, 1025, 1040, 1103, 1105, 1105, 8208, 8208, 8211, 8214, 8216, 8217, 8220, 8221, 8224, 8226, 8228, 8231, 8240, 8240, 8242, 8243, 8245, 8245, 8251, 8251, 8254, 8254, 8308, 8308, 8319, 8319, 8321, 8324, 8364, 8364, 8451, 8451, 8453, 8453, 8457, 8457, 8467, 8467, 8470, 8470, 8481, 8482, 8486, 8486, 8491, 8491, 8531, 8532, 8539, 8542, 8544, 8555, 8560, 8569, 8585, 8585, 8592, 8601, 8632, 8633, 8658, 8658, 8660, 8660, 8679, 8679, 8704, 8704, 8706, 8707, 8711, 8712, 8715, 8715, 8719, 8719, 8721, 8721, 8725, 8725, 8730, 8730, 8733, 8736, 8739, 8739, 8741, 8741, 8743, 8748, 8750, 8750, 8756, 8759, 8764, 8765, 8776, 8776, 8780, 8780, 8786, 8786, 8800, 8801, 8804, 8807, 8810, 8811, 8814, 8815, 8834, 8835, 8838, 8839, 8853, 8853, 8857, 8857, 8869, 8869, 8895, 8895, 8978, 8978, 9312, 9449, 9451, 9547, 9552, 9587, 9600, 9615, 9618, 9621, 9632, 9633, 9635, 9641, 9650, 9651, 9654, 9655, 9660, 9661, 9664, 9665, 9670, 9672, 9675, 9675, 9678, 9681, 9698, 9701, 9711, 9711, 9733, 9734, 9737, 9737, 9742, 9743, 9756, 9756, 9758, 9758, 9792, 9792, 9794, 9794, 9824, 9825, 9827, 9829, 9831, 9834, 9836, 9837, 9839, 9839, 9886, 9887, 9919, 9919, 9926, 9933, 9935, 9939, 9941, 9953, 9955, 9955, 9960, 9961, 9963, 9969, 9972, 9972, 9974, 9977, 9979, 9980, 9982, 9983, 10045, 10045, 10102, 10111, 11094, 11097, 12872, 12879, 57344, 63743, 65024, 65039, 65533, 65533, 127232, 127242, 127248, 127277, 127280, 127337, 127344, 127373, 127375, 127376, 127387, 127404, 917760, 917999, 983040, 1048573, 1048576, 1114109];
+var fullwidthMinimalCodePoint = 12288;
+var fullwidthMaximumCodePoint = 65510;
+var fullwidthRanges = [12288, 12288, 65281, 65376, 65504, 65510];
+var wideMinimalCodePoint = 4352;
+var wideMaximumCodePoint = 262141;
+var wideRanges = [4352, 4447, 8986, 8987, 9001, 9002, 9193, 9196, 9200, 9200, 9203, 9203, 9725, 9726, 9748, 9749, 9776, 9783, 9800, 9811, 9855, 9855, 9866, 9871, 9875, 9875, 9889, 9889, 9898, 9899, 9917, 9918, 9924, 9925, 9934, 9934, 9940, 9940, 9962, 9962, 9970, 9971, 9973, 9973, 9978, 9978, 9981, 9981, 9989, 9989, 9994, 9995, 10024, 10024, 10060, 10060, 10062, 10062, 10067, 10069, 10071, 10071, 10133, 10135, 10160, 10160, 10175, 10175, 11035, 11036, 11088, 11088, 11093, 11093, 11904, 11929, 11931, 12019, 12032, 12245, 12272, 12287, 12289, 12350, 12353, 12438, 12441, 12543, 12549, 12591, 12593, 12686, 12688, 12773, 12783, 12830, 12832, 12871, 12880, 42124, 42128, 42182, 43360, 43388, 44032, 55203, 63744, 64255, 65040, 65049, 65072, 65106, 65108, 65126, 65128, 65131, 94176, 94180, 94192, 94198, 94208, 101589, 101631, 101662, 101760, 101874, 110576, 110579, 110581, 110587, 110589, 110590, 110592, 110882, 110898, 110898, 110928, 110930, 110933, 110933, 110948, 110951, 110960, 111355, 119552, 119638, 119648, 119670, 126980, 126980, 127183, 127183, 127374, 127374, 127377, 127386, 127488, 127490, 127504, 127547, 127552, 127560, 127568, 127569, 127584, 127589, 127744, 127776, 127789, 127797, 127799, 127868, 127870, 127891, 127904, 127946, 127951, 127955, 127968, 127984, 127988, 127988, 127992, 128062, 128064, 128064, 128066, 128252, 128255, 128317, 128331, 128334, 128336, 128359, 128378, 128378, 128405, 128406, 128420, 128420, 128507, 128591, 128640, 128709, 128716, 128716, 128720, 128722, 128725, 128728, 128732, 128735, 128747, 128748, 128756, 128764, 128992, 129003, 129008, 129008, 129292, 129338, 129340, 129349, 129351, 129535, 129648, 129660, 129664, 129674, 129678, 129734, 129736, 129736, 129741, 129756, 129759, 129770, 129775, 129784, 131072, 196605, 196608, 262141];
+
+// node_modules/get-east-asian-width/utilities.js
+var isInRange = (ranges, codePoint) => {
+  let low = 0;
+  let high = Math.floor(ranges.length / 2) - 1;
+  while (low <= high) {
+    const mid = Math.floor((low + high) / 2);
+    const i = mid * 2;
+    if (codePoint < ranges[i]) {
+      high = mid - 1;
+    } else if (codePoint > ranges[i + 1]) {
+      low = mid + 1;
+    } else {
+      return true;
+    }
+  }
+  return false;
+};
+
+// node_modules/get-east-asian-width/lookup.js
+var commonCjkCodePoint = 19968;
+var [wideFastPathStart, wideFastPathEnd] = /* @__PURE__ */ findWideFastPathRange(wideRanges);
+function findWideFastPathRange(ranges) {
+  let fastPathStart = ranges[0];
+  let fastPathEnd = ranges[1];
+  for (let index = 0; index < ranges.length; index += 2) {
+    const start = ranges[index];
+    const end = ranges[index + 1];
+    if (commonCjkCodePoint >= start && commonCjkCodePoint <= end) {
+      return [start, end];
+    }
+    if (end - start > fastPathEnd - fastPathStart) {
+      fastPathStart = start;
+      fastPathEnd = end;
+    }
+  }
+  return [fastPathStart, fastPathEnd];
+}
+var isAmbiguous = (codePoint) => {
+  if (codePoint < ambiguousMinimalCodePoint || codePoint > ambiguousMaximumCodePoint) {
+    return false;
+  }
+  return isInRange(ambiguousRanges, codePoint);
+};
+var isFullWidth = (codePoint) => {
+  if (codePoint < fullwidthMinimalCodePoint || codePoint > fullwidthMaximumCodePoint) {
+    return false;
+  }
+  return isInRange(fullwidthRanges, codePoint);
+};
+var isWide = (codePoint) => {
+  if (codePoint >= wideFastPathStart && codePoint <= wideFastPathEnd) {
+    return true;
+  }
+  if (codePoint < wideMinimalCodePoint || codePoint > wideMaximumCodePoint) {
+    return false;
+  }
+  return isInRange(wideRanges, codePoint);
+};
+
+// node_modules/get-east-asian-width/index.js
+function validate(codePoint) {
+  if (!Number.isSafeInteger(codePoint)) {
+    throw new TypeError(`Expected a code point, got \`${typeof codePoint}\`.`);
+  }
+}
+function eastAsianWidth(codePoint, { ambiguousAsWide = false } = {}) {
+  validate(codePoint);
+  if (isFullWidth(codePoint) || isWide(codePoint) || ambiguousAsWide && isAmbiguous(codePoint)) {
+    return 2;
+  }
+  return 1;
+}
+
+// node_modules/string-width/index.js
+var segmenter = new Intl.Segmenter();
+var zeroWidthClusterRegex = new RegExp("^(?:\\p{Default_Ignorable_Code_Point}|\\p{Control}|\\p{Format}|\\p{Nonspacing_Mark}|\\p{Enclosing_Mark}|\\p{Surrogate})+$", "v");
+var leadingNonPrintingRegex = new RegExp("^[\\p{Default_Ignorable_Code_Point}\\p{Control}\\p{Format}\\p{Nonspacing_Mark}\\p{Enclosing_Mark}\\p{Surrogate}]+", "v");
+var spacingMarkRegex = new RegExp("\\p{Spacing_Mark}", "v");
+var rgiEmojiRegex = new RegExp("^\\p{RGI_Emoji}$", "v");
+var unqualifiedKeycapRegex = /^[\d#*]\u20E3$/;
+var extendedPictographicRegex = new RegExp("\\p{Extended_Pictographic}", "gu");
+function isDoubleWidthNonRgiEmojiSequence(segment) {
+  if (segment.length > 50) {
+    return false;
+  }
+  if (unqualifiedKeycapRegex.test(segment)) {
+    return true;
+  }
+  if (segment.includes("\u200D")) {
+    const pictographics = segment.match(extendedPictographicRegex);
+    return pictographics !== null && pictographics.length >= 2;
+  }
+  return false;
+}
+function baseVisible(segment) {
+  return segment.replace(leadingNonPrintingRegex, "");
+}
+function isZeroWidthCluster(segment) {
+  return zeroWidthClusterRegex.test(segment);
+}
+function isHangulLeadingJamo(codePoint) {
+  return codePoint >= 4352 && codePoint <= 4447 || codePoint >= 43360 && codePoint <= 43388;
+}
+function isHangulVowelJamo(codePoint) {
+  return codePoint >= 4448 && codePoint <= 4519 || codePoint >= 55216 && codePoint <= 55238;
+}
+function isHangulTrailingJamo(codePoint) {
+  return codePoint >= 4520 && codePoint <= 4607 || codePoint >= 55243 && codePoint <= 55291;
+}
+function isHangulJamo(codePoint) {
+  return isHangulLeadingJamo(codePoint) || isHangulVowelJamo(codePoint) || isHangulTrailingJamo(codePoint);
+}
+function hangulClusterWidth(visibleSegment, eastAsianWidthOptions) {
+  const codePoints = [];
+  for (const character of visibleSegment) {
+    if (zeroWidthClusterRegex.test(character)) {
+      continue;
+    }
+    codePoints.push(character.codePointAt(0));
+  }
+  if (codePoints.length === 0) {
+    return void 0;
+  }
+  let width = 0;
+  for (let index = 0; index < codePoints.length; index++) {
+    const codePoint = codePoints[index];
+    if (!isHangulJamo(codePoint)) {
+      if (width === 0) {
+        return void 0;
+      }
+      for (let remaining = index; remaining < codePoints.length; remaining++) {
+        width += eastAsianWidth(codePoints[remaining], eastAsianWidthOptions);
+      }
+      return width;
+    }
+    if (isHangulLeadingJamo(codePoint) && isHangulVowelJamo(codePoints[index + 1])) {
+      width += 2;
+      index += isHangulTrailingJamo(codePoints[index + 2]) ? 2 : 1;
+      continue;
+    }
+    width += eastAsianWidth(codePoint, eastAsianWidthOptions);
+  }
+  return width;
+}
+function trailingWidth(visibleSegment, eastAsianWidthOptions) {
+  let extra = 0;
+  let first = true;
+  for (const character of visibleSegment) {
+    if (first) {
+      first = false;
+      continue;
+    }
+    if (spacingMarkRegex.test(character) || character >= "\uFF00" && character <= "\uFFEF") {
+      extra += eastAsianWidth(character.codePointAt(0), eastAsianWidthOptions);
+    }
+  }
+  return extra;
+}
+function stringWidth(input, options = {}) {
+  if (typeof input !== "string" || input.length === 0) {
+    return 0;
+  }
+  const {
+    ambiguousIsNarrow = true,
+    countAnsiEscapeCodes = false
+  } = options;
+  let string = input;
+  if (!countAnsiEscapeCodes && (string.includes("\x1B") || string.includes("\x9B"))) {
+    string = stripAnsi(string);
+  }
+  if (string.length === 0) {
+    return 0;
+  }
+  if (/^[\u0020-\u007E]*$/.test(string)) {
+    return string.length;
+  }
+  let width = 0;
+  const eastAsianWidthOptions = { ambiguousAsWide: !ambiguousIsNarrow };
+  for (const { segment } of segmenter.segment(string)) {
+    if (isZeroWidthCluster(segment)) {
+      continue;
+    }
+    if (rgiEmojiRegex.test(segment) || isDoubleWidthNonRgiEmojiSequence(segment)) {
+      width += 2;
+      continue;
+    }
+    const visibleSegment = baseVisible(segment);
+    const hangulWidth = hangulClusterWidth(visibleSegment, eastAsianWidthOptions);
+    if (hangulWidth !== void 0) {
+      width += hangulWidth;
+      continue;
+    }
+    const codePoint = visibleSegment.codePointAt(0);
+    width += eastAsianWidth(codePoint, eastAsianWidthOptions);
+    width += trailingWidth(visibleSegment, eastAsianWidthOptions);
+  }
+  return width;
+}
+
 // packages/cli/tui/tuiAnsi.ts
 var ANSI_ESCAPE_REGEX = /\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]/g;
 var OSC_HYPERLINK_REGEX = /\x1b\]8;;[^\x07\x1b]*(?:\x07|\x1b\\)\x1b\]8;;(?:\x07|\x1b\\)|\x1b\]8;;[^\x07\x1b]*(?:\x07|\x1b\\)/g;
-function stripAnsi(text) {
+function stripAnsi2(text) {
   return text.replace(OSC_HYPERLINK_REGEX, "").replace(ANSI_ESCAPE_REGEX, "");
 }
 var SGR_SEQUENCE_REGEX = /^\x1b\[[0-9;]*m/;
@@ -384,32 +615,19 @@ function applyTerminalOutputToText(existing, chunk) {
   return text;
 }
 function displayWidth(str) {
-  let width = 0;
-  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
-    // status-line agent icon) render double-wide in common monospace fonts;
-    // counting ⬢ as width 1 drifts the whole status line right of the icon.
-    code >= 11008 && code <= 11263 || code >= 11904 && code <= 12350 || code >= 12352 && code <= 13247 || code >= 13312 && code <= 19903 || code >= 19968 && code <= 42191 || code >= 44032 && code <= 55203 || code >= 63744 && code <= 64255 || code >= 65072 && code <= 65135 || code >= 65281 && code <= 65376 || code >= 65504 && code <= 65510 || code >= 127744 && code <= 129791 || code >= 131072 && code <= 196605 || code >= 196608 && code <= 262141 || // East Asian Ambiguous CJK quotation marks (U+201C/D “ ”, U+2018/9 ‘ ’).
-    // In CJK locale + CJK fonts these render double-wide like 全角 punctuation;
-    // in English fonts they stay width 1. Follow the active locale so Chinese
-    // replies align correctly without breaking English terminal output.
-    getCliLocale() === "zh" && (code === 8220 || code === 8221 || code === 8216 || code === 8217)) {
-      width += 2;
-    } else {
-      width += 1;
-    }
+  const plain = stripAnsi2(str);
+  let width = stringWidth(plain);
+  for (const { segment } of graphemeSegmenter.segment(plain)) {
+    if (stringWidth(segment) !== 1) continue;
+    const code = segment.codePointAt(0) ?? 0;
+    const forceWideSymbol = code >= 9728 && code <= 10175 && !(code >= 10088 && code <= 10101) || code >= 11008 && code <= 11263 || code >= 127744 && code <= 129791;
+    const cjkQuote = getCliLocale() === "zh" && (code === 8220 || code === 8221 || code === 8216 || code === 8217);
+    if (forceWideSymbol || cjkQuote) width += 1;
   }
   return width;
 }
 function visibleWidth(str) {
-  return displayWidth(stripAnsi(str));
+  return displayWidth(stripAnsi2(str));
 }
 function truncateAnsi(text, maxWidth) {
   if (maxWidth <= 0) return "";
@@ -685,9 +903,11 @@ function wrapTranscriptLineWithLayout(line, columns, hangingIndent = "", lineSou
       }
     }
     start = segmentEnd;
+    let softWrapJoiner = "";
     while (start < tokens.length) {
       const token = tokens[start];
       if (token.kind === "char" && token.value === " " && token.charIndex >= prefixCharCount) {
+        softWrapJoiner += token.value;
         const mappedOffset = sourceMapping && sourceMapping[plainCharIndex] !== void 0 ? sourceMapping[plainCharIndex] + 1 : plainCharIndex + 1;
         segSourceEnd = lineSourceStart + mappedOffset;
         plainCharIndex += token.value.length;
@@ -704,7 +924,9 @@ function wrapTranscriptLineWithLayout(line, columns, hangingIndent = "", lineSou
       sourceStart: segSourceStart,
       sourceEnd: segSourceEnd,
       prefixWidth: currentPrefixWidth,
-      sourceMapping: rowMapping.length > 0 ? rowMapping : void 0
+      sourceMapping: rowMapping.length > 0 ? rowMapping : void 0,
+      softWrapped: start < tokens.length,
+      softWrapJoiner
     });
   }
   return rows.length > 0 ? rows : [
@@ -720,7 +942,7 @@ 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, " ");
+  const plain = stripAnsi2(title).replace(/[\x00-\x1f\x7f]+/g, " ");
   let truncated = "";
   let width = 0;
   const maxCols = 80;
@@ -5511,7 +5733,7 @@ export {
   resolveCliColorEnabled,
   dimCliText,
   ANSI_ESCAPE_REGEX,
-  stripAnsi,
+  stripAnsi2 as stripAnsi,
   applyTerminalOutputToText,
   displayWidth,
   visibleWidth,

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-OJX27NII.js");
+    const { runAgentRunCommand } = await import("./agentRunCommand-LEBZ6PNB.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-J2ARMEUC.js");
+  const { startTuiWorkspace } = await import("./readlineWorkspace-R6QZRAIA.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.21",
+  "version": "0.33.0-alpha.22",
   "type": "module",
   "description": "Agent-first terminal workspace for Nolo",
   "bin": {

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

@@ -73,7 +73,7 @@ import {
   wrapTextToLines,
   wrapTranscriptLine,
   wrapTranscriptLineWithLayout
-} from "./chunk-46JSKTPF.js";
+} from "./chunk-AEYCNMJI.js";
 import "./chunk-ZHYK3N56.js";
 import {
   getReadableCliDb
@@ -1767,22 +1767,15 @@ function areSelectionPointsEqual(a, b) {
   if (a === null || b === null) return false;
   return a.globalRow === b.globalRow && a.col === b.col;
 }
-function highlightLineByColumns(line, selStartCol, selEndCol) {
-  if (selStartCol >= selEndCol) return line;
+function highlightLineByColumns(line, selStartCol, selEndCol, prefixWidth = 0) {
   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;
+  const range = resolveSelectableColumnRange(
+    tokens,
+    selStartCol,
+    selEndCol,
+    prefixWidth
+  );
+  if (!range) return line;
   let out = "";
   let currentCol = 0;
   let isHighlightActive = false;
@@ -1802,7 +1795,7 @@ function highlightLineByColumns(line, selStartCol, selEndCol) {
     }
     const charStartCol = currentCol;
     const charEndCol = currentCol + token.width;
-    const isSelected = charStartCol >= selStartCol && charStartCol < effectiveEndCol;
+    const isSelected = charStartCol >= range.start && charStartCol < range.end;
     if (isSelected && !isHighlightActive) {
       out += "\x1B[7m";
       isHighlightActive = true;
@@ -1818,56 +1811,71 @@ function highlightLineByColumns(line, selStartCol, selEndCol) {
   }
   return out;
 }
+function resolveSelectableColumnRange(tokens, requestedStart, requestedEnd, prefixWidth) {
+  if (requestedStart >= requestedEnd) return null;
+  let col = 0;
+  let lastNonSpaceCol = 0;
+  for (const token of tokens) {
+    if (token.kind !== "char") continue;
+    if (token.value.trim().length > 0) {
+      lastNonSpaceCol = col + token.width;
+    }
+    col += token.width;
+  }
+  const start = Math.max(prefixWidth, requestedStart);
+  const end = Math.min(requestedEnd, lastNonSpaceCol);
+  if (start >= end) return null;
+  let snappedStart = null;
+  let snappedEnd = null;
+  col = 0;
+  for (const token of tokens) {
+    if (token.kind !== "char") continue;
+    const tokenStart = col;
+    const tokenEnd = col + token.width;
+    if (tokenEnd > start && tokenStart < end) {
+      snappedStart ??= tokenStart;
+      snappedEnd = tokenEnd;
+    }
+    col = tokenEnd;
+  }
+  return snappedStart === null || snappedEnd === null ? null : { start: snappedStart, end: snappedEnd };
+}
 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 = "";
+function extractTextSliceByColumns(line, startCol, endCol, prefixWidth = 0) {
+  const tokens = tokenizeAnsiLine(line);
+  const range = resolveSelectableColumnRange(
+    tokens,
+    startCol,
+    endCol,
+    prefixWidth
+  );
+  if (!range) return "";
   let col = 0;
-  for (const char of text) {
-    const w = displayWidth(char);
-    if (col + w > effectiveStart && col < effectiveEnd) {
-      out += char;
+  let text = "";
+  for (const token of tokens) {
+    if (token.kind !== "char") continue;
+    if (col >= range.start && col < range.end) {
+      text += token.value;
     }
-    col += w;
+    col += token.width;
   }
-  return out;
+  return text;
 }
-function extractSelectedText(history, anchor, head, contentWidth = 80) {
+function extractSelectedText(history, anchor, head, contentWidth) {
   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;
-  const lines = buildHistoryLines(history, contentWidth);
-  const selectedLines = [];
+  const rows = buildHistoryLayoutRows(history, contentWidth);
+  const pieces = [];
   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;
-    }
+    const row = rows[r];
+    if (!row) continue;
     let lineStartCol = 0;
     let lineEndCol = Infinity;
     if (r === start.globalRow) {
@@ -1876,14 +1884,21 @@ function extractSelectedText(history, anchor, head, contentWidth = 80) {
     if (r === end.globalRow) {
       lineEndCol = end.col;
     }
-    const extracted = extractTextSliceByColumns(plain, lineStartCol, lineEndCol);
-    if (extracted.length > 0) {
-      selectedLines.push(extracted);
+    pieces.push(
+      extractTextSliceByColumns(
+        row.rendered,
+        lineStartCol,
+        lineEndCol,
+        row.prefixWidth
+      )
+    );
+    if (r < end.globalRow) {
+      pieces.push(row.softWrapped ? row.softWrapJoiner ?? "" : "\n");
     }
   }
-  return selectedLines.join("\n");
+  return pieces.join("");
 }
-function applySelectionOverlay(visibleLines, _history, _contentWidth, scrollTop, selection) {
+function applySelectionOverlay(visibleLines, history, contentWidth, scrollTop, selection) {
   if (!selection.anchor || !selection.head) {
     return visibleLines;
   }
@@ -1891,6 +1906,7 @@ function applySelectionOverlay(visibleLines, _history, _contentWidth, scrollTop,
   if (cmp === 0) return visibleLines;
   const start = cmp < 0 ? selection.anchor : selection.head;
   const end = cmp < 0 ? selection.head : selection.anchor;
+  const layoutRows = buildHistoryLayoutRows(history, contentWidth);
   const result = [...visibleLines];
   for (let screenRow = 0; screenRow < visibleLines.length; screenRow++) {
     const globalRow = scrollTop + screenRow;
@@ -1899,6 +1915,7 @@ function applySelectionOverlay(visibleLines, _history, _contentWidth, scrollTop,
     }
     const currentLine = result[screenRow] ?? "";
     if (currentLine.length === 0) continue;
+    const layoutRow = layoutRows[globalRow];
     let selStartCol = 0;
     let selEndCol = Infinity;
     if (globalRow === start.globalRow) {
@@ -1910,7 +1927,8 @@ function applySelectionOverlay(visibleLines, _history, _contentWidth, scrollTop,
     result[screenRow] = highlightLineByColumns(
       currentLine,
       selStartCol,
-      selEndCol
+      selEndCol,
+      layoutRow?.prefixWidth ?? 0
     );
   }
   return result;
@@ -2031,7 +2049,9 @@ function layoutTurnRows(role, content, contentWidth, colorEnabled, command) {
           sourceStart: r.sourceStart,
           sourceEnd: r.sourceEnd,
           prefixWidth: r.prefixWidth,
-          sourceMapping: r.sourceMapping
+          sourceMapping: r.sourceMapping,
+          softWrapped: r.softWrapped,
+          softWrapJoiner: r.softWrapJoiner
         });
       }
       lineSourceStart += line.length + 1;
@@ -2059,7 +2079,9 @@ function layoutTurnRows(role, content, contentWidth, colorEnabled, command) {
           sourceStart: 0,
           sourceEnd: 0,
           prefixWidth: 2,
-          sourceMapping: void 0
+          sourceMapping: void 0,
+          softWrapped: r.softWrapped,
+          softWrapJoiner: r.softWrapJoiner
         });
       }
     }
@@ -2329,35 +2351,39 @@ function buildCopyViewLines(history) {
   }
   return lines;
 }
-function buildHistoryLines(history, contentWidth) {
+function buildHistoryLayoutRows(history, contentWidth) {
   const colorEnabled = resolveCliColorEnabled();
   const density = getActiveDensity();
   const surface = colorEnabled ? userSurfaceBackgroundSequence() : "";
-  const wrapped = [];
+  const rows = [];
+  const separatorRow = () => ({
+    rendered: "",
+    sourceStart: 0,
+    sourceEnd: 0,
+    prefixWidth: 0
+  });
   for (let i = 0; i < history.turns.length; i++) {
     const turn = history.turns[i];
     if (density === "spacious" && (i > 0 || turn.role === "user")) {
-      wrapped.push("");
+      rows.push(separatorRow());
     }
-    const layoutRows = getTurnLayoutRows(turn, contentWidth, colorEnabled, density, surface);
-    wrapped.push(...layoutRows.map((r) => r.rendered));
+    rows.push(...getTurnLayoutRows(turn, contentWidth, colorEnabled, density, surface));
   }
   if (history.currentRole !== null && history.currentContent) {
     const i = history.turns.length;
     if (density === "spacious" && (i > 0 || history.currentRole === "user")) {
-      wrapped.push("");
+      rows.push(separatorRow());
     }
-    const streamingLines = getStreamingTurnLines(
-      history.currentRole,
-      history.currentContent,
-      contentWidth,
-      colorEnabled,
-      density,
-      surface
+    rows.push(
+      ...layoutTurnRows(
+        history.currentRole,
+        history.currentContent,
+        contentWidth,
+        colorEnabled
+      )
     );
-    wrapped.push(...streamingLines);
   }
-  return wrapped;
+  return rows;
 }
 var renderCacheMissCount = 0;
 function renderHistory(output, history, inputLines, selection) {
@@ -6392,6 +6418,10 @@ async function startTuiWorkspace(options) {
   const output = options.output ?? defaultOutput;
   const fetchImpl = options.fetchImpl ?? fetch;
   const spawnRunner = options.spawnRunner ?? spawnProcess;
+  const writeClipboard = options.clipboardWriter ?? (async (text) => {
+    const { default: clipboard } = await import("./clipboardy-MMBYVRLF.js");
+    await clipboard.write(text);
+  });
   const selfUpdater = options.selfUpdater ?? ((target) => runSelfUpdate({ output: target }));
   if (output.isTTY) {
     enterAltScreen(output);
@@ -7128,8 +7158,7 @@ async function startTuiWorkspace(options) {
         emitCommandOutput(t("copyNothing"));
       } else {
         try {
-          const { default: clipboard } = await import("./clipboardy-MMBYVRLF.js");
-          await clipboard.write(text);
+          await writeClipboard(text);
           emitCommandOutput(t("copiedLastReply"));
         } catch (error) {
           const message = toErrorMessage(error);
@@ -7642,10 +7671,14 @@ ${merged}` : merged;
             const textToCopy = extractSelectedText(
               history,
               selectionState.anchor,
-              selectionState.head
+              selectionState.head,
+              contentWidth
             );
             if (textToCopy.length > 0) {
-              import("./clipboardy-MMBYVRLF.js").then(({ default: clipboard }) => clipboard.write(textToCopy)).catch(() => {
+              writeClipboard(textToCopy).catch((error) => {
+                emitCommandOutput(
+                  `[nolo] ${t("copyFailed")}: ${toErrorMessage(error)}`
+                );
               });
             }
             selectionState.dragging = false;