@ykurilov/agent-chat-flows 0.66.0 → 0.68.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @ykurilov/agent-chat-flows
 
+## 0.68.0
+
+### Minor Changes
+
+- d7fc4e6: flow.reopen: брошенный разговор (`abandoned`) или законченный своей причиной приложения открывается заново в той же ноде с памятью; касания с первого шага, дни программы от исходного старта; событие onReopen; поле reopened_at (миграции SQLite и PostgreSQL).
+
+### Patch Changes
+
+- @ykurilov/agent-chat-core@0.68.0
+  - @ykurilov/agent-chat-react@0.68.0
+
+## 0.67.0
+
+### Minor Changes
+
+- 12c0dd8: Потолок «пишет первым» по дням программы: `schedule.firstMessages.maxPerDayByDay` (`[3, 2]` — день 1 три, со дня 2 по
+  два; главнее `maxPerDay`; ответ человека счёт не обнуляет). Свои касания ноды до N-го дня программы:
+  `nudges.untilProgramDay` (дошёл до ноды позже — сразу общий ряд). `checkFlow`: `nudges_until_day_invalid`,
+  `nudges_until_day_after_end`, `max_per_day_by_day_after_end`. Доска: поле «по дням программы» и режим «до дня программы»
+  (ru/en); `FlowStateTimingProps` + `nudgesUntilProgramDay`, `onNudgesUntilProgramDayChange`; выгружены `parseCapsByDay`,
+  `capsByDayText`.
+
+### Patch Changes
+
+- @ykurilov/agent-chat-core@0.67.0
+  - @ykurilov/agent-chat-react@0.67.0
+
 ## 0.66.0
 
 ### Patch Changes

package/agent-flow.schema.json

@@ -718,6 +718,9 @@
                   },
                   "days": {
                     "type": "number"
+                  },
+                  "untilProgramDay": {
+                    "type": "number"
                   }
                 },
                 "required": [
@@ -801,6 +804,15 @@
               "minimum": 0,
               "maximum": 9007199254740991
             },
+            "maxPerDayByDay": {
+              "minItems": 1,
+              "type": "array",
+              "items": {
+                "type": "integer",
+                "minimum": 0,
+                "maximum": 9007199254740991
+              }
+            },
             "morning": {
               "type": "boolean"
             },

package/dist/{chunk-7VR4YNTJ.js → chunk-2LAVG3YR.js}

@@ -80,6 +80,7 @@ var schedule = z.strictObject({
   farewellText: z.string().optional(),
   firstMessages: z.strictObject({
     maxPerDay: z.int().min(0).optional(),
+    maxPerDayByDay: z.array(z.int().min(0)).min(1).optional(),
     morning: z.boolean().optional(),
     skipMorningIfHumanWithinMin: z.int().min(0).optional()
   }).optional(),
@@ -108,7 +109,7 @@ var flowState = z.strictObject({
   tools: names,
   tags: names,
   exits,
-  nudges: z.union([nudges.extend({ days: z.number().optional() }), z.literal("off")]).optional()
+  nudges: z.union([nudges.extend({ days: z.number().optional(), untilProgramDay: z.number().optional() }), z.literal("off")]).optional()
 });
 var DEFAULT_SIDE_QUESTION_EVERY_MESSAGES = 5;
 var agentFlowSchema = z.strictObject({
@@ -578,10 +579,12 @@ function nudgeRings(flow, run, timeZone) {
   if (own === "off") return null;
   const common = flow.schedule?.nudges ?? flow.nudges ?? null;
   if (!own) return common && { ring: common };
-  if (own.days === void 0) return { ring: own };
+  if (own.days === void 0 && own.untilProgramDay === void 0) return { ring: own };
   const schedule2 = flow.schedule ?? CALENDAR_DAYS;
-  const entryDay = flowDay(run, run.enteredAt, timeZone, schedule2).day;
-  return { ring: own, until: programDayDue(run, entryDay + own.days, timeZone, schedule2), after: common };
+  const ends = [];
+  if (own.days !== void 0) ends.push(programDayDue(run, flowDay(run, run.enteredAt, timeZone, schedule2).day + own.days, timeZone, schedule2));
+  if (own.untilProgramDay !== void 0) ends.push(programDayDue(run, own.untilProgramDay + 1, timeZone, schedule2));
+  return { ring: own, until: Math.min(...ends), after: common };
 }
 var UNIT_MS2 = { min: 6e4, h: 36e5, d: 864e5 };
 var durationMs = (duration2) => duration2.amount * UNIT_MS2[duration2.unit];
@@ -589,7 +592,7 @@ var DEFAULT_SKIP_MORNING_MIN = 180;
 function nextNudge(flow, run, now, timeZone, context = {}) {
   const rings = nudgesRunning(flow, run, timeZone, context);
   if (!rings || run.lastAgentAt === null) return null;
-  const base = Math.max(run.lastAgentAt, context.pausedUntil ?? 0, context.undeliveredAt ?? 0);
+  const base = Math.max(run.lastAgentAt, context.pausedUntil ?? 0, context.undeliveredAt ?? 0, run.reopenedAt ?? 0);
   const step = run.nudgeStep ?? 0;
   let nudge = null;
   if (rings.until === void 0) nudge = ringNudge(rings.ring, base, step, timeZone);
@@ -623,14 +626,14 @@ function nudgesRunning(flow, run, timeZone, context) {
 function giveUpAt(flow, run, timeZone, context = {}) {
   const rings = nudgesRunning(flow, run, timeZone, context);
   const giveUpAfter = rings && (rings.ring.giveUpAfter ?? (rings.until !== void 0 ? rings.after?.giveUpAfter : void 0));
-  return giveUpAfter ? Math.max(run.lastHumanAt ?? run.startedAt, context.pausedUntil ?? 0) + durationMs(giveUpAfter) : null;
+  return giveUpAfter ? Math.max(run.lastHumanAt ?? run.startedAt, context.pausedUntil ?? 0, run.reopenedAt ?? 0) + durationMs(giveUpAfter) : null;
 }
 var morningOn = (schedule2) => schedule2.firstMessages?.morning ?? schedule2.lengthDays !== void 0;
 function nextMorning(flow, run, timeZone, context = {}) {
   const schedule2 = flow.schedule;
   if (!schedule2 || !morningOn(schedule2) || run.endedAt !== void 0) return null;
   const skipMs = (schedule2.firstMessages?.skipMorningIfHumanWithinMin ?? DEFAULT_SKIP_MORNING_MIN) * 6e4;
-  const since = Math.max(run.lastAgentAt ?? run.startedAt, context.undeliveredAt ?? 0);
+  const since = Math.max(run.lastAgentAt ?? run.startedAt, context.undeliveredAt ?? 0, run.reopenedAt ?? 0);
   let morning = flowDay(run, since, timeZone, schedule2).nextDayStartAt;
   for (let day = 0; day < 3; day += 1) {
     const humanJustWrote = run.lastHumanAt !== null && run.lastHumanAt < morning && morning - run.lastHumanAt < skipMs;
@@ -670,7 +673,7 @@ function timerDueAt(condition, run, timeZone, schedule2) {
     case "silence":
       if (run.lastAgentAt === null) return null;
       if (run.lastHumanAt !== null && run.lastHumanAt > run.lastAgentAt) return null;
-      return run.lastAgentAt + condition.amount * UNIT_MS3[condition.unit];
+      return Math.max(run.lastAgentAt, run.reopenedAt ?? 0) + condition.amount * UNIT_MS3[condition.unit];
     case "time_of_day": {
       const minutes = parseClock(condition.at);
       return minutes === null ? null : nextClockTime(actualEntry(run), minutes, timeZone);
@@ -905,6 +908,20 @@ function applyTransition(flow, run, transition) {
     enteredAfterAnswer: run.answerId
   };
 }
+function reopenRun(flow, run, at) {
+  const { endedAt: _endedAt, endReason: _endReason, nudgeStepOwn: _nudgeStepOwn, touch: _touch, ...live } = run;
+  const tags = stateById(flow, run.state)?.tags ?? [];
+  return {
+    ...live,
+    reopenedAt: at,
+    // Часы ноды — от открытия, как будто человек только что вошёл; дни программы — от исходного старта.
+    enteredAt: at,
+    nudgeStep: 0,
+    serverTurns: 0,
+    chain: 0,
+    path: appendPath(run.path, { state: run.state, at, tags, from: run.state, exitId: null, decidedBy: "reopen" })
+  };
+}
 function noteHumanMessage(run, now, dayKey, count = 1) {
   return {
     ...run,
@@ -1211,6 +1228,14 @@ function checkState(flow, catalog, issues, state) {
   if (days !== void 0 && (!Number.isInteger(days) || days < 1)) {
     issues.error("nudges_days_invalid", `${stateName(state)}: \u0441\u0432\u043E\u0438 \u043A\u0430\u0441\u0430\u043D\u0438\u044F \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044E\u0442 \u0446\u0435\u043B\u043E\u0435 \u0447\u0438\u0441\u043B\u043E \u0434\u043D\u0435\u0439, \u0441 1`, { stateId: state.id });
   }
+  const untilDay = state.nudges && state.nudges !== "off" ? state.nudges.untilProgramDay : void 0;
+  if (untilDay !== void 0 && (!Number.isInteger(untilDay) || untilDay < 1)) {
+    issues.error("nudges_until_day_invalid", `${stateName(state)}: \u0441\u0432\u043E\u0438 \u043A\u0430\u0441\u0430\u043D\u0438\u044F \xAB\u0434\u043E \u0434\u043D\u044F \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u044B\xBB \u2014 \u0446\u0435\u043B\u043E\u0435 \u0447\u0438\u0441\u043B\u043E \u0441 1`, { stateId: state.id });
+  } else if (untilDay !== void 0 && flow.schedule?.lengthDays !== void 0 && untilDay > flow.schedule.lengthDays) {
+    issues.warning("nudges_until_day_after_end", `${stateName(state)}: \u0441\u0432\u043E\u0438 \u043A\u0430\u0441\u0430\u043D\u0438\u044F \u0434\u043E \u0434\u043D\u044F ${untilDay}, \u0430 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0430 \u0434\u043B\u0438\u0442\u0441\u044F ${flow.schedule.lengthDays} \u0434\u043D. \u2014 \u043E\u043D\u0438 \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044E\u0442 \u0432\u0441\u044E \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0443`, {
+      stateId: state.id
+    });
+  }
 }
 var nudgesEmpty = (nudges2) => nudges2.afterSilence.length === 0 && !nudges2.dailyAt?.length;
 function checkSchedule(flow, issues) {
@@ -1230,6 +1255,13 @@ function checkSchedule(flow, issues) {
   if (frame?.softFrom !== void 0 && frame.hardAt !== void 0 && frame.softFrom >= frame.hardAt) {
     issues.error("day_frame_soft_after_hard", `\xAB\u0414\u043D\u0438 \u0438 \u0432\u0440\u0435\u043C\u044F\xBB: \u043C\u044F\u0433\u043A\u0430\u044F \u0440\u0430\u043C\u043A\u0430 (${frame.softFrom}) \u0434\u043E\u043B\u0436\u043D\u0430 \u0431\u044B\u0442\u044C \u0440\u0430\u043D\u044C\u0448\u0435 \u0436\u0451\u0441\u0442\u043A\u043E\u0439 (${frame.hardAt})`);
   }
+  const byDay = schedule2.firstMessages?.maxPerDayByDay;
+  if (byDay && schedule2.lengthDays !== void 0 && byDay.length > schedule2.lengthDays) {
+    issues.warning(
+      "max_per_day_by_day_after_end",
+      `\xAB\u0414\u043D\u0438 \u0438 \u0432\u0440\u0435\u043C\u044F\xBB: \u043F\u043E\u0442\u043E\u043B\u043E\u043A \u0437\u0430\u0434\u0430\u043D \u043D\u0430 ${byDay.length} \u0434\u043D., \u0430 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0430 \u0434\u043B\u0438\u0442\u0441\u044F ${schedule2.lengthDays} \u0434\u043D. \u2014 \u043B\u0438\u0448\u043D\u0438\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F \u043D\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044E\u0442`
+    );
+  }
   if (schedule2.nudges && nudgesEmpty(schedule2.nudges)) {
     issues.warning("empty_nudges", "\xAB\u0414\u043D\u0438 \u0438 \u0432\u0440\u0435\u043C\u044F\xBB: \u0432 \u043A\u0430\u0441\u0430\u043D\u0438\u044F\u0445 \u043D\u0435\u0442 \u043D\u0438 \u043E\u0434\u043D\u043E\u0433\u043E \u0441\u0440\u043E\u043A\u0430 \u2014 \u0430\u0433\u0435\u043D\u0442 \u043D\u0435 \u043D\u0430\u043F\u0438\u0448\u0435\u0442 \u043F\u0435\u0440\u0432\u044B\u043C");
   }
@@ -1373,6 +1405,7 @@ export {
   nextTransition,
   startRun,
   applyTransition,
+  reopenRun,
   noteHumanMessage,
   noteAgentAnswer,
   withoutUndeliveredTouch,
@@ -1393,4 +1426,4 @@ export {
   appIssues,
   checkFlow
 };
-//# sourceMappingURL=chunk-7VR4YNTJ.js.map
+//# sourceMappingURL=chunk-2LAVG3YR.js.map