@ykurilov/agent-chat-core 0.80.0 → 0.80.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @ykurilov/agent-chat-core
 
+## 0.80.1
+
+### Patch Changes
+
+- d59ae4e: После сжатия истории в режиме `contextBlocksRefresh: "history-start"` полный свежий снимок приложения размещается рядом со сводкой. Старые снимки оставленного хвоста больше не возвращают устаревшие данные; последующие изменения идут от свежей базы. Ошибка источника сохраняет прежний fallback, успешный пустой снимок тоже учитывается. Дата, память, место и notices не переносятся; сохранённые ответы не переписываются.
+  
+  Запрос сжатия использует тот же сборщик frozen context, что и обычный ход, с исключением личных app-блоков, памяти, даты и места из сохраняемой сводки. Задание пересказа уточняет границу сжимаемой части. Настройки рассуждений провайдера не меняются. Обновить все пакеты одной версией; SQL-миграций и новых настроек нет.
+
 ## 0.80.0
 
 ### Minor Changes

package/dist/{chunk-Z44ZAFZC.js → chunk-PORXDIWX.js}

@@ -4656,6 +4656,11 @@ function withStaffRepliesJoined(history) {
   return changed ? joined : history;
 }
 
+// src/compaction/summary-part.ts
+var SUMMARY = /* @__PURE__ */ Symbol("compaction-summary");
+var summaryPart = (text) => ({ type: "text", text, [SUMMARY]: true });
+var isSummaryPart = (part) => part[SUMMARY] === true;
+
 // src/frozen-context/frozen-context-messages.ts
 function frozenContextBase(history) {
   for (let index = history.length - 1; index >= 0; index -= 1) {
@@ -4670,6 +4675,11 @@ var RESUME_NOTE_ID = "frozen-context-note-";
 function withFrozenContext(history, options2) {
   const { current, group } = options2;
   const dataOf = (message) => message.role !== "assistant" ? void 0 : current && message.id === current.answerId ? current.data : frozenContextOf(message.parts);
+  const root = history[0];
+  const anchorHistory = options2.anchorHistory && options2.anchorHistory[0]?.id === root?.id ? options2.anchorHistory : history;
+  const allowed = options2.includeKey ?? (() => true);
+  const anchor = root?.parts.some(isSummaryPart) ? anchorHistory.flatMap((message) => message.role === "assistant" ? [dataOf(message), ...message.parts.filter((p) => p.type === FROZEN_CONTEXT_PART_TYPE).slice(1).map((p) => p.data)] : []).concat(current?.data).find((data) => data?.appContextFrom === root.id) : void 0;
+  let anchored = false;
   const seen = /* @__PURE__ */ new Map();
   const output = [];
   const place = (texts) => {
@@ -4679,22 +4689,28 @@ function withFrozenContext(history, options2) {
     if (last?.role === "user") output[output.length - 1] = { ...last, parts: [...last.parts, ...parts] };
     else output.push({ id: `frozen-context-${output.length}`, role: "user", parts: output.length === 0 ? [{ type: "text", text: GREETING_LEAD }, ...parts] : parts });
   };
-  const textsOf = (data) => blockTexts(data, data.base === null ? void 0 : seen.get(data.base), group);
+  const textsOf = (data, base) => {
+    const include = (key) => allowed(key) && (!anchor || anchored || isReservedKey(key));
+    const texts = blockTexts(data, base, group, anchor || options2.includeKey ? include : void 0);
+    if (data === anchor) anchored = true;
+    return texts;
+  };
   let currentPlaced = false;
   for (const message of history) {
     const data = dataOf(message);
     if (data) {
-      place(textsOf(data));
+      place(textsOf(data, data.base === null ? void 0 : seen.get(data.base)));
       seen.set(message.id, data);
       if (message.id === current?.answerId) currentPlaced = true;
     }
-    output.push(...withResumeNotes(message, (note) => {
-      const texts = blockTexts(note, seen.get(message.id), group);
+    const placed = anchor && message === root ? { ...message, parts: message.parts.flatMap((part) => isSummaryPart(part) ? [part, ...anchor.blocks.filter((block) => !isReservedKey(block.key) && allowed(block.key) && !(group && block.private)).map((block) => ({ type: "text", text: block.text }))] : [part]) } : message;
+    output.push(...withResumeNotes(placed, (note) => {
+      const texts = textsOf(note, seen.get(message.id));
       seen.set(message.id, note);
       return texts;
     }));
   }
-  if (current && !currentPlaced) place(textsOf(current.data));
+  if (current && !currentPlaced) place(textsOf(current.data, current.data.base === null ? void 0 : seen.get(current.data.base)));
   return output;
 }
 function withResumeNotes(message, textsOf) {
@@ -4724,11 +4740,11 @@ function holdNoteAfterApprovals(messages) {
   return { messages: messages.slice(0, -1), note };
 }
 var awaitsApprovedRun = (part) => part.state === "approval-responded";
-function blockTexts(data, base, group) {
-  return [...changedBlockTexts(data, base, group), ...(data.notices ?? []).map(noticeText)];
+function blockTexts(data, base, group, include) {
+  return [...changedBlockTexts(data, base, group, include), ...(data.notices ?? []).map(noticeText)];
 }
-function changedBlockTexts(data, base, group) {
-  const shown = (block) => !(group && block.private);
+function changedBlockTexts(data, base, group, include) {
+  const shown = (block) => (!include || include(block.key)) && !(group && block.private);
   if (data.sent === "all" || !base) return data.blocks.filter(shown).map((block) => block.text);
   const now = new Map(data.blocks.map((block) => [block.key, block]));
   const before = new Map(base.blocks.map((block) => [block.key, block]));
@@ -4736,7 +4752,7 @@ function changedBlockTexts(data, base, group) {
     const block = now.get(key);
     return block && shown(block) ? [block.text] : [];
   });
-  const visibleKeys = (keys) => keys.filter((key) => !(group && (before.get(key)?.private ?? isMemoryKey(key))));
+  const visibleKeys = (keys) => keys.filter((key) => (!include || include(key)) && !(group && (before.get(key)?.private ?? isMemoryKey(key))));
   const removed = visibleKeys(data.sent.removed);
   if (removed.length > 0) texts.push(noLongerValid(removed));
   const hidden = visibleKeys(data.sent.hidden ?? []);
@@ -5106,7 +5122,10 @@ async function buildModelRequest(input) {
   const cleaned = sendableHistory(input.serviceBlocks ? withoutForgedBlocks(untitled, input.serviceBlocks) : untitled);
   const sendable = input.switchableTools ? withSwitchedOffCallsAsText(cleaned, input.switchableTools, tools) : cleaned;
   const noted = withStaffRepliesJoined(withChannelNotes(withModeNotes(withBurstsJoined(withCorrectionsJoined(sendable)), input.modeNotes)));
-  const held = input.frozenContext ? holdNoteAfterApprovals(withFrozenContext(noted, input.frozenContext)) : { messages: noted };
+  const held = input.frozenContext ? holdNoteAfterApprovals(withFrozenContext(noted, {
+    ...input.frozenContext,
+    ...input.frozenContext.anchorHistory && { anchorHistory: sendableHistory(input.frozenContext.anchorHistory) }
+  })) : { messages: noted };
   const history = selectReasoningForModel(held.messages, {
     modelId: profile.id,
     providerId: provider.id,
@@ -11577,7 +11596,7 @@ function tokens(count) {
 }
 function compactionTask(input) {
   if (input.instruction !== void 0) return input.instruction;
-  return `\u0421\u0434\u0435\u043B\u0430\u0439 \u0441\u0432\u043E\u0434\u043A\u0443 \u0432\u0441\u0435\u0439 \u043F\u0435\u0440\u0435\u043F\u0438\u0441\u043A\u0438 \u0432\u044B\u0448\u0435, \u0447\u0442\u043E\u0431\u044B \u043C\u043E\u0436\u043D\u043E \u0431\u044B\u043B\u043E \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C \u0440\u0430\u0431\u043E\u0442\u0443 \u0431\u0435\u0437 \u0441\u0442\u0430\u0440\u044B\u0445 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0439.
+  return `\u0421\u0434\u0435\u043B\u0430\u0439 \u0441\u0432\u043E\u0434\u043A\u0443 \u0441\u0436\u0438\u043C\u0430\u0435\u043C\u043E\u0439 \u0447\u0430\u0441\u0442\u0438 \u043F\u0435\u0440\u0435\u043F\u0438\u0441\u043A\u0438 \u0432\u044B\u0448\u0435. \u041E\u043D\u0430 \u0437\u0430\u043A\u0430\u043D\u0447\u0438\u0432\u0430\u0435\u0442\u0441\u044F \u043D\u0430 \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0435\u043C \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u0438 \u043F\u0435\u0440\u0435\u0434 \u044D\u0442\u0438\u043C \u0437\u0430\u0434\u0430\u043D\u0438\u0435\u043C; \u0431\u043E\u043B\u0435\u0435 \u043F\u043E\u0437\u0434\u043D\u044F\u044F \u043F\u0435\u0440\u0435\u043F\u0438\u0441\u043A\u0430 \u043E\u0441\u0442\u0430\u043D\u0435\u0442\u0441\u044F \u0432 \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0435 \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u043E. \u041F\u0435\u0440\u0435\u0441\u043A\u0430\u0437 \u0434\u043E\u043B\u0436\u0435\u043D \u043E\u0442\u0440\u0430\u0436\u0430\u0442\u044C \u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0435 \u043D\u0430 \u044D\u0442\u043E\u0439 \u0433\u0440\u0430\u043D\u0438\u0446\u0435, \u0447\u0442\u043E\u0431\u044B \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C \u0440\u0430\u0437\u0433\u043E\u0432\u043E\u0440 \u0432\u043C\u0435\u0441\u0442\u0435 \u0441 \u043E\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u043D\u044B\u043C \u0445\u0432\u043E\u0441\u0442\u043E\u043C, \u0431\u0435\u0437 \u043F\u043E\u0432\u0442\u043E\u0440\u0435\u043D\u0438\u044F \u0443\u0436\u0435 \u0441\u0434\u0435\u043B\u0430\u043D\u043D\u043E\u0433\u043E \u0432 \u043D\u0451\u043C.
 
 \u0415\u0441\u043B\u0438 \u0432 \u043D\u0430\u0447\u0430\u043B\u0435 \u043F\u0435\u0440\u0435\u043F\u0438\u0441\u043A\u0438 \u0443\u0436\u0435 \u0435\u0441\u0442\u044C \u0441\u0432\u043E\u0434\u043A\u0430, \u043D\u0435 \u0434\u043E\u043F\u0438\u0441\u044B\u0432\u0430\u0439 \u043A \u043D\u0435\u0439, \u0430 \u043F\u0435\u0440\u0435\u043F\u0438\u0448\u0438 \u0435\u0451 \u0446\u0435\u043B\u0438\u043A\u043E\u043C \u0432\u043C\u0435\u0441\u0442\u0435 \u0441 \u043D\u043E\u0432\u044B\u043C\u0438 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F\u043C\u0438: \u043F\u043E\u043B\u0443\u0447\u0438\u0442\u0441\u044F \u043E\u0434\u043D\u0430 \u0441\u0432\u043E\u0434\u043A\u0430.
 
@@ -11608,10 +11627,10 @@ ${summary}
 function applyCompaction(branch, active) {
   if (!active) return branch.map(toAgentChatMessage);
   const tail = branch.slice(active.throughIndex + 1).map(toAgentChatMessage);
-  const summaryPart = { type: "text", text: summaryFrame(active.record.summary) };
+  const summary = summaryPart(summaryFrame(active.record.summary));
   const [first, ...rest] = tail;
-  if (first?.role === "user") return [{ ...first, parts: [summaryPart, ...first.parts] }, ...rest];
-  return [{ id: `${active.record.id}-summary`, role: "user", parts: [summaryPart] }, ...tail];
+  if (first?.role === "user") return [{ ...first, parts: [summary, ...first.parts] }, ...rest];
+  return [{ id: `${active.record.id}-summary`, role: "user", parts: [summary] }, ...tail];
 }
 
 // src/compaction/run-compaction.ts
@@ -11643,6 +11662,13 @@ async function runCompaction(input) {
     const request = await buildModelRequest({
       ...requestInput,
       ...input.model,
+      // Общая сводка не несёт privacy-схему: только публичные app blocks, без памяти/даты/места.
+      // Пересказ шагов остаётся на прежнем пути без frozen blocks; никакого нового private opt-in.
+      ...!input.transient && { frozenContext: {
+        group: true,
+        includeKey: (key) => !isReservedKey(key),
+        ...input.contextHistory && { anchorHistory: input.contextHistory }
+      } },
       // Бюджет рассуждений — от предела сводки, а не от потолка модели: иначе он больше предела.
       maxOutputTokens,
       ...lowestLevel && { reasoning: lowestLevel },
@@ -11653,7 +11679,7 @@ async function runCompaction(input) {
       role: "user",
       content: input.task ?? compactionTask({ summaryCeilingTokens: settings.summaryCeilingTokens, instruction: settings.instruction })
     };
-    let base = [...request.messages, task];
+    let base = [...request.messages, ...request.noteAfterApprovals ?? [], task];
     let messages = base;
     let summary = "";
     let summaryTokens = 0;
@@ -11788,7 +11814,8 @@ function createCompactionService(options2) {
       }
       overflow?.onStart();
       model = settings.model ?? model;
-      const history = applyCompaction(branch.slice(0, plan.throughIndex + 1), activeCompaction(branch, compactions));
+      const active = activeCompaction(branch, compactions);
+      const history = applyCompaction(branch.slice(0, plan.throughIndex + 1), active);
       const chat = await storage.getChat(chatId);
       const ownerId = chat?.ownerId ?? "";
       const result = await runCompaction({
@@ -11801,6 +11828,7 @@ function createCompactionService(options2) {
         ...options2.switchableTools && { switchableTools: options2.switchableTools },
         ...observation(ownerId, answerId),
         history,
+        contextHistory: applyCompaction(branch, active),
         ...options2.attachments && { attachments: options2.attachments },
         ...options2.serviceBlocks && { serviceBlocks: options2.serviceBlocks },
         settings,
@@ -11945,6 +11973,7 @@ function createCompactionService(options2) {
           ...options2.switchableTools && { switchableTools: options2.switchableTools },
           ...observation(ownerId, answerId),
           history: [...history, { id: `${chatId}-answer-steps`, role: "assistant", parts: steps }],
+          transient: true,
           ...options2.attachments && { attachments: options2.attachments },
           ...options2.serviceBlocks && { serviceBlocks: options2.serviceBlocks },
           settings,
@@ -15323,4 +15352,4 @@ export {
   InvalidWidgetAnswerError,
   createChatService
 };
-//# sourceMappingURL=chunk-Z44ZAFZC.js.map
+//# sourceMappingURL=chunk-PORXDIWX.js.map