nolo-cli 0.8.0-alpha.7 → 0.9.0

package/{chunk-GEKCOPTN.js → chunk-WKM6FH35.js}

@@ -2,7 +2,7 @@ import {
   deleteDbRecord,
   queryUserRecords,
   readDbRecord
-} from "./chunk-6PWWWMI7.js";
+} from "./chunk-7OOXPE3N.js";
 import {
   mergeAndDedupUserData
 } from "./chunk-KQHGZWSV.js";

package/{chunk-SL3EPWB4.js → chunk-XE635NI4.js}

@@ -1,12 +1,15 @@
+import {
+  clipHeadAndTail
+} from "./chunk-JEXVIMYZ.js";
 import {
   prepareTools
-} from "./chunk-2LMT6K6N.js";
+} from "./chunk-CPB2YM4D.js";
 import {
   getPublicImageAgentMode
 } from "./chunk-VIDPVFP3.js";
 import {
   performFetchRequest
-} from "./chunk-2JHWPW5B.js";
+} from "./chunk-SBR32ZZS.js";
 import {
   createSSEParser,
   createToolRunId,
@@ -17,7 +20,7 @@ import {
   toolRunSetPending,
   toolRunStarted,
   toolRunSucceeded
-} from "./chunk-UVPF33PW.js";
+} from "./chunk-MKMWT7SA.js";
 import {
   addToolMessage,
   getModelInfo,
@@ -25,22 +28,24 @@ import {
   messageStreaming,
   selectCurrentSpaceId,
   updateToolMessage
-} from "./chunk-KTI2WDDG.js";
+} from "./chunk-ZIG5LJ7X.js";
 import {
   streamAgentChatTurn
-} from "./chunk-543C7RDK.js";
+} from "./chunk-4K2KKCSD.js";
+import {
+  EMPTY_ASSISTANT_REPAIR_PROMPT
+} from "./chunk-XS466O7S.js";
 import {
-  EMPTY_ASSISTANT_REPAIR_PROMPT,
   createThinkParserState,
   flushThinkParser,
   processThinkChunk
-} from "./chunk-NE3E3XJ2.js";
+} from "./chunk-OPZYGHUC.js";
 import {
   getApiEndpoint
-} from "./chunk-572EKYLF.js";
+} from "./chunk-BBYVOSU2.js";
 import {
   isNoloHostedProvider
-} from "./chunk-BR2WP3DF.js";
+} from "./chunk-IWX4UW2E.js";
 import {
   extractCustomId
 } from "./chunk-DFFIZ25G.js";
@@ -54,15 +59,15 @@ import {
 } from "./chunk-HNMXYYJR.js";
 import {
   selectCurrentServer
-} from "./chunk-VEJLAVTC.js";
+} from "./chunk-TSS3XJY4.js";
 import {
   write
-} from "./chunk-G5H7RNFL.js";
+} from "./chunk-COMXDWNM.js";
 import {
   createDialogMessageKeyAndId,
   dialogMessageKey,
   toTrimmedString
-} from "./chunk-PN7AFLOK.js";
+} from "./chunk-SH2CFQOH.js";
 import {
   createAsyncThunk,
   selectIdentityToken
@@ -81,12 +86,6 @@ import {
 } from "./chunk-KUG52IAP.js";
 
 // packages/integrations/openai/filterAndCleanMessages.ts
-var TOOL_CONTEXT_MAX_CHARS = 4e3;
-var truncateText = (text, maxChars = TOOL_CONTEXT_MAX_CHARS) => {
-  if (text.length <= maxChars) return text;
-  return `${text.slice(0, maxChars)}
-\u2026[\u622A\u65AD\uFF0C\u539F\u59CB\u957F\u5EA6 ${text.length} \u5B57\u7B26]`;
-};
 var isValidMessagePart = (part) => {
   if (!part || typeof part !== "object") return false;
   if (part.type === "text") return typeof part.text === "string";
@@ -99,11 +98,11 @@ var isValidMessagePart = (part) => {
 var extractContent = (msg) => {
   if (msg.role === "tool") {
     const llmContext = asTrimmedString(msg.toolPayload?.llmContext);
-    if (llmContext) return truncateText(llmContext);
+    if (llmContext) return clipHeadAndTail(llmContext, { toolCallId: extractToolCallId(msg) ?? void 0 }).content;
     const summary = asTrimmedString(msg.toolPayload?.summary);
-    if (summary) return truncateText(summary);
-    if (typeof msg.content === "string") return truncateText(msg.content);
-    if (msg.content != null) return truncateText(JSON.stringify(msg.content));
+    if (summary) return clipHeadAndTail(summary, { toolCallId: extractToolCallId(msg) ?? void 0 }).content;
+    if (typeof msg.content === "string") return clipHeadAndTail(msg.content, { toolCallId: extractToolCallId(msg) ?? void 0 }).content;
+    if (msg.content != null) return clipHeadAndTail(JSON.stringify(msg.content), { toolCallId: extractToolCallId(msg) ?? void 0 }).content;
     return null;
   }
   if (typeof msg.content === "string") return msg.content;

package/{chunk-NE3E3XJ2.js → chunk-XS466O7S.js}

@@ -1,10 +1,18 @@
+import {
+  buildCurrentTimeBlock,
+  buildIdentityBlock,
+  buildRuntimeGuidanceBlocks
+} from "./chunk-PAKN26FP.js";
+import {
+  canonicalizeToolNames
+} from "./chunk-AUQ747NZ.js";
 import {
   clipCompactText
 } from "./chunk-5MMAK75Q.js";
 import {
   findModelConfig,
   getProviderByModelName
-} from "./chunk-572EKYLF.js";
+} from "./chunk-BBYVOSU2.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
@@ -368,8 +376,9 @@ async function runCompleteWithTimeout(args) {
       })
     );
   }
+  let result;
   try {
-    const result = racers.length === 0 ? await complete : await Promise.race([complete, ...racers]);
+    result = racers.length === 0 ? await complete : await Promise.race([complete, ...racers]);
     ok = true;
     return result;
   } catch (error) {
@@ -383,7 +392,26 @@ async function runCompleteWithTimeout(args) {
   } finally {
     if (timer) clearTimeout(timer);
     if (signal && abortListener) signal.removeEventListener("abort", abortListener);
-    emitLoopEvent(input, { kind: "llm-end", round, atMs: Date.now(), ok });
+    const usage = result?.usage;
+    const cacheHit = Number(usage?.cache_read_input_tokens ?? usage?.prompt_cache_hit_tokens ?? 0);
+    const cacheMiss = Number(usage?.cache_creation_input_tokens ?? usage?.prompt_cache_miss_tokens ?? 0);
+    const inputTokens = Number(usage?.input_tokens ?? usage?.prompt_tokens ?? 0);
+    const outputTokens = Number(usage?.output_tokens ?? usage?.completion_tokens ?? 0);
+    emitLoopEvent(input, {
+      kind: "llm-end",
+      round,
+      atMs: Date.now(),
+      ok,
+      ...inputTokens > 0 || cacheHit > 0 || cacheMiss > 0 ? {
+        cache: {
+          inputTokens,
+          outputTokens,
+          cacheHitTokens: cacheHit,
+          cacheMissTokens: cacheMiss,
+          hitRatio: inputTokens > 0 ? Math.round(cacheHit / inputTokens * 1e4) / 1e4 : 0
+        }
+      } : {}
+    });
   }
 }
 function clip2(value, max = 240) {
@@ -483,8 +511,8 @@ function buildActionGate(args) {
     toolCallId: args.toolCallId
   };
 }
-var MAX_HISTORICAL_TOOL_CONTENT_CHARS = 2400;
-var MAX_IN_TURN_TOOL_CONTENT_CHARS = 6e3;
+var MAX_HISTORICAL_TOOL_CONTENT_CHARS = 1600;
+var MAX_IN_TURN_TOOL_CONTENT_CHARS = 4e3;
 function summarizeToolContentForProvider(content, maxChars, label) {
   if (typeof content !== "string") return content;
   if (content.length <= maxChars) return content;
@@ -547,6 +575,21 @@ function filterImagePartsFromMessages(messages, supportsImages) {
   }));
 }
 function buildMessages(args) {
+  if (args.contextBlockScopes?.length) {
+    const blocks2 = args.contextBlockScopes.filter((b) => b.content.trim());
+    const stableParts = [args.prompt?.trim(), ...blocks2.filter((b) => b.cacheScope === "session").map((b) => b.content)].filter(Boolean);
+    const dynamicParts = blocks2.filter((b) => b.cacheScope === "turn").map((b) => b.content).filter(Boolean);
+    const stableContent = stableParts.join("\n\n");
+    const dynamicContent = dynamicParts.join("\n\n");
+    const systemContent2 = dynamicContent ? `${stableContent}
+
+${dynamicContent}` : stableContent;
+    return [
+      ...systemContent2 ? [{ role: "system", content: systemContent2 }] : [],
+      ...prepareHistoryForNextTurn(args.history),
+      { role: "user", content: args.input }
+    ];
+  }
   const blocks = (args.contextBlocks ?? []).map((block) => block.trim()).filter(Boolean);
   const systemContent = [args.prompt?.trim(), ...blocks].filter(Boolean).join("\n\n");
   return [
@@ -559,13 +602,21 @@ function mergeTurnUsage(current, next) {
   if (!next) return current;
   const read = (usage) => ({
     input: Number(usage.input_tokens ?? usage.prompt_tokens ?? 0),
-    output: Number(usage.output_tokens ?? usage.completion_tokens ?? 0)
+    output: Number(usage.output_tokens ?? usage.completion_tokens ?? 0),
+    cacheHit: Number(
+      usage.cache_read_input_tokens ?? usage.prompt_cache_hit_tokens ?? 0
+    ),
+    cacheMiss: Number(
+      usage.cache_creation_input_tokens ?? usage.prompt_cache_miss_tokens ?? 0
+    )
   });
   const right = read(next);
-  const left = current ? read(current) : { input: 0, output: 0 };
+  const left = current ? read(current) : { input: 0, output: 0, cacheHit: 0, cacheMiss: 0 };
   return {
     input_tokens: right.input || left.input,
-    output_tokens: left.output + right.output
+    output_tokens: left.output + right.output,
+    cache_read_input_tokens: left.cacheHit + right.cacheHit,
+    cache_creation_input_tokens: left.cacheMiss + right.cacheMiss
   };
 }
 function extractUserInputText(content) {
@@ -582,14 +633,39 @@ async function runLocalAgentTurn(input) {
     throw error;
   }
   const history = input.continueDialogId ? await input.adapter.loadDialogHistory(input.continueDialogId) : [];
+  const identityBlock = buildIdentityBlock({
+    agentName: agentConfig.name,
+    agentId: agentConfig.key,
+    model: agentConfig.model
+  });
+  const agentTools = canonicalizeToolNames(agentConfig.toolNames ?? []);
+  const guidanceBlocks = buildRuntimeGuidanceBlocks(agentTools);
+  const guidanceScopes = [
+    guidanceBlocks.startupProtocol,
+    guidanceBlocks.contextLayerContract,
+    guidanceBlocks.emailRegistrationWorkflow,
+    guidanceBlocks.webResearchToolPolicy
+  ].map((content) => content.trim()).filter((content) => content.length > 0).map((content) => ({ content, cacheScope: "session" }));
+  const currentTimeScope = [
+    { content: buildCurrentTimeBlock(/* @__PURE__ */ new Date(), void 0), cacheScope: "turn" }
+  ];
+  const mergedContextBlockScopes = [
+    { content: identityBlock, cacheScope: "session" },
+    ...guidanceScopes,
+    ...currentTimeScope,
+    ...input.contextBlockScopes ?? []
+  ];
   const hasContextBlocks = (input.contextBlocks ?? []).some(
     (block) => block.trim()
+  ) || mergedContextBlockScopes.some(
+    (block) => block.content.trim()
   );
   const promptMessageCount = agentConfig.prompt?.trim() || hasContextBlocks ? 1 : 0;
   const turnStartIndex = promptMessageCount + history.length;
   const messages = buildMessages({
     prompt: agentConfig.prompt,
     contextBlocks: input.contextBlocks,
+    contextBlockScopes: mergedContextBlockScopes,
     history,
     input: input.input
   });
@@ -610,8 +686,10 @@ async function runLocalAgentTurn(input) {
   let emptyAssistantRepairUsed = false;
   let imageDowngradeNotified = false;
   let skipFinalAppend = false;
+  let partialContent = "";
   try {
     while (true) {
+      partialContent = "";
       throwIfAborted(input);
       const baseRequestMessages = filterImagePartsFromMessages(
         prepareMessagesForProviderCall(messages),
@@ -632,7 +710,10 @@ async function runLocalAgentTurn(input) {
         messages: requestMessages,
         options: {
           ...typeof input.timeoutMs === "number" ? { timeoutMs: input.timeoutMs } : {},
-          ...input.onTextDelta ? { onTextDelta: input.onTextDelta } : {},
+          ...input.onTextDelta ? { onTextDelta: (chunk) => {
+            partialContent += chunk;
+            input.onTextDelta(chunk);
+          } } : {},
           ...input.onReasoningDelta ? { onReasoningDelta: input.onReasoningDelta } : {},
           ...input.onToolEvent ? { onToolEvent: input.onToolEvent } : {},
           ...input.onToolEvent ? { toolEventRound: round } : {}
@@ -779,11 +860,11 @@ async function runLocalAgentTurn(input) {
   if (loopError) {
     const errorMessage = toErrorMessage(loopError);
     const turnMessages2 = messages.slice(turnStartIndex);
-    await input.adapter.saveTurn({
+    const saved2 = await input.adapter.saveTurn({
       agentKey: agentConfig.key,
       messages: turnMessages2,
       result: {
-        content: `[nolo] Agent run failed: ${errorMessage}`,
+        content: partialContent || `[nolo] Agent run failed: ${errorMessage}`,
         model: agentConfig.model ?? "unknown",
         toolCallCount,
         error: true,
@@ -796,6 +877,9 @@ async function runLocalAgentTurn(input) {
       ...input.inheritedFromDialogKey ? { inheritedFromDialogKey: input.inheritedFromDialogKey } : {},
       ...input.parentDialogId ? { parentDialogId: input.parentDialogId } : {}
     });
+    if (saved2?.dialogId && typeof loopError === "object" && loopError !== null) {
+      loopError.dialogId = saved2.dialogId;
+    }
     throw loopError;
   }
   result = result;
@@ -836,89 +920,6 @@ async function runLocalAgentTurn(input) {
   };
 }
 
-// packages/agent-runtime/thinkTagParser.ts
-var OPEN_TAG = "<think>";
-var CLOSE_TAG = "</think>";
-function longestTagPrefixLength(buffer, tag) {
-  const max = Math.min(buffer.length, tag.length - 1);
-  for (let len = max; len > 0; len--) {
-    if (tag.startsWith(buffer.slice(-len))) {
-      return len;
-    }
-  }
-  return 0;
-}
-function extractThinkContent(content) {
-  const regex = new RegExp(`${OPEN_TAG}([\\s\\S]*?)${CLOSE_TAG}`, "g");
-  const matches = [...content.matchAll(regex)];
-  if (matches.length === 0) {
-    return { content };
-  }
-  const reasoning = matches.map((m) => m[1]).join("\n");
-  const cleaned = content.replace(regex, "");
-  return { content: cleaned.replace(/^\n/, ""), reasoning };
-}
-function createThinkParserState() {
-  return { mode: "content", buffer: "", trimNextVisible: false };
-}
-function processThinkChunk(chunk, state) {
-  let visible = "";
-  let reasoning = "";
-  let { mode, buffer, trimNextVisible } = state;
-  buffer += chunk;
-  while (true) {
-    if (mode === "content") {
-      const idx = buffer.indexOf(OPEN_TAG);
-      if (idx === -1) {
-        const keep = longestTagPrefixLength(buffer, OPEN_TAG);
-        visible += buffer.slice(0, buffer.length - keep);
-        buffer = buffer.slice(buffer.length - keep);
-        break;
-      }
-      visible += buffer.slice(0, idx);
-      buffer = buffer.slice(idx + OPEN_TAG.length);
-      mode = "reasoning";
-    } else {
-      const idx = buffer.indexOf(CLOSE_TAG);
-      if (idx === -1) {
-        const keep = longestTagPrefixLength(buffer, CLOSE_TAG);
-        reasoning += buffer.slice(0, buffer.length - keep);
-        buffer = buffer.slice(buffer.length - keep);
-        break;
-      }
-      reasoning += buffer.slice(0, idx);
-      buffer = buffer.slice(idx + CLOSE_TAG.length);
-      mode = "content";
-      trimNextVisible = true;
-    }
-  }
-  if (mode === "content" && visible.length > 0 && trimNextVisible) {
-    visible = visible.replace(/^\n/, "");
-    trimNextVisible = false;
-  }
-  return { content: visible, reasoning, state: { mode, buffer, trimNextVisible } };
-}
-function flushThinkParser(state) {
-  const { mode, buffer, trimNextVisible } = state;
-  if (mode === "reasoning") {
-    return {
-      content: "",
-      reasoning: buffer,
-      state: { mode: "content", buffer: "", trimNextVisible: false }
-    };
-  }
-  let visible = buffer;
-  const nextTrim = trimNextVisible;
-  if (nextTrim) {
-    visible = visible.replace(/^\n/, "");
-  }
-  return {
-    content: visible,
-    reasoning: "",
-    state: { mode: "content", buffer: "", trimNextVisible: false }
-  };
-}
-
 export {
   readCommandActionGatePayload,
   readActionGate,
@@ -928,9 +929,5 @@ export {
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   EMPTY_ASSISTANT_REPAIR_PROMPT,
   LOCAL_TURN_ABORTED_CODE,
-  runLocalAgentTurn,
-  extractThinkContent,
-  createThinkParserState,
-  processThinkChunk,
-  flushThinkParser
+  runLocalAgentTurn
 };