@ykurilov/agent-chat-react 0.80.1 → 0.81.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @ykurilov/agent-chat-react
 
+## 0.81.0
+
+### Patch Changes
+
+- 038b6e2: Исправления аудита клиентской зоны. `useAgentChat` без `key` при смене чата больше не переносит в новый чат дела прежнего: «Стоп», ответ на подтверждение или виджет, передачу поправок и сорвавшуюся голосовую замену; новый чат не остаётся «занятым», повторное открытие того же чата начинается с чистого состояния. Песочница не зовёт хуки приложения, которые пишут данные (`onStateChanged`, `onTurnFinished`, `onModelChosen`), ни в песочном чате, ни в копии чата человека; `newChatGreeting` и `modelMenu` решаются для настоящего админа. Вложения: удаление человеком и чистка брошенных больше не убирают файл, который отправляемое сообщение уже отметило; `confirmUserParts` отказывает `AttachmentRejectedError` (`attachment_not_found` — файла нет или отметка не записана, `attachment_unavailable` — сбой хранилища), а не отмечает молча.
+  
+  ### Как обновить приложение
+  
+  Обновите пакеты SDK одной версией. Со встроенными хранилищами вложений (`createDiskAttachmentStorage`, `createMemoryAttachmentStorage`) ничего менять не нужно. Своё хранилище (`AttachmentStorage`, например S3) должно получить метод `removeUnattached(id): Promise<boolean>` — удалить файл, только если он не прикреплён, атомарно с `markAttached` того же файла; `removeUnattachedOlderThan` должен следовать тому же правилу. Без метода `createAttachments` бросает ошибку при запуске. Проверьте хранилище обновлённым `describeAttachmentStorageContract`. Если песочница полагалась на `onStateChanged`, `onTurnFinished` или `onModelChosen` в песочных чатах — в песочнице они больше не зовутся. [Подробности](https://github.com/ykurilov/agent-chat-sdk/blob/main/docs/audit-client.md).
+
 ## 0.80.1
 
 No changes in this release.

package/dist/{chunk-LF723Y52.js → chunk-PZZBB4Y6.js}

@@ -1878,6 +1878,11 @@ function approvalOf(progress, controls) {
 // src/widgets/use-widget-answer.ts
 import { useCallback as useCallback2, useRef as useRef2, useState } from "react";
 
+// src/chat-lifetime.ts
+function ownedBy(owned, lifetime) {
+  return owned !== null && owned.lifetime === lifetime && !lifetime.aborted ? owned.value : void 0;
+}
+
 // src/widgets/widget-answer-keys.ts
 var CHOSEN_KEY = "\u0432\u044B\u0431\u0440\u0430\u043D\u043E";
 var RATING_KEY = "\u043E\u0446\u0435\u043D\u043A\u0430";
@@ -1943,14 +1948,15 @@ function hasPendingApproval(messages) {
 function useWidgetAnswer(deps) {
   const depsRef = useRef2(deps);
   depsRef.current = deps;
-  const answering = useRef2(false);
+  const answering = useRef2(null);
   const [widgetPendingId, setWidgetPendingId] = useState(null);
   const [widgetFailure, setWidgetFailure] = useState(null);
   const answerWidget = useCallback2(async (toolCallId, answer, onAccepted) => {
-    if (answering.current) return false;
-    answering.current = true;
     const current = depsRef.current;
     const signal = current.chatSignal();
+    if (ownedBy(answering.current, signal) !== void 0) return false;
+    const pending = { lifetime: signal, value: toolCallId };
+    answering.current = pending;
     const fail = (kind, text) => {
       if (!signal.aborted) setWidgetFailure({ id: toolCallId, kind, ...text !== void 0 && { text } });
       return false;
@@ -1970,6 +1976,7 @@ function useWidgetAnswer(deps) {
         return fail("connection");
       }
       const refusedByApp = response.ok ? null : await serverRefusalOf(response);
+      if (signal.aborted) return false;
       if (refusedByApp?.kind) {
         current.announceAppRefusal(refusedByApp);
         return fail("refused", refusedByApp.text);
@@ -1993,8 +2000,9 @@ function useWidgetAnswer(deps) {
       }
       if (!response.ok) return fail("connection");
       const resumed = await resumedOf(response);
+      if (signal.aborted) return true;
       current.setMessages((messages) => withWidgetAnswer(messages, toolCallId, answer, resumed));
-      if (!signal.aborted) onAccepted?.();
+      onAccepted?.();
       if (!resumed) {
         current.expectLiveEventsOf(toolCallId);
         if (!signal.aborted) await current.rereadHistory(signal);
@@ -2010,12 +2018,16 @@ function useWidgetAnswer(deps) {
       }
       return true;
     } finally {
-      answering.current = false;
+      if (answering.current === pending) answering.current = null;
       if (!signal.aborted) setWidgetPendingId(null);
     }
   }, []);
-  const answeringWidget = useCallback2(() => answering.current, []);
-  return { answerWidget, widgetPendingId, widgetFailure, answeringWidget };
+  const answeringWidget = useCallback2(() => ownedBy(answering.current, depsRef.current.chatSignal()) !== void 0, []);
+  const forgetChat = useCallback2(() => {
+    setWidgetPendingId(null);
+    setWidgetFailure(null);
+  }, []);
+  return { answerWidget, widgetPendingId, widgetFailure, answeringWidget, forgetChat };
 }
 async function resumedOf(response) {
   try {
@@ -2447,7 +2459,7 @@ function useAgentChat({
   const correctionsRef = useRef5(corrections);
   correctionsRef.current = corrections;
   const sendingCorrections = useRef5(/* @__PURE__ */ new Set());
-  const steerQueue = useRef5(Promise.resolve());
+  const steerQueue = useRef5(null);
   const unconfirmedCorrection = useRef5(null);
   const [handingOff, setHandingOff] = useState3(false);
   const handOff = useRef5(null);
@@ -3039,7 +3051,7 @@ function useAgentChat({
   }, [chatId]);
   const [approvalPendingId, setApprovalPendingId] = useState3(null);
   const [approvalFailure, setApprovalFailure] = useState3(null);
-  const approving = useRef5(false);
+  const approving = useRef5(null);
   const historyReads = useRef5({ started: 0, shown: 0 });
   const refreshFromServer = useCallback4(
     async (signal, options = {}) => {
@@ -3103,9 +3115,13 @@ function useAgentChat({
   useEffect3(() => setDetachedSince(null), [chatId]);
   const respondToApproval = useCallback4(
     async (approvalId, decision) => {
-      if (approving.current) return;
-      approving.current = true;
       const signal = chatLifetime.current.signal;
+      if (ownedBy(approving.current, signal) !== void 0) return;
+      const pending = { lifetime: signal, value: approvalId };
+      approving.current = pending;
+      const fail = (kind, text) => {
+        if (!signal.aborted) setApprovalFailure({ id: approvalId, kind, ...text !== void 0 && { text } });
+      };
       setApprovalFailure(null);
       setApprovalPendingId(approvalId);
       try {
@@ -3118,24 +3134,25 @@ function useAgentChat({
             { timeoutMs: settingsRef.current.requestTimeoutMs, wholeBody: true }
           );
         } catch {
-          setApprovalFailure({ id: approvalId, kind: "connection" });
+          fail("connection");
           return;
         }
         const refusedByApp = response.ok ? null : await serverRefusalOf(response);
+        if (signal.aborted) return;
         if (refusedByApp?.kind) {
           announceAppRefusal(refusedByApp);
-          setApprovalFailure({ id: approvalId, kind: "refused", text: refusedByApp.text });
+          fail("refused", refusedByApp.text);
           return;
         }
         if (response.status === 429) {
           const refusal2 = await spendingRefusalOf(response);
           if (refusal2 && !signal.aborted) setSpending({ state: "exhausted", info: refusal2 });
           const tooManyTurns = !refusal2 && await errorKindOf(response) === "too_many_turns";
-          setApprovalFailure({ id: approvalId, kind: refusal2 ? "spending_limit" : tooManyTurns ? "too_many_turns" : "connection" });
+          fail(refusal2 ? "spending_limit" : tooManyTurns ? "too_many_turns" : "connection");
           return;
         }
         if (response.status === 409 && await errorKindOf(response) === "busy") {
-          setApprovalFailure({ id: approvalId, kind: "busy" });
+          fail("busy");
           return;
         }
         if (response.status === 409 || response.status === 404) {
@@ -3143,10 +3160,11 @@ function useAgentChat({
           return;
         }
         if (!response.ok) {
-          setApprovalFailure({ id: approvalId, kind: "connection" });
+          fail("connection");
           return;
         }
         const { resumed } = await response.json();
+        if (signal.aborted) return;
         setMessages((current) => withApprovalDecision(current, approvalId, decision, resumed));
         if (!resumed) return;
         setResuming(true);
@@ -3158,13 +3176,13 @@ function useAgentChat({
           if (!signal.aborted) setResuming(false);
         }
       } finally {
-        approving.current = false;
+        if (approving.current === pending) approving.current = null;
         if (!signal.aborted) setApprovalPendingId(null);
       }
     },
     [announceAppRefusal, chatUrl2, request2, rereadHistory, resumeWithProbe, setMessages, startSeries]
   );
-  const { answerWidget, widgetPendingId, widgetFailure, answeringWidget } = useWidgetAnswer({
+  const { answerWidget, widgetPendingId, widgetFailure, answeringWidget, forgetChat: forgetWidgetAnswer } = useWidgetAnswer({
     chatUrl: chatUrl2,
     request: request2,
     requestTimeoutMs: () => settingsRef.current.requestTimeoutMs,
@@ -3184,8 +3202,18 @@ function useAgentChat({
     showSpendingExhausted: (info) => setSpending({ state: "exhausted", info }),
     errorKindOf
   });
+  useEffect3(
+    () => () => {
+      setResuming(false);
+      setHandingOff(false);
+      setApprovalPendingId(null);
+      setApprovalFailure(null);
+      forgetWidgetAnswer();
+    },
+    [chatId, forgetWidgetAnswer]
+  );
   const ownTurnStarting = useCallback4(
-    () => busyRef.current || sending.current || approving.current || answeringWidget(),
+    () => busyRef.current || sending.current || ownedBy(approving.current, chatLifetime.current.signal) !== void 0 || answeringWidget(),
     [answeringWidget]
   );
   const connectionRef = useRef5(connection);
@@ -3271,18 +3299,19 @@ function useAgentChat({
     [sendMessage, setMessages]
   );
   const handOffToCorrections = useCallback4(() => {
-    if (handOff.current) return handOff.current;
     const signal = chatLifetime.current.signal;
+    const going = ownedBy(handOff.current, signal);
+    if (going) return going;
     setHandingOff(true);
     const run = (async () => {
-      await steerQueue.current;
-      await stopping.current;
+      await ownedBy(steerQueue.current, signal);
+      await ownedBy(stopping.current, signal);
       if (!signal.aborted) await refreshFromServer(signal);
     })().finally(() => {
-      handOff.current = null;
+      if (handOff.current?.value === run) handOff.current = null;
       if (!signal.aborted) setHandingOff(false);
     });
-    handOff.current = run;
+    handOff.current = { lifetime: signal, value: run };
     return run;
   }, [refreshFromServer]);
   handOffToCorrectionsRef.current = handOffToCorrections;
@@ -3302,7 +3331,7 @@ function useAgentChat({
         setValue((current) => current.length === 0 ? text : current);
         onRejected?.(kind);
       };
-      const sent = steerQueue.current.then(async () => {
+      const sent = (ownedBy(steerQueue.current, signal) ?? Promise.resolve()).then(async () => {
         let response;
         try {
           response = await fetchWithDeadline(
@@ -3322,15 +3351,17 @@ function useAgentChat({
         if (signal.aborted || chatUrlRef.current !== asked) return;
         if (!response.ok) {
           const spendingLimit = response.status === 429 ? await spendingRefusalOf(response) : null;
-          if (spendingLimit) setSpending({ state: "exhausted", info: spendingLimit });
           const refusedWithText = await serverRefusalOf(response);
+          const kind = spendingLimit ? "spending_limit" : refusedWithText?.kind ?? await errorKindOf(response);
+          if (signal.aborted) return;
+          if (spendingLimit) setSpending({ state: "exhausted", info: spendingLimit });
           announceAppRefusal(refusedWithText);
-          refused(spendingLimit ? "spending_limit" : refusedWithText?.kind ?? await errorKindOf(response));
+          refused(kind);
           return;
         }
         if (!answeringRef.current) void handOffToCorrectionsRef.current();
       });
-      steerQueue.current = sent.catch(() => void 0);
+      steerQueue.current = { lifetime: signal, value: sent.catch(() => void 0) };
     },
     [announceAppRefusal, chatUrl2, request2]
   );
@@ -3430,24 +3461,31 @@ function useAgentChat({
     if (loadedChatState !== null) publishedState2.current?.update(loadedChatState);
   }, [loadedChatState]);
   const stopping = useRef5(null);
-  const stop = useCallback4(() => {
-    if (stopping.current) return stopping.current;
-    if (seriesRef.current) cancelSeries();
-    browserCallsLifetime.current?.abort();
-    browserCallsLifetime.current = null;
-    const stopped = (async () => {
-      await fetchWithDeadline(request2, `${chatUrl2}/stop`, { method: "POST" }, {
-        timeoutMs: settingsRef.current.requestTimeoutMs,
-        wholeBody: true
-      }).catch(() => void 0);
-      await stopChat();
-      setMessages((messages2) => markLastAnswerStopped(messages2));
-    })().finally(() => {
-      stopping.current = null;
-    });
-    stopping.current = stopped;
-    return stopped;
-  }, [cancelSeries, chatUrl2, request2, setMessages, stopChat]);
+  const stopIn = useCallback4(
+    (lifetime) => {
+      const going = ownedBy(stopping.current, lifetime);
+      if (going) return going;
+      if (lifetime.aborted) return Promise.resolve();
+      if (seriesRef.current) cancelSeries();
+      browserCallsLifetime.current?.abort();
+      browserCallsLifetime.current = null;
+      const stopped = (async () => {
+        await fetchWithDeadline(request2, `${chatUrl2}/stop`, { method: "POST" }, {
+          timeoutMs: settingsRef.current.requestTimeoutMs,
+          wholeBody: true
+        }).catch(() => void 0);
+        if (lifetime.aborted) return;
+        await stopChat();
+        if (!lifetime.aborted) setMessages((messages2) => markLastAnswerStopped(messages2));
+      })().finally(() => {
+        if (stopping.current?.value === stopped) stopping.current = null;
+      });
+      stopping.current = { lifetime, value: stopped };
+      return stopped;
+    },
+    [cancelSeries, chatUrl2, request2, setMessages, stopChat]
+  );
+  const stop = useCallback4(() => stopIn(chatLifetime.current.signal), [stopIn]);
   const retry = useCallback4(() => {
     if (connection === "offline") {
       reconnectNow();
@@ -3532,11 +3570,12 @@ function useAgentChat({
     },
     [busy, canEdit, startEdit]
   );
-  const replacing = useRef5(Promise.resolve());
+  const replacing = useRef5(null);
   const replaceLastVoiceMessage = useCallback4(
     (text, options) => {
-      const run = replacing.current.then(async () => {
-        const signal = chatLifetime.current.signal;
+      const signal = chatLifetime.current.signal;
+      const run = (ownedBy(replacing.current, signal) ?? Promise.resolve()).then(async () => {
+        if (signal.aborted) return false;
         const messages2 = messagesRef.current;
         const index = messages2.findLastIndex((message) => message.role === "user");
         const target = messages2[index];
@@ -3544,24 +3583,25 @@ function useAgentChat({
         if (!messages2.slice(index + 1).every(isEmptyAnswer)) return false;
         const original = messages2;
         setMessages([...messages2.slice(0, index), { ...target, parts: [{ type: "text", text }, { type: VOICE_MODE_PART_TYPE, data: true }] }]);
-        await stop();
-        if (!await untilIdle(signal)) return restoreAfterFailure(original);
-        for (let attempt = 0; attempt < REPLACE_ATTEMPTS; attempt++) {
+        await stopIn(signal);
+        if (!await untilIdle(signal)) return restoreAfterFailure(original, signal);
+        for (let attempt = 0; attempt < REPLACE_ATTEMPTS && !signal.aborted; attempt++) {
           const outcome = await startEdit(target.id, text, true, options?.sounds);
           if (outcome.status === "started") return true;
           if (!(outcome.status === "refused" && outcome.reason === "busy")) break;
           await pause2(REPLACE_RETRY_MS, signal);
         }
-        return restoreAfterFailure(original);
+        return restoreAfterFailure(original, signal);
       });
-      replacing.current = run.catch(() => false);
+      replacing.current = { lifetime: signal, value: run.catch(() => false) };
       return run;
     },
-    [exhausted, loaded, refreshFromServer, setMessages, startEdit, stop]
+    [exhausted, loaded, refreshFromServer, setMessages, startEdit, stopIn]
   );
-  function restoreAfterFailure(original) {
+  function restoreAfterFailure(original, signal) {
+    if (signal.aborted) return false;
     setMessages(original);
-    void refreshFromServer(chatLifetime.current.signal);
+    void refreshFromServer(signal);
     return false;
   }
   async function untilIdle(signal) {
@@ -7236,4 +7276,4 @@ export {
   activeChatTitle,
   useWorkspaceListSync
 };
-//# sourceMappingURL=chunk-LF723Y52.js.map
+//# sourceMappingURL=chunk-PZZBB4Y6.js.map