nolo-cli 0.14.0-alpha.9 → 0.15.0

package/{chunk-DUE6E46E.js → chunk-BFRVXJJJ.js}

@@ -5,13 +5,10 @@ import {
   inlineImageUrlsForCustomProvider,
   prepareTools,
   shouldInlineImageUrlsForAgent
-} from "./chunk-MEXNTURY.js";
+} from "./chunk-WRN5EQT7.js";
 import {
   performFetchRequest
-} from "./chunk-P6DRYHVM.js";
-import {
-  getPublicImageAgentMode
-} from "./chunk-VIDPVFP3.js";
+} from "./chunk-6565R2TI.js";
 import {
   createSSEParser,
   createToolRunId,
@@ -22,29 +19,35 @@ import {
   toolRunSetPending,
   toolRunStarted,
   toolRunSucceeded
-} from "./chunk-KUDUXBNE.js";
+} from "./chunk-VE6XMVKG.js";
+import {
+  getPublicImageAgentMode
+} from "./chunk-VIDPVFP3.js";
 import {
   addToolMessage,
   messageStreamEnd,
   messageStreaming,
   selectCurrentSpaceId,
   updateToolMessage
-} from "./chunk-SW3Q2OV5.js";
+} from "./chunk-YNHQIXX5.js";
 import {
   streamAgentChatTurn
-} from "./chunk-NFHGY5T5.js";
+} from "./chunk-OQMPU2ML.js";
 import {
   EMPTY_ASSISTANT_REPAIR_PROMPT
-} from "./chunk-2ROIXEDX.js";
+} from "./chunk-6MHDWKOT.js";
 import {
   accumulateToolCallDelta,
   createThinkParserState,
+  createToolCallTextParserState,
   flushThinkParser,
+  flushToolCallTextParserIntoCallback,
+  processContentChunkWithToolCallStripping,
   processThinkChunk
-} from "./chunk-3WGLLTK4.js";
+} from "./chunk-LSFAWXKC.js";
 import {
   getModelInfo
-} from "./chunk-3B2LFO6R.js";
+} from "./chunk-4QQFLN5C.js";
 import {
   getApiEndpoint
 } from "./chunk-OGGHETUE.js";
@@ -61,10 +64,10 @@ import {
 } from "./chunk-HNMXYYJR.js";
 import {
   selectCurrentServer
-} from "./chunk-S5UACFUP.js";
+} from "./chunk-TTGAVETO.js";
 import {
   write
-} from "./chunk-A5V7UEZJ.js";
+} from "./chunk-SFXYKGK2.js";
 import {
   createDialogMessageKeyAndId,
   dialogMessageKey,
@@ -1105,6 +1108,7 @@ function createInitialStreamState() {
     accumulatedToolCalls: [],
     reasoningBuffer: "",
     thinkState: createThinkParserState(),
+    toolCallTextState: createToolCallTextParserState(),
     assistantToolCalls: void 0,
     hasHandedOff: false,
     hasProcessedToolCalls: false,
@@ -1248,7 +1252,19 @@ function applyDelta(state, delta) {
   }
   const contentChunk = delta.content || "";
   if (contentChunk) {
-    const parsed = processThinkChunk(contentChunk, next.thinkState);
+    const { cleanedContent, state: tcState } = processContentChunkWithToolCallStripping(
+      contentChunk,
+      next.toolCallTextState,
+      (name, arguments_) => {
+        next.accumulatedToolCalls = accumulateToolCallChunks(
+          next.accumulatedToolCalls ?? [],
+          [{ index: next.accumulatedToolCalls.length, type: "function", function: { name, arguments: arguments_ } }]
+        );
+      }
+    );
+    next.toolCallTextState = tcState;
+    if (!cleanedContent) return { state: next, hasNewVisibleContent };
+    const parsed = processThinkChunk(cleanedContent, next.thinkState);
     next.thinkState = parsed.state;
     if (parsed.reasoning) {
       next.reasoningBuffer = (next.reasoningBuffer || "") + parsed.reasoning;
@@ -1438,15 +1454,26 @@ async function readStreamChunkWithTimeout(reader, signal) {
 async function handleStreamCompletion(state, ctx, finalizeCtx) {
   let hasHandedOff = false;
   let hasPendingInteraction = false;
+  const { residualContent, state: tcFlushState } = flushToolCallTextParserIntoCallback(
+    state.toolCallTextState,
+    (name, arguments_) => {
+      state.accumulatedToolCalls = accumulateToolCallChunks(
+        state.accumulatedToolCalls ?? [],
+        [{ index: state.accumulatedToolCalls.length, type: "function", function: { name, arguments: arguments_ } }]
+      );
+    }
+  );
+  state.toolCallTextState = tcFlushState;
   const flushed = flushThinkParser(state.thinkState);
   state.thinkState = flushed.state;
   if (flushed.reasoning) {
     state.reasoningBuffer = (state.reasoningBuffer || "") + flushed.reasoning;
   }
-  if (flushed.content) {
+  const combinedFlushContent = residualContent + (flushed.content ?? "");
+  if (combinedFlushContent) {
     state = {
       ...state,
-      contentBuffer: appendTextChunk(state.contentBuffer, flushed.content)
+      contentBuffer: appendTextChunk(state.contentBuffer, combinedFlushContent)
     };
   }
   if (!state.hasProcessedToolCalls && state.accumulatedToolCalls.length > 0) {

package/{chunk-UONU6Q4P.js → chunk-G2MKOQCB.js}

@@ -1,7 +1,7 @@
 import {
   fetchReferenceContents,
   resolveReferenceAssets
-} from "./chunk-P6DRYHVM.js";
+} from "./chunk-6565R2TI.js";
 
 // packages/ai/agent/fetchAgentContexts.ts
 async function fetchAgentContexts(references, dispatch) {

package/chunk-GFUIQ4RY.js

@@ -0,0 +1,136 @@
+import {
+  buildSkillDocMarkdown
+} from "./chunk-VC6OZXO5.js";
+
+// packages/cli/docPageHelpers.ts
+import { readFileSync } from "node:fs";
+import { ulid } from "ulid";
+function getCliArg(args, flag) {
+  const idx = args.indexOf(flag);
+  return idx !== -1 ? args[idx + 1] : void 0;
+}
+function readBodyArg(args, fallback = "") {
+  const bodyFile = getCliArg(args, "--body-file");
+  if (bodyFile !== void 0) {
+    return readFileSync(bodyFile, "utf8");
+  }
+  return getCliArg(args, "--body") ?? fallback;
+}
+function textToSlate(text) {
+  return text.split("\n").map((line) => ({
+    type: "paragraph",
+    children: [{ text: line }]
+  }));
+}
+function createPageId() {
+  return ulid();
+}
+function buildPageKey(userId, pageId) {
+  return `page-${userId}-${pageId}`;
+}
+function buildPageRecord(args) {
+  const { dbKey, pageId, title, spaceId, content, existing, meta, slateData } = args;
+  const now = Date.now();
+  const createdAt = typeof existing?.createdAt === "number" ? existing.createdAt : now;
+  const created = typeof existing?.created === "string" ? existing.created : new Date(createdAt).toISOString();
+  const nextRecord = {
+    ...existing ?? {},
+    id: existing?.id ?? pageId,
+    dbKey,
+    type: "page",
+    title,
+    spaceId,
+    content,
+    updatedAt: now,
+    createdAt,
+    created
+  };
+  if (meta !== void 0) {
+    if (meta === null) {
+      delete nextRecord.meta;
+    } else {
+      nextRecord.meta = meta;
+    }
+  }
+  if (slateData !== void 0) {
+    if (slateData === null) {
+      delete nextRecord.slateData;
+    } else {
+      nextRecord.slateData = slateData;
+    }
+  } else if (!existing?.slateData) {
+    nextRecord.slateData = textToSlate(content);
+  }
+  return nextRecord;
+}
+
+// packages/cli/docSkillHelpers.ts
+function normalizeSkillSeed(input) {
+  return input.trim().toLowerCase().replace(/[^a-z0-9\u4e00-\u9fa5]+/g, "-").replace(/^-+|-+$/g, "");
+}
+function deterministicId(prefix, seed) {
+  let h = 2166136261;
+  for (let i = 0; i < seed.length; i++) {
+    h ^= seed.charCodeAt(i);
+    h = h * 16777619 >>> 0;
+  }
+  const suffix = h.toString(36).toUpperCase().padStart(14, "0");
+  return (prefix + suffix).slice(0, 26);
+}
+function buildSkillDocId(input) {
+  return deterministicId("01SK", normalizeSkillSeed(input) || input);
+}
+function buildSkillPageKey(userId, skillId) {
+  return buildPageKey(userId, skillId);
+}
+function buildSkillPageRecord(args) {
+  const {
+    dbKey,
+    skillId,
+    title,
+    spaceId,
+    body,
+    skillConfig,
+    evalConfig,
+    workflowConfig,
+    existing
+  } = args;
+  return {
+    ...buildPageRecord({
+      dbKey,
+      pageId: skillId,
+      title,
+      spaceId,
+      content: buildSkillDocMarkdown({
+        body,
+        skillConfig,
+        evalConfig,
+        workflowConfig
+      }),
+      existing,
+      meta: {
+        ...existing?.meta ?? {},
+        kind: "skill",
+        skillConfig,
+        ...evalConfig ? { evalConfig } : {},
+        ...workflowConfig ? { workflowConfig } : {}
+      },
+      slateData: null
+    })
+  };
+}
+function parseJsonArg(raw, fallback) {
+  if (raw === void 0) return fallback;
+  return JSON.parse(raw);
+}
+
+export {
+  readBodyArg,
+  createPageId,
+  buildPageKey,
+  buildPageRecord,
+  buildSkillDocId,
+  buildSkillPageKey,
+  buildSkillPageRecord,
+  parseJsonArg
+};

package/{chunk-SRKNB2WB.js → chunk-HRQCKQA5.js}

@@ -345,10 +345,10 @@ async function buildProviderExecutionPlan(args) {
 }
 
 // packages/agent-runtime/openAiCompatibleMessages.ts
-function preserveAgentStateFields(source, target) {
+function preserveAgentStateFields(source, target, options) {
   const mutableTarget = target;
   if (source.role === "assistant") {
-    if (typeof source.reasoning_content === "string") {
+    if (!options?.stripReasoningContent && typeof source.reasoning_content === "string") {
       mutableTarget.reasoning_content = source.reasoning_content;
     }
     if (Array.isArray(source.tool_calls)) {
@@ -361,12 +361,12 @@ function preserveAgentStateFields(source, target) {
   }
   return target;
 }
-function toOpenAiCompatibleMessages(messages) {
+function toOpenAiCompatibleMessages(messages, options) {
   return messages.map(
     (message) => preserveAgentStateFields(message, {
       role: message.role,
       content: message.content ?? ""
-    })
+    }, options)
   );
 }
 

package/{chunk-CDQ2ICPR.js → chunk-IOQ7IBPU.js}

@@ -1,7 +1,7 @@
 import {
   buildAgentRuntimeAgentLookupKeys,
   shouldFetchAgentRuntimeRecordRemotely
-} from "./chunk-SZ7RUWAQ.js";
+} from "./chunk-5VMYGIIL.js";
 
 // packages/cli/client/localAgentRecords.ts
 var buildLocalAgentLookupKeys = buildAgentRuntimeAgentLookupKeys;

package/{chunk-QLO2G5HP.js → chunk-ISYE6GZB.js}

@@ -1,6 +1,6 @@
 import {
   trimTrailingSlash
-} from "./chunk-SRKNB2WB.js";
+} from "./chunk-HRQCKQA5.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";

package/{chunk-CXLGUR7M.js → chunk-IZ2QRVEU.js}

@@ -1,10 +1,10 @@
 import {
   listUserRecordsFromServers,
   readLiveDbRecordAfterTombstoneMerge
-} from "./chunk-YQAG2J2T.js";
+} from "./chunk-472E5RMQ.js";
 import {
   agentRecordHasConfiguredCredential
-} from "./chunk-YG3CCS7C.js";
+} from "./chunk-K53477EY.js";
 import {
   toSafeAgentSummary
 } from "./chunk-OOIN7HSO.js";

package/{chunk-U4J6ZZFY.js → chunk-JBKVPAYK.js}

@@ -1,25 +1,22 @@
 import {
   readDbRecord,
   writeAgentRecord
-} from "./chunk-YG3CCS7C.js";
+} from "./chunk-K53477EY.js";
 import {
   buildSkillSummaryMarker
 } from "./chunk-VF4K2QE6.js";
-import {
-  buildSkillDocMarkdown
-} from "./chunk-VC6OZXO5.js";
-import {
-  createSpaceKey
-} from "./chunk-3FCSMQAC.js";
-import {
-  asTrimmedLowercaseString
-} from "./chunk-QSJ3HFEF.js";
 import {
   parseUserIdFromAuthToken,
   readOption,
   resolveAuthToken,
   resolveServerUrl
 } from "./chunk-A7GB5UGH.js";
+import {
+  createSpaceKey
+} from "./chunk-XVP3C2KY.js";
+import {
+  asTrimmedLowercaseString
+} from "./chunk-QSJ3HFEF.js";
 import {
   NOLO_CLUSTER_SERVERS
 } from "./chunk-LCBAMY2M.js";
@@ -30,128 +27,6 @@ import {
   normalizeServerOrigin
 } from "./chunk-CF7PE763.js";
 
-// packages/cli/docPageHelpers.ts
-import { readFileSync } from "node:fs";
-import { ulid } from "ulid";
-function getCliArg(args, flag) {
-  const idx = args.indexOf(flag);
-  return idx !== -1 ? args[idx + 1] : void 0;
-}
-function readBodyArg(args, fallback = "") {
-  const bodyFile = getCliArg(args, "--body-file");
-  if (bodyFile !== void 0) {
-    return readFileSync(bodyFile, "utf8");
-  }
-  return getCliArg(args, "--body") ?? fallback;
-}
-function textToSlate(text) {
-  return text.split("\n").map((line) => ({
-    type: "paragraph",
-    children: [{ text: line }]
-  }));
-}
-function createPageId() {
-  return ulid();
-}
-function buildPageKey(userId, pageId) {
-  return `page-${userId}-${pageId}`;
-}
-function buildPageRecord(args) {
-  const { dbKey, pageId, title, spaceId, content, existing, meta, slateData } = args;
-  const now = Date.now();
-  const createdAt = typeof existing?.createdAt === "number" ? existing.createdAt : now;
-  const created = typeof existing?.created === "string" ? existing.created : new Date(createdAt).toISOString();
-  const nextRecord = {
-    ...existing ?? {},
-    id: existing?.id ?? pageId,
-    dbKey,
-    type: "page",
-    title,
-    spaceId,
-    content,
-    updatedAt: now,
-    createdAt,
-    created
-  };
-  if (meta !== void 0) {
-    if (meta === null) {
-      delete nextRecord.meta;
-    } else {
-      nextRecord.meta = meta;
-    }
-  }
-  if (slateData !== void 0) {
-    if (slateData === null) {
-      delete nextRecord.slateData;
-    } else {
-      nextRecord.slateData = slateData;
-    }
-  } else if (!existing?.slateData) {
-    nextRecord.slateData = textToSlate(content);
-  }
-  return nextRecord;
-}
-
-// packages/cli/docSkillHelpers.ts
-function normalizeSkillSeed(input) {
-  return input.trim().toLowerCase().replace(/[^a-z0-9\u4e00-\u9fa5]+/g, "-").replace(/^-+|-+$/g, "");
-}
-function deterministicId(prefix, seed) {
-  let h = 2166136261;
-  for (let i = 0; i < seed.length; i++) {
-    h ^= seed.charCodeAt(i);
-    h = h * 16777619 >>> 0;
-  }
-  const suffix = h.toString(36).toUpperCase().padStart(14, "0");
-  return (prefix + suffix).slice(0, 26);
-}
-function buildSkillDocId(input) {
-  return deterministicId("01SK", normalizeSkillSeed(input) || input);
-}
-function buildSkillPageKey(userId, skillId) {
-  return buildPageKey(userId, skillId);
-}
-function buildSkillPageRecord(args) {
-  const {
-    dbKey,
-    skillId,
-    title,
-    spaceId,
-    body,
-    skillConfig,
-    evalConfig,
-    workflowConfig,
-    existing
-  } = args;
-  return {
-    ...buildPageRecord({
-      dbKey,
-      pageId: skillId,
-      title,
-      spaceId,
-      content: buildSkillDocMarkdown({
-        body,
-        skillConfig,
-        evalConfig,
-        workflowConfig
-      }),
-      existing,
-      meta: {
-        ...existing?.meta ?? {},
-        kind: "skill",
-        skillConfig,
-        ...evalConfig ? { evalConfig } : {},
-        ...workflowConfig ? { workflowConfig } : {}
-      },
-      slateData: null
-    })
-  };
-}
-function parseJsonArg(raw, fallback) {
-  if (raw === void 0) return fallback;
-  return JSON.parse(raw);
-}
-
 // packages/cli/docSpaceHelpers.ts
 async function ensurePageAttachedToSpace(params) {
   const { baseUrl, userId, authToken, spaceId, contentKey, title, skillSummary } = params;
@@ -333,14 +208,6 @@ function buildSkillSummaryForRecord(record) {
 }
 
 export {
-  readBodyArg,
-  createPageId,
-  buildPageKey,
-  buildPageRecord,
-  buildSkillDocId,
-  buildSkillPageKey,
-  buildSkillPageRecord,
-  parseJsonArg,
   removePageFromSpace,
   hasHelpArg,
   hasFlag,

package/{chunk-V6VXDXGY.js → chunk-JS33TCQ3.js}

@@ -1,9 +1,9 @@
 import {
   selectCurrentServer
-} from "./chunk-S5UACFUP.js";
+} from "./chunk-TTGAVETO.js";
 import {
   patch
-} from "./chunk-A5V7UEZJ.js";
+} from "./chunk-SFXYKGK2.js";
 import {
   selectIdentityToken
 } from "./chunk-DVRHHFEA.js";

package/{chunk-YG3CCS7C.js → chunk-K53477EY.js}

@@ -2,7 +2,7 @@ import {
   buildLocalAgentLookupKeys,
   normalizeAgentHandle,
   shouldReadAgentKeyRemotely
-} from "./chunk-CDQ2ICPR.js";
+} from "./chunk-IOQ7IBPU.js";
 import {
   resolveCliAgentKeyInput
 } from "./chunk-VHBWHNVT.js";
@@ -13,9 +13,6 @@ import {
   readPipeText,
   spawnProcess
 } from "./chunk-IDZTNRP2.js";
-import {
-  createAgentKey
-} from "./chunk-O4BU24WZ.js";
 import {
   parseUserIdFromAuthToken,
   readOption,
@@ -23,6 +20,9 @@ import {
   resolveServerCandidates,
   resolveServerUrl
 } from "./chunk-A7GB5UGH.js";
+import {
+  createAgentKey
+} from "./chunk-O4BU24WZ.js";
 
 // packages/cli/agentRecordHelpers.ts
 import { readFileSync } from "node:fs";

package/{chunk-3WGLLTK4.js → chunk-LSFAWXKC.js}

@@ -1,6 +1,4 @@
-// packages/agent-runtime/thinkTagParser.ts
-var OPEN_TAG = "<think>";
-var CLOSE_TAG = "</think>";
+// packages/agent-runtime/tagPrefixMatch.ts
 function longestTagPrefixLength(buffer, tag) {
   const max = Math.min(buffer.length, tag.length - 1);
   for (let len = max; len > 0; len--) {
@@ -10,6 +8,10 @@ function longestTagPrefixLength(buffer, tag) {
   }
   return 0;
 }
+
+// packages/agent-runtime/thinkTagParser.ts
+var OPEN_TAG = "<think>";
+var CLOSE_TAG = "</think>";
 function extractThinkContent(content) {
   const regex = new RegExp(`${OPEN_TAG}([\\s\\S]*?)${CLOSE_TAG}`, "g");
   const matches = [...content.matchAll(regex)];
@@ -81,6 +83,98 @@ function flushThinkParser(state) {
   };
 }
 
+// packages/agent-runtime/toolCallTextParser.ts
+var OPEN_TAG2 = "<tool_call>";
+var CLOSE_TAG2 = "</tool_call>";
+function createToolCallTextParserState() {
+  return { mode: "content", buffer: "" };
+}
+function processToolCallTextChunk(chunk, state) {
+  let visible = "";
+  let toolCallTexts = [];
+  let { mode, buffer } = state;
+  buffer += chunk;
+  while (true) {
+    if (mode === "content") {
+      const idx = buffer.indexOf(OPEN_TAG2);
+      if (idx === -1) {
+        const keep = longestTagPrefixLength(buffer, OPEN_TAG2);
+        visible += buffer.slice(0, buffer.length - keep);
+        buffer = buffer.slice(buffer.length - keep);
+        break;
+      }
+      visible += buffer.slice(0, idx);
+      buffer = buffer.slice(idx + OPEN_TAG2.length);
+      mode = "toolcall";
+    } else {
+      const idx = buffer.indexOf(CLOSE_TAG2);
+      if (idx === -1) {
+        break;
+      }
+      toolCallTexts.push(buffer.slice(0, idx));
+      buffer = buffer.slice(idx + CLOSE_TAG2.length);
+      mode = "content";
+    }
+  }
+  return {
+    content: visible,
+    toolCallTexts,
+    state: { mode, buffer }
+  };
+}
+function flushToolCallTextParser(state) {
+  const { mode, buffer } = state;
+  if (mode === "toolcall") {
+    const keep = longestTagPrefixLength(buffer, CLOSE_TAG2);
+    const text = buffer.slice(0, buffer.length - keep);
+    return {
+      content: "",
+      toolCallTexts: text ? [text] : [],
+      state: { mode: "content", buffer: "" }
+    };
+  }
+  return {
+    content: buffer,
+    toolCallTexts: [],
+    state: { mode: "content", buffer: "" }
+  };
+}
+function tryParseToolCallText(text) {
+  const trimmed = text.trim();
+  if (!trimmed) return null;
+  try {
+    const parsed = JSON.parse(trimmed);
+    if (typeof parsed === "object" && parsed !== null && typeof parsed.name === "string") {
+      return {
+        name: parsed.name,
+        arguments: typeof parsed.arguments === "string" ? parsed.arguments : JSON.stringify(parsed.arguments ?? {})
+      };
+    }
+  } catch {
+  }
+  return null;
+}
+function processContentChunkWithToolCallStripping(chunk, state, onToolCall) {
+  const stripped = processToolCallTextChunk(chunk, state);
+  for (const text of stripped.toolCallTexts) {
+    const parsedTc = tryParseToolCallText(text);
+    if (parsedTc) {
+      onToolCall(parsedTc.name, parsedTc.arguments);
+    }
+  }
+  return { cleanedContent: stripped.content, state: stripped.state };
+}
+function flushToolCallTextParserIntoCallback(state, onToolCall) {
+  const flushed = flushToolCallTextParser(state);
+  for (const text of flushed.toolCallTexts) {
+    const parsedTc = tryParseToolCallText(text);
+    if (parsedTc) {
+      onToolCall(parsedTc.name, parsedTc.arguments);
+    }
+  }
+  return { residualContent: flushed.content, state: flushed.state };
+}
+
 // packages/agent-runtime/toolCallAccumulator.ts
 function createToolCallAccumulator() {
   return { slots: [] };
@@ -141,6 +235,9 @@ export {
   createThinkParserState,
   processThinkChunk,
   flushThinkParser,
+  createToolCallTextParserState,
+  processContentChunkWithToolCallStripping,
+  flushToolCallTextParserIntoCallback,
   createToolCallAccumulator,
   accumulateToolCallDelta,
   finalizeAccumulatedToolCalls

package/{chunk-BHK5ZAW7.js → chunk-N5424GSW.js}

@@ -1,7 +1,7 @@
 import {
   selectCurrentServer,
   selectRemoteServers
-} from "./chunk-S5UACFUP.js";
+} from "./chunk-TTGAVETO.js";
 import {
   createUserKey,
   extractAgentInfo,