@ykurilov/agent-chat-flows 0.61.0 → 0.63.0

package/dist/index.js

@@ -14,7 +14,7 @@ import {
   sideTaskFieldKnown,
   sideTaskRecord,
   sideTaskStanding
-} from "./chunk-CKY5KG7N.js";
+} from "./chunk-H3AN5YUN.js";
 import {
   FACT_PREFIX,
   MAX_FACTS,
@@ -26,7 +26,7 @@ import {
   fieldValueText,
   isFactEntry,
   sameFact
-} from "./chunk-3PTJI2XY.js";
+} from "./chunk-KGWXTWBZ.js";
 import {
   AGENT_FLOW_FORMAT,
   AGENT_FLOW_FORMAT_VERSION,
@@ -105,7 +105,7 @@ import {
   withDayAnchor,
   withNudgeStep,
   withoutUndeliveredTouch
-} from "./chunk-BOV6FJGU.js";
+} from "./chunk-LT4QELAZ.js";
 import {
   appliedInTime,
   byVersionAndState,
@@ -841,6 +841,7 @@ var DEFAULT_JUDGE_THRESHOLD = 0.7;
 var DEFAULT_JUDGE_MODEL = "microsoft/microsoft-decision-1";
 var DEFAULT_JUDGE_TIMEOUT_MS = 5e3;
 var OPENROUTER_BASE_URL = "https://openrouter.ai/api/v1";
+var JOURNAL_CHARS = 300;
 var FALLBACK_INSTRUCTIONS = "\u0422\u044B \u0441\u0443\u0434\u044C\u044F \u0432 \u0434\u0438\u0430\u043B\u043E\u0433\u0435 \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0430 \u0441 \u0418\u0418-\u0430\u0433\u0435\u043D\u0442\u043E\u043C. \u0414\u043B\u044F \u043A\u0430\u0436\u0434\u043E\u0433\u043E \u0443\u0441\u043B\u043E\u0432\u0438\u044F \u0440\u0435\u0448\u0438, \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u043E \u043B\u0438 \u043E\u043D\u043E \u043F\u043E \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u043C \u0440\u0435\u043F\u043B\u0438\u043A\u0430\u043C. \u0412\u0435\u0440\u043D\u0438 \u0432 met \u043D\u043E\u043C\u0435\u0440\u0430 (id) \u0442\u043E\u043B\u044C\u043A\u043E \u0442\u0435\u0445 \u0443\u0441\u043B\u043E\u0432\u0438\u0439, \u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u044F\u0432\u043D\u043E \u0432\u044B\u043F\u043E\u043B\u043D\u0435\u043D\u044B. \u0421\u043E\u043C\u043D\u0435\u0432\u0430\u0435\u0448\u044C\u0441\u044F \u2014 \u043D\u0435 \u0432\u043A\u043B\u044E\u0447\u0430\u0439.";
 var FALLBACK_SCHEMA = {
   type: "object",
@@ -856,6 +857,34 @@ function createFlowJudge(settings, port, deps = {}) {
   const env = deps.env ?? process.env;
   const logError = deps.logError ?? (() => {
   });
+  const journal = settings.journal;
+  function writeJournal(question, context, verdicts) {
+    if (!deps.logJudge || journal === "off") return;
+    const confirmed = verdicts?.some((verdict) => verdict.confirmed) ?? false;
+    const withTexts = journal === "always" || question.testChat === true || journal === "transitions" && confirmed;
+    if (!withTexts && !confirmed) return;
+    const { goal, conversation, agent_words: agentWords } = context.state;
+    try {
+      deps.logJudge({
+        ownerId: question.ownerId,
+        chatId: question.chatId,
+        kind: question.kind,
+        model,
+        threshold,
+        source: verdicts?.[0]?.source ?? null,
+        ...goal !== void 0 && { goal: clip2(goal) },
+        ...withTexts && agentWords !== void 0 && { agentWords: clip2(agentWords) },
+        ...withTexts && { conversation: conversation.map(({ role, text }) => ({ role, text: clip2(text) })) },
+        replies: conversation.map(({ role, text }) => ({ role, length: text.length })),
+        conditions: context.conditions.map(({ exitId, text }) => {
+          const verdict = verdicts?.find((item) => item.exitId === exitId);
+          return { exitId, text: clip2(text), probability: verdict?.probability ?? null, confirmed: verdict?.confirmed ?? false };
+        })
+      });
+    } catch (error) {
+      logError(`\u0421\u0443\u0434\u044C\u044F: \u0436\u0443\u0440\u043D\u0430\u043B \u043D\u0435 \u0437\u0430\u043F\u0438\u0441\u0430\u043D \u2014 ${errorText2(error)}`);
+    }
+  }
   async function askDecision(question, conditions, state) {
     const apiKey = settings.openrouter?.apiKey ?? env.OPENROUTER_API_KEY;
     if (!apiKey) {
@@ -925,6 +954,11 @@ function createFlowJudge(settings, port, deps = {}) {
       logError(`\u0421\u0443\u0434\u044C\u044F \u043D\u0435 \u0441\u043F\u0440\u043E\u0448\u0435\u043D: ${errorText2(error)}`);
       return null;
     }
+    const verdicts = await ask(question, context);
+    writeJournal(question, context, verdicts);
+    return verdicts;
+  }
+  async function ask(question, context) {
     const answers = await askDecision(question, context.conditions, context.state);
     if (answers) {
       return context.conditions.map(({ exitId }) => ({ exitId, probability: answers[exitId], confirmed: answers[exitId] >= threshold, source: "decision" }));
@@ -935,25 +969,37 @@ function createFlowJudge(settings, port, deps = {}) {
     return context.conditions.map(({ exitId }) => ({ exitId, probability: met.has(exitId) ? 1 : 0, confirmed: met.has(exitId), source: "fallback" }));
   }
   return {
-    async checkClaim({ ownerId, chatId, exitId, condition, goal, why, messages, signal }) {
+    async checkClaim({ ownerId, chatId, exitId, condition, goal, why, messages, signal, testChat }) {
       const verdicts = await judge({
+        kind: "claim",
         ownerId,
         chatId,
         ...goal !== void 0 && { goal },
         ...why !== void 0 && { why },
         messages,
         conditions: [{ exitId, text: condition }],
-        ...signal && { signal }
+        ...signal && { signal },
+        ...testChat && { testChat }
       });
       return verdicts?.[0] ?? null;
     },
-    async checkAll({ ownerId, chatId, goal, conditions, messages, signal }) {
+    async checkAll({ ownerId, chatId, goal, conditions, messages, signal, testChat }) {
       if (conditions.length === 0) return [];
-      const verdicts = await judge({ ownerId, chatId, ...goal !== void 0 && { goal }, messages, conditions, ...signal && { signal } });
+      const verdicts = await judge({
+        kind: "after_turn",
+        ownerId,
+        chatId,
+        ...goal !== void 0 && { goal },
+        messages,
+        conditions,
+        ...signal && { signal },
+        ...testChat && { testChat }
+      });
       return verdicts?.filter((verdict) => verdict.confirmed) ?? [];
     }
   };
 }
+var clip2 = (text) => text.length <= JOURNAL_CHARS ? text : `${text.slice(0, JOURNAL_CHARS - 1)}\u2026`;
 function errorText2(error) {
   return error instanceof Error ? error.message : String(error);
 }
@@ -2081,7 +2127,8 @@ function flowExitTool(input, model) {
           goal: stateGoal(state.instructions),
           why,
           messages: await input.history(model.ownerId, model.chatId),
-          ...abortSignal && { signal: abortSignal }
+          ...abortSignal && { signal: abortSignal },
+          ...turn.run.timeOffset !== void 0 && { testChat: true }
         });
       } catch (error) {
         runtime.logError(`[\u0441\u0446\u0435\u043D\u0430\u0440\u0438\u0439] \u0447\u0430\u0442=${model.chatId} \u0441\u0443\u0434\u044C\u044F \u0443\u043F\u0430\u043B: ${error instanceof Error ? error.message : String(error)}`);
@@ -2337,6 +2384,12 @@ function judgeMessages(messages) {
     return text ? [{ role: message.role === "user" ? "human" : "agent", text }] : [];
   });
 }
+function turnWindow(messages, run, answer) {
+  const answerAt = messages.findIndex((message) => message.id === answer.id);
+  const upToAnswer = answerAt >= 0 ? messages.slice(0, answerAt + 1) : [...messages, { role: "assistant", parts: answer.parts }];
+  const enteredAt = run.enteredAfterAnswer === void 0 ? -1 : upToAnswer.findIndex((message) => message.id === run.enteredAfterAnswer);
+  return enteredAt >= 0 ? upToAnswer.slice(enteredAt) : upToAnswer;
+}
 function buildAgentFlow(options, modules = {}) {
   const { store } = options;
   const clock = options.now ?? (() => /* @__PURE__ */ new Date());
@@ -2394,7 +2447,8 @@ function buildAgentFlow(options, modules = {}) {
       }
     });
   }
-  const judge = lazy(() => modules.judge ?? createFlowJudge(options.judge, portOf, { logError }));
+  const logJudge = options.logJudge ?? ((entry) => console.info(`[\u0441\u0446\u0435\u043D\u0430\u0440\u0438\u0439] \u0441\u0443\u0434\u044C\u044F: ${JSON.stringify(entry)}`));
+  const judge = lazy(() => modules.judge ?? createFlowJudge(options.judge, portOf, { logError, logJudge }));
   const firstMessages = lazy(() => modules.firstMessages !== void 0 ? modules.firstMessages : createFirstMessageRules(options.firstMessages, store));
   let lastAppTimeZone;
   const portZones = /* @__PURE__ */ new WeakMap();
@@ -2659,9 +2713,9 @@ function buildAgentFlow(options, modules = {}) {
       onUndelivered: rescheduleUndelivered
     })
   );
-  async function history(ownerId, chatId) {
+  async function history(ownerId, chatId, turn) {
     const { messages } = await (await portOf({ ownerId, chatId })).peekHistory(ownerId, chatId);
-    return judgeMessages(messages).slice(-JUDGE_HISTORY);
+    return judgeMessages(turn ? turnWindow(messages, turn.run, turn.answer) : messages).slice(-JUDGE_HISTORY);
   }
   async function reschedule(ownerId, chatId, run, branchHead, failedAt) {
     try {
@@ -2725,7 +2779,15 @@ function buildAgentFlow(options, modules = {}) {
     if (!state || isFinal(state)) return;
     const conditions = judgeExits(pinned.flow, run.state);
     if (conditions.length === 0) return;
-    const verdicts = await judge().checkAll({ ownerId, chatId, goal: stateGoal(state.instructions), conditions, messages: await history(ownerId, chatId) });
+    const verdicts = await judge().checkAll({
+      ownerId,
+      chatId,
+      goal: stateGoal(state.instructions),
+      conditions,
+      messages: await history(ownerId, chatId, { run, answer: { id: messageId, parts: result.parts } }),
+      // Сдвиг часов есть только у тестового чата редактора.
+      ...run.timeOffset !== void 0 && { testChat: true }
+    });
     const met = conditions.map(({ exitId }) => verdicts.find((verdict) => verdict.exitId === exitId && verdict.confirmed)).find(Boolean);
     if (!met) return;
     const transition = nextTransition(pinned.flow, run, { type: "verdict", exitId: met.exitId, probability: met.probability, decidedBy: "judge" }, chatTime(run, now()));