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

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

@@ -9,7 +9,7 @@ import {
 } from "./chunk-ZHYK3N56.js";
 import {
   getReadableCliDb
-} from "./chunk-NUO3QFWD.js";
+} from "./chunk-UNHKVD2N.js";
 import {
   normalizeAgentHandle,
   readDbRecord,
@@ -21,10 +21,11 @@ import {
   getCliLocale,
   isBuiltinNoloAgentRef,
   isSubtaskRun,
+  isTransientFetchError,
   parseAgentRunEvent,
   t,
   toolLabel
-} from "./chunk-O6GEBMIY.js";
+} from "./chunk-XTSVOICC.js";
 import {
   NOLO_PROJECT_MANAGER_AGENT_KEY,
   isLocalCliAgentKey
@@ -35,27 +36,27 @@ import {
 } from "./chunk-LTRXGFMS.js";
 import {
   resolveMachineId
-} from "./chunk-6HYVJV7B.js";
+} from "./chunk-ESHYE7WU.js";
 import {
   formatAgentListCard
-} from "./chunk-HDKRSRYU.js";
+} from "./chunk-7BNPRRDS.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-RQSOAMPJ.js";
 import {
   getDefaultCliLocalRuntimeDb
-} from "./chunk-Q5ITEGIN.js";
+} from "./chunk-N4XRDM26.js";
 import {
   buildMemorySubjectsForAgent,
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-6SXC35F4.js";
+} from "./chunk-RO3AEN3L.js";
 import {
   API_REPORTED_COST_MULTIPLIER,
   normalizeUsage,
   parseUiAskChoiceContent
-} from "./chunk-73GINUCW.js";
+} from "./chunk-JL2PUYVS.js";
 import {
   resolveAgentRuntimeConfigFromRecord
 } from "./chunk-OIQPORYI.js";
@@ -64,7 +65,7 @@ import {
   LOCAL_TURN_ABORTED_CODE,
   readActionGate,
   readCommandActionGatePayload
-} from "./chunk-6PO2SYCS.js";
+} from "./chunk-YH3FPBG6.js";
 import {
   createThinkParserState,
   flushThinkParser,
@@ -72,27 +73,27 @@ import {
 } from "./chunk-N7J63Q6C.js";
 import {
   resolvePlatformAuthToken
-} from "./chunk-AFV4FOT2.js";
+} from "./chunk-OQVRTSZ5.js";
 import {
   DEFAULT_CONTEXT_WINDOW,
   getModelContextWindow
-} from "./chunk-2H3XIBY4.js";
+} from "./chunk-2CNX3CJE.js";
 import {
   clipCompactText
-} from "./chunk-AOXVOC6D.js";
+} from "./chunk-HCOIKLSH.js";
 import {
   findModelConfig
-} from "./chunk-DFUPZE6V.js";
+} from "./chunk-7SLMYTSF.js";
 import {
   buildSkillDiscoveryContextLayer
-} from "./chunk-ZURFOV5J.js";
+} from "./chunk-DMT4NJXR.js";
 import {
   buildAgentsMdLayer,
   buildMemoryOverlayLayer,
   buildMemoryUseGuidanceLayer,
   partitionScopedBlocks,
   renderTurnContextBlocksWithScope
-} from "./chunk-2UECQ7RE.js";
+} from "./chunk-3AOLVADY.js";
 import {
   parseExternalSkillMarkdown,
   parseSkillDocProtocol
@@ -141,7 +142,7 @@ import {
   BUILTIN_NOLO_AGENT_KEY,
   BUILTIN_NOLO_AGENT_NAME,
   builtinAgentCatalogEntryById
-} from "./chunk-UK5JGQVU.js";
+} from "./chunk-KZB5SNYH.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
@@ -387,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
@@ -473,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;
@@ -480,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;
+      }
     }
-    const codePoint = line.codePointAt(index) ?? 0;
-    const value = String.fromCodePoint(codePoint);
-    tokens.push({ kind: "char", value, width: displayWidth(value) });
-    index += value.length;
+    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
+      });
+    }
+    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)) {
@@ -513,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;
@@ -531,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;
       }
     }
@@ -556,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, " ");
@@ -3304,7 +3454,7 @@ async function detectCurrentMachineId(env) {
   const fromEnv = (env.NOLO_CURRENT_MACHINE_ID || env.NOLO_MACHINE_ID || "").trim();
   if (fromEnv) return fromEnv;
   try {
-    const { detectMachineInfo } = await import("./machineInfo-M6KB6HZN.js");
+    const { detectMachineInfo } = await import("./machineInfo-66ZFUMLE.js");
     const machine = await detectMachineInfo({ probeLaunchable: true });
     return asOptionalTrimmedString(machine?.machineId);
   } catch {
@@ -3521,7 +3671,7 @@ function findCollapsedPasteSpanAt(buffer, pos, opts = {}) {
 // packages/cli/client/agentRun.ts
 import { ulid } from "ulid";
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-JX34G47Z.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-UWDOE55A.js");
   return runLocalAgentTurn;
 }
 async function resolveCurrentMachineId(options) {
@@ -3753,6 +3903,10 @@ function describeLocalRunFailure(message) {
   }
   const cls = classifyLocalRunError(message);
   if (cls.kind === "generic") {
+    if (isTransientFetchError(message)) {
+      return `${RUN_UNAVAILABLE_PREFIX} (${message}). ${NO_FALLBACK} The upstream connection dropped mid-request (transient network/gateway issue \u2014 not a local credential or config problem). Send again (or say "continue") to retry in the same conversation.
+`;
+    }
     return `${RUN_UNAVAILABLE_PREFIX} (${message}). ${NO_FALLBACK} Fix the local credential/config and retry, ${SERVER_FALLBACK_HINT}.
 `;
   }
@@ -4054,12 +4208,6 @@ async function runLocalAgentTurnForCli(options, settings) {
             "[nolo] \u5F53\u524D agent \u4E0D\u652F\u6301\u56FE\u7247\u8F93\u5165\uFF0C\u5DF2\u7528\u5360\u4F4D\u6587\u672C\u66FF\u4EE3\u3002\u8981\u5B8C\u6574\u56FE\u7247\u7406\u89E3\u53EF /switch \u5230 Kimi K2.6\u3002\n"
           );
         }
-        if (event.kind === "image-preprocessed") {
-          options.output.write(
-            `[nolo] \u5DF2\u7528\u89C6\u89C9\u6A21\u578B\u89E3\u6790 ${event.imageCount} \u5F20\u56FE\u7247\u4E3A\u6587\u5B57\u63CF\u8FF0\uFF0C\u4F9B\u5F53\u524D agent \u4F7F\u7528\u3002
-`
-          );
-        }
         options.onLoopEvent?.(event);
       },
       ...options.abortSignal ? { abortSignal: options.abortSignal } : {},
@@ -5372,6 +5520,9 @@ export {
   countPhysicalLines,
   takeDisplayWidth,
   padOrTruncateToWidth,
+  tokenizeAnsiLine,
+  buildSourceMapping,
+  wrapTranscriptLineWithLayout,
   wrapTranscriptLine,
   buildWindowTitle,
   wrapTextToLines,

package/{chunk-3WXRAHCG.js → chunk-6MSSX7FI.js}

@@ -7,7 +7,7 @@ import {
 } from "./chunk-YDTYDA5W.js";
 import {
   toSafeAgentSummary
-} from "./chunk-2IVEXF7P.js";
+} from "./chunk-BHILFABL.js";
 import {
   PUBLIC_AGENT_KEY_PREFIX,
   isOwnedAgentKey,

package/{chunk-57QJXIB6.js → chunk-6YH4UR3E.js}

@@ -13,7 +13,7 @@ import {
   readAction,
   readRequestManager,
   resolveAgentReadServers
-} from "./chunk-UK5JGQVU.js";
+} from "./chunk-KZB5SNYH.js";
 import {
   asyncThunkCreator,
   buildCreateSlice,
@@ -707,7 +707,7 @@ var dbSlice = createSliceWithThunks({
     // 动态 import 在调用期解析，避开 TDZ/求值顺序问题（同下方 share）。
     read: create.asyncThunk(
       async (payload, thunkApi) => {
-        const { readAction: readAction2 } = await import("./read-6G73BMEY.js");
+        const { readAction: readAction2 } = await import("./read-526GJR3R.js");
         return readAction2(payload, thunkApi);
       },
       {
@@ -781,7 +781,7 @@ var dbSlice = createSliceWithThunks({
     // 这里改成动态 import，运行期才解析，彻底断开这条边。
     share: create.asyncThunk(
       async (config, thunkApi) => {
-        const { shareResourceAction } = await import("./action-SMLG6OTB.js");
+        const { shareResourceAction } = await import("./action-Q4KO7DDW.js");
         return shareResourceAction(config, thunkApi);
       }
     ),