nolo-cli 0.149.0-alpha.1 → 0.151.0-alpha.3

package/{chunk-N7J63Q6C.js → chunk-56GBUMO5.js}

@@ -203,6 +203,13 @@ function accumulateToolCallDelta(accumulator, deltas) {
     const deltaId = typeof delta.id === "string" && delta.id ? delta.id : "";
     const wireIndex = typeof delta.index === "number" ? delta.index : void 0;
     const current = accumulator.slots[resolveSlot(accumulator, deltaId, wireIndex)];
+    if (typeof delta.thought_signature === "string") {
+      current.thought_signature = delta.thought_signature;
+    }
+    const signature = delta.extra_content?.google?.thought_signature;
+    if (typeof signature === "string") {
+      current.extra_content = { google: { thought_signature: signature } };
+    }
     const fn = delta.function;
     if (fn && typeof fn === "object") {
       const functionDelta = fn;
@@ -220,7 +227,9 @@ function accumulateToolCallDelta(accumulator, deltas) {
   }
 }
 function finalizeAccumulatedToolCalls(accumulator) {
-  return accumulator.slots.filter((slot) => slot.function.name).map(({ id, type, function: fn }) => ({
+  return accumulator.slots.filter((slot) => slot.function.name).map(({ id, type, function: fn, thought_signature, extra_content }) => ({
+    ...thought_signature !== void 0 ? { thought_signature } : {},
+    ...extra_content ? { extra_content } : {},
     id,
     type,
     function: {

package/{chunk-W7XHHYWM.js → chunk-5BHQICF2.js}

@@ -10,6 +10,9 @@ var CLI_PROVIDER_VALUES = [
   "grok",
   "kimi"
 ];
+function isCliProvider(value) {
+  return typeof value === "string" && CLI_PROVIDER_VALUES.includes(value);
+}
 var CLI_PROVIDER_DISPLAY_LABELS = {
   copilot: "GitHub Copilot CLI\uFF08gh copilot\uFF09",
   gemini: "Gemini CLI\uFF08gemini\uFF09",
@@ -27,5 +30,6 @@ var CLI_PROVIDER_OPTIONS = CLI_PROVIDER_VALUES.map((value) => ({
 }));
 
 export {
-  CLI_PROVIDER_VALUES
+  CLI_PROVIDER_VALUES,
+  isCliProvider
 };

package/{chunk-XUWRURDF.js → chunk-5EBLANFT.js}

@@ -1,6 +1,6 @@
 import {
   CHROME_CONNECTOR_LEGACY_TOOL_ALIASES
-} from "./chunk-5J3PYNUP.js";
+} from "./chunk-NYYFIKHI.js";
 
 // packages/agent-runtime/toolNameAliases.ts
 var LEGACY_TOOL_NAME_ALIASES = {

package/{chunk-3AH7LNUB.js → chunk-5EMSBTQ6.js}

@@ -1,3 +1,6 @@
+import {
+  asNonEmptyStringArray
+} from "./chunk-I42VC5KR.js";
 import {
   asOptionalFiniteNumber
 } from "./chunk-WWC7I6TA.js";
@@ -2395,17 +2398,6 @@ function toTrimmedString(value) {
   return typeof value === "string" ? value.trim() : value == null ? "" : String(value).trim();
 }
 
-// packages/core/stringArray.ts
-function asNonEmptyStringArray(value) {
-  if (!Array.isArray(value)) return [];
-  return value.filter(
-    (item) => typeof item === "string" && !!item.trim()
-  );
-}
-function asTrimmedNonEmptyStringArray(value) {
-  return asNonEmptyStringArray(value).map((item) => item.trim());
-}
-
 // packages/database/utils/ulid.ts
 import { monotonicFactory } from "ulid";
 var prng = () => Math.random();
@@ -2617,6 +2609,7 @@ var createDialogMessageKeyAndId = (dialogId, ulidFn = ulid) => {
   const messageId = ulidFn();
   return { key: dialogMessageKey(dialogId, messageId), messageId };
 };
+var dialogMessagePrefix = (dialogId) => createKey2("dialog" /* DIALOG */, dialogId, "msg");
 var dialogMessageRange = (dialogId) => ({
   start: createKey2("dialog" /* DIALOG */, dialogId, "msg", ""),
   end: createKey2("dialog" /* DIALOG */, dialogId, "msg", "\uFFFF")
@@ -2717,8 +2710,9 @@ var metaKey = Object.assign(
 var DB_PREFIX = {
   USER: "user:"
 };
+var USER_SETTINGS_KEY_SUFFIX = `${SEPARATOR2}settings`;
 var createUserKey = {
-  settings: (userId) => createKey(userId, "settings"),
+  settings: (userId) => `${userId}${USER_SETTINGS_KEY_SUFFIX}`,
   profile: (userId) => createKey(userId, "profile")
 };
 var createUserPreferenceKey = {
@@ -2763,6 +2757,22 @@ var createTokenKey = {
   record: (0, import_rambda.curry)(
     (userId, timestamp) => createKey("token", userId, timestamp.toString())
   ),
+  /**
+   * 单次计费记录：`token/<user>/<timestamp>/<chargeId>`。
+   *
+   * 与 `record` 的唯一区别是把「本次计费自己的唯一 id」作为额外一段拼在末尾
+   * —— 同一用户同一毫秒内的两笔合法计费因此各占一个 key，不再互相覆盖，
+   * 也不会共用同一个账本 txId / 幂等键（`token-<tokenKey>` / `token:<tokenKey>`）
+   * 而被账本判为 duplicate 静默漏扣。
+   *
+   * 兼容性：timestamp 仍是第二段且保持首位排序，因此
+   *   - `rangeOfUser(userId)`（usage/统计等读取路径用的全前缀范围）照常覆盖；
+   *   - `range(userId, ts)` 的 `token/<user>/<ts>` … `token/<user>/<ts+1d>`
+   *     区间同样覆盖新 key（`<ts>-xxx` > `<ts>` 且 < `<ts+1>`），历史数据
+   *     与新数据可以在同一区间里混扫。
+   * 幂等键的稳定性由调用方决定：需要「重试同一笔」时传稳定的 chargeId。
+   */
+  recordForCharge: (userId, timestamp, chargeId) => createKey("token", userId, timestamp.toString(), encodeURIComponent(chargeId)),
   /** Server provider-call record: retry-stable even when the retry clock changes. */
   recordForStableCall: (userId, callId) => createKey("token", userId, "call", encodeURIComponent(callId)),
   /** Server provider-call failure audit record: preserved separately from retry success in a collision-free namespace. */
@@ -2787,6 +2797,16 @@ var createTokenStatsKey = Object.assign(
     })
   }
 );
+var createTokenStatsAppliedKey = Object.assign(
+  (userId, chargeKey) => createKey("token", "charge-stats", userId, encodeURIComponent(chargeKey)),
+  {
+    /** 某个用户的全部计费幂等标记范围：token-charge-stats-<userId>-* */
+    rangeOfUser: (userId) => ({
+      start: createKey("token", "charge-stats", userId, ""),
+      end: createKey("token", "charge-stats", userId, "\uFFFF")
+    })
+  }
+);
 var DIALOG_AGENT_LIST_INDEX_PREFIX = "dialogidx";
 var DIALOG_LIST_TIMESTAMP_MAX = 9999999999999;
 function parseDialogUpdatedAtMs(value) {
@@ -3179,8 +3199,6 @@ var sanitizeShareData = (data) => {
 export {
   ulid,
   toTrimmedString,
-  asNonEmptyStringArray,
-  asTrimmedNonEmptyStringArray,
   toNonEmptyString,
   extractAgentInfo,
   extractCoverImage,
@@ -3192,6 +3210,7 @@ export {
   createDialogKey,
   dialogMessageKey,
   createDialogMessageKeyAndId,
+  dialogMessagePrefix,
   dialogMessageRange,
   SEPARATOR2 as SEPARATOR,
   createKey,

package/{chunk-YRRASA5Q.js → chunk-5MM7NNO6.js}

@@ -1,3 +1,6 @@
+import {
+  escapeStringRegexp
+} from "./chunk-IA7TRNNR.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
@@ -6360,6 +6363,8 @@ function fromMarkdown(value, encoding, options) {
 }
 function compiler(options) {
   const config = {
+    afterExit: [],
+    beforeEnter: [],
     transforms: [],
     canContainEols: ["emphasis", "fragment", "heading", "paragraph", "strong"],
     enter: {
@@ -6463,7 +6468,8 @@ function compiler(options) {
   function compile(events) {
     let tree = {
       type: "root",
-      children: []
+      children: [],
+      position: void 0
     };
     const context = {
       stack: [tree],
@@ -6476,24 +6482,40 @@ function compiler(options) {
       data
     };
     const listStack = [];
+    const prepared = [];
     let index2 = -1;
     while (++index2 < events.length) {
+      prepared.push(events[index2]);
       if (events[index2][1].type === "listOrdered" || events[index2][1].type === "listUnordered") {
         if (events[index2][0] === "enter") {
-          listStack.push(index2);
+          listStack.push(prepared.length - 1);
         } else {
           const tail = listStack.pop();
-          index2 = prepareList(events, tail, index2);
+          prepareList(prepared, tail);
         }
       }
     }
+    events = prepared;
     index2 = -1;
     while (++index2 < events.length) {
       const handler = config[events[index2][0]];
+      if (events[index2][0] === "enter" && config.beforeEnter.length > 0) {
+        callListeners(config.beforeEnter, {
+          ...context,
+          sliceSerialize: events[index2][2].sliceSerialize
+        }, events[index2][1]);
+      }
       if (own2.call(handler, events[index2][1].type)) {
-        handler[events[index2][1].type].call(Object.assign({
+        handler[events[index2][1].type].call({
+          ...context,
+          sliceSerialize: events[index2][2].sliceSerialize
+        }, events[index2][1]);
+      }
+      if (events[index2][0] === "exit" && config.afterExit.length > 0) {
+        callListeners(config.afterExit, {
+          ...context,
           sliceSerialize: events[index2][2].sliceSerialize
-        }, context), events[index2][1]);
+        }, events[index2][1]);
       }
     }
     if (context.tokenStack.length > 0) {
@@ -6519,7 +6541,14 @@ function compiler(options) {
     }
     return tree;
   }
-  function prepareList(events, start, length) {
+  function callListeners(listeners, context, token) {
+    let index2 = -1;
+    while (++index2 < listeners.length) {
+      listeners[index2].call(context, token);
+    }
+  }
+  function prepareList(events, start) {
+    const end = events.length - 1;
     let index2 = start - 1;
     let containerBalance = -1;
     let listSpread = false;
@@ -6527,7 +6556,8 @@ function compiler(options) {
     let lineIndex;
     let firstBlankLineIndex;
     let atMarker;
-    while (++index2 <= length) {
+    const insertions = [];
+    while (++index2 <= end) {
       const event = events[index2];
       switch (event[1].type) {
         case "listUnordered":
@@ -6584,9 +6614,10 @@ function compiler(options) {
             listItem2._spread = true;
           }
           listItem2.end = Object.assign({}, lineIndex ? events[lineIndex][1].start : event[1].end);
-          events.splice(lineIndex || index2, 0, ["exit", listItem2, event[2]]);
-          index2++;
-          length++;
+          insertions.push({
+            at: lineIndex || index2,
+            event: ["exit", listItem2, event[2]]
+          });
         }
         if (event[1].type === "listItemPrefix") {
           const item = {
@@ -6597,16 +6628,25 @@ function compiler(options) {
             end: void 0
           };
           listItem2 = item;
-          events.splice(index2, 0, ["enter", item, event[2]]);
-          index2++;
-          length++;
+          insertions.push({
+            at: index2,
+            event: ["enter", item, event[2]]
+          });
           firstBlankLineIndex = void 0;
           atMarker = true;
         }
       }
     }
+    const listEvents = events.splice(start);
+    let insertion = 0;
+    index2 = -1;
+    while (++index2 < listEvents.length) {
+      while (insertion < insertions.length && insertions[insertion].at === start + index2) {
+        events.push(insertions[insertion++].event);
+      }
+      events.push(listEvents[index2]);
+    }
     events[start][1]._spread = listSpread;
-    return length;
   }
   function opener(create, and) {
     return open;
@@ -6648,7 +6688,8 @@ function compiler(options) {
         start: token.start,
         end: token.end
       }) + "): it\u2019s not open");
-    } else if (open[0].type !== token.type) {
+    }
+    if (open[0].type !== token.type) {
       if (onExitError) {
         onExitError.call(this, token, open[0]);
       } else {
@@ -6884,7 +6925,8 @@ function compiler(options) {
   function blockQuote2() {
     return {
       type: "blockquote",
-      children: []
+      children: [],
+      position: void 0
     };
   }
   function codeFlow() {
@@ -6892,13 +6934,15 @@ function compiler(options) {
       type: "code",
       lang: null,
       meta: null,
-      value: ""
+      value: "",
+      position: void 0
     };
   }
   function codeText2() {
     return {
       type: "inlineCode",
-      value: ""
+      value: "",
+      position: void 0
     };
   }
   function definition2() {
@@ -6907,13 +6951,15 @@ function compiler(options) {
       identifier: "",
       label: null,
       title: null,
-      url: ""
+      url: "",
+      position: void 0
     };
   }
   function emphasis() {
     return {
       type: "emphasis",
-      children: []
+      children: [],
+      position: void 0
     };
   }
   function heading() {
@@ -6921,18 +6967,21 @@ function compiler(options) {
       type: "heading",
       // @ts-expect-error `depth` will be set later.
       depth: 0,
-      children: []
+      children: [],
+      position: void 0
     };
   }
   function hardBreak() {
     return {
-      type: "break"
+      type: "break",
+      position: void 0
     };
   }
   function html() {
     return {
       type: "html",
-      value: ""
+      value: "",
+      position: void 0
     };
   }
   function image() {
@@ -6940,7 +6989,8 @@ function compiler(options) {
       type: "image",
       title: null,
       url: "",
-      alt: null
+      alt: null,
+      position: void 0
     };
   }
   function link() {
@@ -6948,7 +6998,8 @@ function compiler(options) {
       type: "link",
       title: null,
       url: "",
-      children: []
+      children: [],
+      position: void 0
     };
   }
   function list2(token) {
@@ -6957,7 +7008,8 @@ function compiler(options) {
       ordered: token.type === "listOrdered",
       start: null,
       spread: token._spread,
-      children: []
+      children: [],
+      position: void 0
     };
   }
   function listItem(token) {
@@ -6965,30 +7017,35 @@ function compiler(options) {
       type: "listItem",
       spread: token._spread,
       checked: null,
-      children: []
+      children: [],
+      position: void 0
     };
   }
   function paragraph() {
     return {
       type: "paragraph",
-      children: []
+      children: [],
+      position: void 0
     };
   }
   function strong() {
     return {
       type: "strong",
-      children: []
+      children: [],
+      position: void 0
     };
   }
   function text4() {
     return {
       type: "text",
-      value: ""
+      value: "",
+      position: void 0
     };
   }
   function thematicBreak2() {
     return {
-      type: "thematicBreak"
+      type: "thematicBreak",
+      position: void 0
     };
   }
 }
@@ -7029,6 +7086,14 @@ function extension(combined, extension2) {
           }
           break;
         }
+        case "afterExit":
+        case "beforeEnter": {
+          const right = extension2[key];
+          if (right) {
+            combined[key].push(right);
+          }
+          break;
+        }
         case "enter":
         case "exit": {
           const right = extension2[key];
@@ -7050,12 +7115,11 @@ function defaultOnError(left, right) {
       start: right.start,
       end: right.end
     }) + ") is open");
-  } else {
-    throw new Error("Cannot close document, a token (`" + right.type + "`, " + stringifyPosition({
-      start: right.start,
-      end: right.end
-    }) + ") is still open");
   }
+  throw new Error("Cannot close document, a token (`" + right.type + "`, " + stringifyPosition({
+    start: right.start,
+    end: right.end
+  }) + ") is still open");
 }
 
 // node_modules/ccount/index.js
@@ -7077,14 +7141,6 @@ function ccount(value, character) {
 function ok() {
 }
 
-// node_modules/mdast-util-find-and-replace/node_modules/escape-string-regexp/index.js
-function escapeStringRegexp(string3) {
-  if (typeof string3 !== "string") {
-    throw new TypeError("Expected a string");
-  }
-  return string3.replace(/[|\\{}()[\]^$+*?.]/g, "\\$&").replace(/-/g, "\\x2d");
-}
-
 // node_modules/unist-util-is/lib/index.js
 var convert = (
   // Note: overloads in JSDoc can’t yet use different `@template`s.
@@ -7320,15 +7376,12 @@ function findAndReplace(tree, list2, options) {
         find.lastIndex = position2 + 1;
       } else {
         if (start !== position2) {
-          nodes.push({
-            type: "text",
-            value: node2.value.slice(start, position2)
-          });
+          add({ type: "text", value: node2.value.slice(start, position2) });
         }
         if (Array.isArray(value)) {
-          nodes.push(...value);
+          for (const child of value) add(child);
         } else if (value) {
-          nodes.push(value);
+          add(value);
         }
         start = position2 + match[0].length;
         change = true;
@@ -7340,20 +7393,28 @@ function findAndReplace(tree, list2, options) {
     }
     if (change) {
       if (start < node2.value.length) {
-        nodes.push({ type: "text", value: node2.value.slice(start) });
+        add({ type: "text", value: node2.value.slice(start) });
       }
       parent.children.splice(index2, 1, ...nodes);
     } else {
       nodes = [node2];
     }
     return index2 + nodes.length;
+    function add(child) {
+      const previous3 = nodes[nodes.length - 1];
+      if (previous3 && previous3.type === "text" && child.type === "text") {
+        previous3.value += child.value;
+      } else {
+        nodes.push(child);
+      }
+    }
   }
 }
 function toPairs(tupleOrList) {
-  const result = [];
   if (!Array.isArray(tupleOrList)) {
     throw new TypeError("Expected find and replace tuple or list of tuples");
   }
+  const result = [];
   const list2 = !tupleOrList[0] || Array.isArray(tupleOrList[0]) ? tupleOrList : [tupleOrList];
   let index2 = -1;
   while (++index2 < list2.length) {

package/chunk-5MMAK75Q.js

@@ -0,0 +1,15 @@
+import {
+  compactWhitespace
+} from "./chunk-DWLEOOGR.js";
+
+// packages/core/clipCompactText.ts
+function clipCompactText(value, max, ellipsis = "...") {
+  const compact = compactWhitespace(value);
+  if (compact.length <= max) return compact;
+  if (max <= ellipsis.length) return compact.slice(0, max);
+  return `${compact.slice(0, max - ellipsis.length)}${ellipsis}`;
+}
+
+export {
+  clipCompactText
+};

package/{chunk-TXH4IWJL.js → chunk-626KHJNX.js}

@@ -1,16 +1,16 @@
 import {
-  require_date_fns
-} from "./chunk-M76ECQRD.js";
+  formatISO
+} from "./chunk-ZRAU6T47.js";
 import {
   require_react
 } from "./chunk-YDH3FDFQ.js";
-import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
 import {
   patch,
   readAndWait
-} from "./chunk-HYZIYH2H.js";
+} from "./chunk-74RAWNQN.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
@@ -20,7 +20,6 @@ import {
 
 // packages/render/page/docStore.ts
 var import_react = __toESM(require_react(), 1);
-var import_date_fns = __toESM(require_date_fns(), 1);
 var createInitialState = () => ({
   content: null,
   slateData: null,
@@ -52,6 +51,7 @@ var createInitialState = () => ({
 var listeners = /* @__PURE__ */ new Set();
 var version = 0;
 var state = createInitialState();
+var latestInitRequestKey = null;
 var notify = () => {
   for (const listener of listeners) {
     try {
@@ -102,6 +102,9 @@ function getDocField(selector) {
 function getDocPageKey() {
   return state.pageKey;
 }
+function isDocStateForPage(state2, pageKey) {
+  return Boolean(pageKey) && state2.pageKey === pageKey;
+}
 function getDocIsInitialized() {
   return state.isInitialized;
 }
@@ -143,6 +146,7 @@ function updateDocTags(tags) {
   setState((prev) => ({ ...prev, tags }));
 }
 function resetDocState() {
+  latestInitRequestKey = null;
   setState(createInitialState());
 }
 function previewDocState(payload) {
@@ -190,6 +194,7 @@ function applyExternalDocUpdate(payload) {
 }
 async function initDocState(args, { dispatch }) {
   const { pageKey, isReadOnly } = args;
+  latestInitRequestKey = pageKey;
   setState((prev) => ({
     ...createInitialState(),
     isLoading: true,
@@ -198,6 +203,7 @@ async function initDocState(args, { dispatch }) {
   }));
   try {
     const readAction = await dispatch(readAndWait(pageKey));
+    if (latestInitRequestKey !== pageKey) return;
     if (readAndWait.fulfilled.match(readAction) && readAction.payload) {
       const data = readAction.payload;
       if (data.type !== "page" /* DOC */) {
@@ -247,6 +253,7 @@ async function initDocState(args, { dispatch }) {
       }));
     }
   } catch (e) {
+    if (latestInitRequestKey !== pageKey) return;
     setState((prev) => ({
       ...prev,
       isLoading: false,
@@ -300,7 +307,7 @@ async function saveDocState(arg, { dispatch, getState }) {
       { slateToRenderMarkdown },
       { buildSkillSummaryMarker }
     ] = await Promise.all([
-      import("./slateUtils-RIZES3PV.js"),
+      import("./slateUtils-NGV2NMKM.js"),
       import("./slateToRenderMarkdown-Y5IYN73U.js"),
       import("./skillSummaryMarker-42HKSXYY.js")
     ]);
@@ -309,7 +316,7 @@ async function saveDocState(arg, { dispatch, getState }) {
     const skillSummary = buildSkillSummaryMarker(meta);
     const content = slateToRenderMarkdown(slateData);
     const now = /* @__PURE__ */ new Date();
-    const updatedAt = (0, import_date_fns.formatISO)(now);
+    const updatedAt = formatISO(now);
     await dispatch(
       patch({
         dbKey: pageKey,
@@ -326,7 +333,7 @@ async function saveDocState(arg, { dispatch, getState }) {
     ).unwrap();
     if (dbSpaceId) {
       try {
-        const { updateContentTitle } = await import("./contentThunks-BDIQRZR6.js");
+        const { updateContentTitle } = await import("./contentThunks-6AIWNSGO.js");
         await dispatch(
           updateContentTitle({
             spaceId: dbSpaceId,
@@ -365,7 +372,7 @@ async function saveDocState(arg, { dispatch, getState }) {
   }
 }
 async function createDocState(args, thunkApi) {
-  const { createPageAction } = await import("./createPageAction-CDLDKPRM.js");
+  const { createPageAction } = await import("./createPageAction-DXCZ334C.js");
   return createPageAction(args, thunkApi);
 }
 function subscribe(listener) {
@@ -387,6 +394,7 @@ function useDocField(selector) {
 }
 function resetDocStoreForTests() {
   state = createInitialState();
+  latestInitRequestKey = null;
   bump();
 }
 
@@ -394,6 +402,7 @@ export {
   getDocState,
   getDocField,
   getDocPageKey,
+  isDocStateForPage,
   getDocIsInitialized,
   getDocIsReadOnly,
   getDocHasPendingChanges,