@dudousxd/nestjs-agent-react 0.10.0 → 0.12.0

package/dist/index.js

@@ -444,6 +444,10 @@ var AgentChatTransport = class {
                 });
               }
               break;
+            case "approval-settled":
+              ensureStep();
+              forwardAsData(event, false);
+              break;
             case "ui":
               ensureStep();
               closeRuns();
@@ -743,6 +747,10 @@ var AgentClient = class {
   cancelStream(runId) {
     return this.request("POST", `/agent/chat/${encodeURIComponent(runId)}/cancel`);
   }
+  /**
+  * `remember` approves later calls of the same tool in the same thread; `via` names the surface
+  * the decision came through (the server records `'web'` when omitted).
+  */
   approveToolCall(input) {
     return this.request("POST", "/agent/tool-call/approve", input);
   }
@@ -970,8 +978,66 @@ import React3 from "react";
 import { useCallback as useCallback3, useEffect as useEffect5, useRef as useRef4, useState as useState5 } from "react";
 
 // src/transcript/model.ts
+import { readElicitationInput, validateElicitationAnswer as validateElicitationAnswer2 } from "@dudousxd/nestjs-agent-core";
 import { getToolName as getToolName2, isDataUIPart, isFileUIPart, isReasoningUIPart, isTextUIPart, isToolUIPart } from "ai";
 
+// src/elicitation/answers.ts
+import { validateElicitationAnswer, validateElicitationValue } from "@dudousxd/nestjs-agent-core";
+function pad(value) {
+  return String(value).padStart(2, "0");
+}
+__name(pad, "pad");
+function toDay(date) {
+  if (Number.isNaN(date.getTime())) {
+    return null;
+  }
+  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
+}
+__name(toDay, "toDay");
+function coerceOne(type, raw) {
+  if (raw === null || raw === void 0) {
+    return null;
+  }
+  if (Array.isArray(raw)) {
+    return null;
+  }
+  if (raw instanceof Date) {
+    return type === "date" || type === void 0 ? toDay(raw) : raw.toISOString();
+  }
+  if (typeof raw === "boolean") {
+    return raw ? "true" : "false";
+  }
+  if (typeof raw === "number") {
+    return Number.isFinite(raw) ? String(raw) : null;
+  }
+  const text = raw;
+  switch (type) {
+    case "number":
+    case "email":
+    case "url":
+    case "date":
+      return text.trim() === "" ? null : text.trim();
+    case "boolean": {
+      const lowered = text.trim().toLowerCase();
+      if (lowered === "true" || lowered === "on" || lowered === "yes") return "true";
+      if (lowered === "false" || lowered === "off" || lowered === "no") return "false";
+      return lowered === "" ? null : text;
+    }
+    default:
+      return text === "" ? null : text;
+  }
+}
+__name(coerceOne, "coerceOne");
+function coerceAnswer(question, raw) {
+  const type = question.input?.type;
+  const items = Array.isArray(raw) ? raw : [
+    raw
+  ];
+  const values = items.map((item) => coerceOne(type, item)).filter((value) => value !== null);
+  return question.multiple === true ? values : values.slice(0, 1);
+}
+__name(coerceAnswer, "coerceAnswer");
+
 // src/presentation/tool-activity.ts
 import { getToolName } from "ai";
 
@@ -1260,7 +1326,7 @@ function buildTranscriptBlocks(message, options) {
     if (toolBuffer.length === 0) {
       return;
     }
-    const calls = toolBuffer.map((part) => buildToolCall(part, options.approval, approvals.get(part.toolCallId) ?? null, options.toolCatalog));
+    const calls = toolBuffer.map((part) => buildToolCall(part, options.approval, approvalOf(approvals.get(part.toolCallId), part), options.toolCatalog));
     const roots = nestToolCalls(calls);
     blocks.push({
       kind: "tools",
@@ -1335,7 +1401,7 @@ function buildTranscriptBlocks(message, options) {
       fileBuffer.push(part);
       continue;
     }
-    if (part.type === APPROVAL_PART) {
+    if (part.type === APPROVAL_PART || part.type === SETTLED_PART) {
       continue;
     }
     flushAll();
@@ -1486,7 +1552,11 @@ function buildToolCall(part, options, approval, catalog) {
     approve: {
       available: awaiting && options?.canApprove === true,
       isSubmitting: sending === "approve",
-      run: /* @__PURE__ */ __name(() => options?.approve(toolCallId), "run")
+      // Read by field, not passed through: `onClick={call.approve.run}` hands this a click event,
+      // and a host's handler must not receive that as its options.
+      run: /* @__PURE__ */ __name((approveOptions) => approveOptions?.remember === true ? options?.approve(toolCallId, {
+        remember: true
+      }) : options?.approve(toolCallId), "run")
     },
     reject: {
       available: awaiting && options?.canReject === true,
@@ -1504,11 +1574,16 @@ function readElicitationRequest(part) {
   }
   const questions = [];
   for (const candidate of input.questions) {
-    if (!isRecord2(candidate) || typeof candidate.id !== "string" || typeof candidate.prompt !== "string" || !Array.isArray(candidate.options) || candidate.options.length === 0) {
+    if (!isRecord2(candidate) || typeof candidate.id !== "string" || typeof candidate.prompt !== "string") {
+      return null;
+    }
+    const input2 = readElicitationInput(candidate.input) ?? null;
+    const rawOptions = Array.isArray(candidate.options) ? candidate.options : [];
+    if (rawOptions.length === 0 && (input2 === null || input2.type === "select")) {
       return null;
     }
     const options = [];
-    for (const option of candidate.options) {
+    for (const option of rawOptions) {
       if (!isRecord2(option) || typeof option.value !== "string" || typeof option.label !== "string") {
         return null;
       }
@@ -1521,7 +1596,10 @@ function readElicitationRequest(part) {
     questions.push({
       id: candidate.id,
       prompt: candidate.prompt,
+      description: typeof candidate.description === "string" ? candidate.description : null,
+      input: input2,
       multiple: candidate.multiple === true,
+      allowFreeText: candidate.allowFreeText === true,
       defaults: Array.isArray(candidate.defaults) ? candidate.defaults.filter((value) => typeof value === "string") : [],
       options
     });
@@ -1557,12 +1635,38 @@ function buildElicitationBlock(key, part, request, options) {
     const picked = isPending ? options.picked(toolCallId, question.id) : void 0;
     const selected = picked ?? outcome?.answers[question.id] ?? question.defaults;
     const pick = /* @__PURE__ */ __name((values) => options.pick(toolCallId, question.id, values), "pick");
+    const error = isPending ? validateElicitationAnswer2({
+      id: question.id,
+      prompt: question.prompt,
+      options: question.options.map(({ value, label }) => ({
+        value,
+        label
+      })),
+      ...question.input !== null ? {
+        input: question.input
+      } : {},
+      ...question.multiple ? {
+        multiple: true
+      } : {},
+      ...question.allowFreeText ? {
+        allowFreeText: true
+      } : {}
+    }, selected) : null;
     return {
       id: question.id,
       prompt: question.prompt,
+      description: question.description,
+      input: question.input,
       multiple: question.multiple,
       position: index + 1,
       selected,
+      value: selected[0] ?? "",
+      error,
+      setValue: /* @__PURE__ */ __name((raw) => {
+        if (isPending) {
+          pick(coerceAnswer(question, raw));
+        }
+      }, "setValue"),
       isPristine: isPending ? picked === void 0 : outcome?.defaulted.includes(question.id) ?? true,
       options: question.options.map((option) => ({
         value: option.value,
@@ -1597,6 +1701,7 @@ function buildElicitationBlock(key, part, request, options) {
     questions,
     questionCount: questions.length,
     isPending,
+    isValid: questions.every((question) => question.error === null),
     outcome,
     error: options.errorOf(toolCallId),
     answer: {
@@ -1614,25 +1719,90 @@ function buildElicitationBlock(key, part, request, options) {
 __name(buildElicitationBlock, "buildElicitationBlock");
 var UI_PART = "data-ui";
 var APPROVAL_PART = "data-approval-requested";
+var SETTLED_PART = "data-approval-settled";
+var SETTLED_STATUSES = [
+  "approved",
+  "rejected",
+  "expired"
+];
 function readApprovals(parts) {
   const out = /* @__PURE__ */ new Map();
+  const entry = /* @__PURE__ */ __name((id) => {
+    let found = out.get(id);
+    if (found === void 0) {
+      found = {
+        approver: null,
+        expiresAt: null,
+        reason: null,
+        status: null,
+        remember: false,
+        decidedBy: null,
+        decidedVia: null,
+        decisionReason: null
+      };
+      out.set(id, found);
+    }
+    return found;
+  }, "entry");
   for (const part of parts) {
-    if (part.type !== APPROVAL_PART) {
+    if (part.type !== APPROVAL_PART && part.type !== SETTLED_PART) {
       continue;
     }
     const data = part.data;
-    if (!isRecord2(data) || typeof data.id !== "string" || typeof data.approver !== "string") {
+    if (!isRecord2(data) || typeof data.id !== "string") {
       continue;
     }
-    out.set(data.id, {
-      approver: data.approver,
-      expiresAt: typeof data.expiresAt === "string" ? data.expiresAt : null,
-      reason: typeof data.reason === "string" ? data.reason : null
-    });
+    const approval = entry(data.id);
+    if (part.type === APPROVAL_PART) {
+      if (typeof data.approver !== "string") {
+        continue;
+      }
+      approval.approver = data.approver;
+      approval.expiresAt = typeof data.expiresAt === "string" ? data.expiresAt : null;
+      approval.reason = typeof data.reason === "string" ? data.reason : null;
+      continue;
+    }
+    if (typeof data.status !== "string" || !SETTLED_STATUSES.includes(data.status)) {
+      continue;
+    }
+    approval.status = data.status;
+    if (approval.approver === null && typeof data.approver === "string") {
+      approval.approver = data.approver;
+    }
+    approval.remember = data.remember === true;
+    approval.decidedBy = typeof data.decidedBy === "string" ? data.decidedBy : null;
+    approval.decidedVia = typeof data.decidedVia === "string" ? data.decidedVia : null;
+    approval.decisionReason = typeof data.reason === "string" ? data.reason : null;
   }
   return out;
 }
 __name(readApprovals, "readApprovals");
+function approvalOf(parts, call) {
+  if (parts === void 0 || parts.approver === null) {
+    return null;
+  }
+  return {
+    approver: parts.approver,
+    expiresAt: parts.expiresAt,
+    reason: parts.reason,
+    status: parts.status ?? statusFromPart(call),
+    remember: parts.remember,
+    decidedBy: parts.decidedBy,
+    decidedVia: parts.decidedVia,
+    decisionReason: parts.decisionReason
+  };
+}
+__name(approvalOf, "approvalOf");
+function statusFromPart(call) {
+  if (call.state === "output-denied") {
+    return "rejected";
+  }
+  if (call.state === "output-available" || call.state === "output-error") {
+    return "approved";
+  }
+  return "pending";
+}
+__name(statusFromPart, "statusFromPart");
 function readUiComponent(part) {
   const data = part.data;
   if (!isRecord2(data) || typeof data.component !== "string") {
@@ -2018,10 +2188,10 @@ function useTranscriptItems({ messages, visibleStart, streamingMessageId, option
   }, [
     settle
   ]);
-  const approve = useCallback3((toolCallId) => {
+  const approve = useCallback3((toolCallId, options2) => {
     const onApprove = latest.current.options.onApprove;
     if (onApprove) {
-      settle(toolCallId, "approve", () => onApprove(toolCallId));
+      settle(toolCallId, "approve", () => options2 === void 0 ? onApprove(toolCallId) : onApprove(toolCallId, options2));
     }
   }, [
     settle
@@ -2996,6 +3166,49 @@ function useToolCatalog(options) {
 }
 __name(useToolCatalog, "useToolCatalog");
 
+// src/approvals/countdown.ts
+import { useEffect as useEffect8, useRef as useRef6, useState as useState8 } from "react";
+function approvalCountdown(expiresAt, now = Date.now()) {
+  const deadline = expiresAt == null ? Number.NaN : Date.parse(expiresAt);
+  if (!Number.isFinite(deadline)) {
+    return {
+      remainingMs: null,
+      isExpired: false
+    };
+  }
+  const remainingMs = Math.max(0, deadline - now);
+  return {
+    remainingMs,
+    isExpired: remainingMs === 0
+  };
+}
+__name(approvalCountdown, "approvalCountdown");
+function useApprovalCountdown(expiresAt, options = {}) {
+  const { intervalMs = 1e3 } = options;
+  const nowRef = useRef6(options.now ?? Date.now);
+  nowRef.current = options.now ?? Date.now;
+  const [state, setState] = useState8(() => approvalCountdown(expiresAt, nowRef.current()));
+  useEffect8(() => {
+    const read = /* @__PURE__ */ __name(() => approvalCountdown(expiresAt, nowRef.current()), "read");
+    const first = read();
+    setState(first);
+    if (first.remainingMs === null || first.isExpired) {
+      return;
+    }
+    const timer = setInterval(() => {
+      const next = read();
+      setState(next);
+      if (next.isExpired) clearInterval(timer);
+    }, intervalMs);
+    return () => clearInterval(timer);
+  }, [
+    expiresAt,
+    intervalMs
+  ]);
+  return state;
+}
+__name(useApprovalCountdown, "useApprovalCountdown");
+
 // src/stored-message-to-ui-message.ts
 import { DEFAULT_REFUSAL_REASON } from "@dudousxd/nestjs-agent-core";
 function isRefusal(result) {
@@ -3055,6 +3268,41 @@ function storedMessageToUiMessage(message) {
       }
     });
   }
+  for (const approval of message.approvals ?? []) {
+    parts.push({
+      type: "data-approval-requested",
+      id: approval.toolCallId,
+      data: {
+        id: approval.toolCallId,
+        approver: approval.approver,
+        ...approval.expiresAt !== void 0 ? {
+          expiresAt: approval.expiresAt
+        } : {}
+      }
+    });
+    if (approval.status !== "pending") {
+      parts.push({
+        type: "data-approval-settled",
+        id: approval.toolCallId,
+        data: {
+          id: approval.toolCallId,
+          status: approval.status,
+          ...approval.decidedBy !== void 0 ? {
+            decidedBy: approval.decidedBy
+          } : {},
+          ...approval.decidedVia !== void 0 ? {
+            decidedVia: approval.decidedVia
+          } : {},
+          ...approval.remember === true ? {
+            remember: true
+          } : {},
+          ...approval.reason !== void 0 ? {
+            reason: approval.reason
+          } : {}
+        }
+      });
+    }
+  }
   for (const call of message.toolCalls ?? []) {
     const result = message.toolResults?.find((candidate) => candidate.id === call.id);
     const toolKind2 = call.kind;
@@ -3157,19 +3405,19 @@ __name(sumUsage, "sumUsage");
 
 // src/use-agent-chat.ts
 import { useChat } from "@ai-sdk/react";
-import { useCallback as useCallback6, useEffect as useEffect8, useMemo as useMemo4, useRef as useRef6, useState as useState8 } from "react";
+import { useCallback as useCallback6, useEffect as useEffect9, useMemo as useMemo4, useRef as useRef7, useState as useState9 } from "react";
 function useAgentChat(options) {
-  const latest = useRef6(options);
+  const latest = useRef7(options);
   latest.current = options;
-  const [runId, setRunId] = useState8(options.resumeRunId);
-  const runIdRef = useRef6(runId);
+  const [runId, setRunId] = useState9(options.resumeRunId);
+  const runIdRef = useRef7(runId);
   runIdRef.current = runId;
-  const settlingRunIdRef = useRef6(void 0);
-  const autoResumeRunIdRef = useRef6(void 0);
-  const [autoResume, setAutoResume] = useState8(false);
-  const [activeRunId, setActiveRunId] = useState8(null);
-  const regenerateNext = useRef6(false);
-  const createdThreadId = useRef6(void 0);
+  const settlingRunIdRef = useRef7(void 0);
+  const autoResumeRunIdRef = useRef7(void 0);
+  const [autoResume, setAutoResume] = useState9(false);
+  const [activeRunId, setActiveRunId] = useState9(null);
+  const regenerateNext = useRef7(false);
+  const createdThreadId = useRef7(void 0);
   const client = useMemo4(() => {
     if (options.client) return options.client;
     return new AgentClient({
@@ -3185,7 +3433,7 @@ function useAgentChat(options) {
       getHeaders: /* @__PURE__ */ __name(async () => mergeHeaders(latest.current), "getHeaders")
     });
   }, []);
-  useEffect8(() => {
+  useEffect9(() => {
     if (!options.resume || options.threadId === void 0) return;
     let cancelled = false;
     const threadId = options.threadId;
@@ -3254,7 +3502,7 @@ function useAgentChat(options) {
       }, "onAttemptStart")
     });
   }, []);
-  const backgroundRef = useRef6(() => Promise.resolve());
+  const backgroundRef = useRef7(() => Promise.resolve());
   const chat = useChat({
     transport,
     resume: options.resumeRunId !== void 0 || autoResume,
@@ -3285,9 +3533,9 @@ function useAgentChat(options) {
       }
     }, "onFinish")
   });
-  const chatRef = useRef6(chat);
+  const chatRef = useRef7(chat);
   chatRef.current = chat;
-  const turnInFlight = useRef6(false);
+  const turnInFlight = useRef7(false);
   const isTurnInFlight = useCallback6(() => turnInFlight.current || transport.isAttemptLive, [
     transport
   ]);
@@ -3307,9 +3555,9 @@ function useAgentChat(options) {
     toolCallId,
     output
   }), []);
-  const [threads, setThreads] = useState8([]);
-  const [quota, setQuota] = useState8(null);
-  const [backgroundRuns, setBackgroundRuns] = useState8([]);
+  const [threads, setThreads] = useState9([]);
+  const [quota, setQuota] = useState9(null);
+  const [backgroundRuns, setBackgroundRuns] = useState9([]);
   const refreshBackground = useCallback6(async () => {
     const threadId = latest.current.threadId ?? createdThreadId.current;
     if (threadId === void 0) {
@@ -3335,7 +3583,7 @@ function useAgentChat(options) {
   ]);
   backgroundRef.current = refreshBackground;
   const isWorking = backgroundRuns.some((run) => run.status === "running");
-  useEffect8(() => {
+  useEffect9(() => {
     if (options.background !== true || options.threadId === void 0) {
       return;
     }
@@ -3345,7 +3593,7 @@ function useAgentChat(options) {
     options.threadId,
     refreshBackground
   ]);
-  useEffect8(() => {
+  useEffect9(() => {
     const every = latest.current.backgroundPollMs ?? 5e3;
     if (latest.current.background !== true || !isWorking || every <= 0) {
       return;
@@ -3413,18 +3661,27 @@ function useAgentChat(options) {
   }, [
     client
   ]);
-  const approve = useCallback6(async ({ toolCallId }) => {
+  const approve = useCallback6(async ({ toolCallId, remember, via }) => {
     await client.approveToolCall({
-      toolCallId
+      toolCallId,
+      ...remember === true ? {
+        remember: true
+      } : {},
+      ...via !== void 0 ? {
+        via
+      } : {}
     });
   }, [
     client
   ]);
-  const reject = useCallback6(async ({ toolCallId, reason }) => {
+  const reject = useCallback6(async ({ toolCallId, reason, via }) => {
     await client.rejectToolCall({
       toolCallId,
       ...reason !== void 0 ? {
         reason
+      } : {},
+      ...via !== void 0 ? {
+        via
       } : {}
     });
   }, [
@@ -3510,8 +3767,10 @@ export {
   MessageList,
   SPEECH_LANGUAGES,
   applyCompletion,
+  approvalCountdown,
   backgroundRunsFromThread,
   buildTranscriptBlocks,
+  coerceAnswer,
   correctedCallIds,
   createSkillsSource,
   describeTimestamp,
@@ -3537,12 +3796,15 @@ export {
   toolCallState,
   toolCatalogFrom,
   useAgentChat,
+  useApprovalCountdown,
   useChatTranscript,
   useComposerAutocomplete,
   useElapsed,
   useSpeechRecognition,
   useStickToBottom,
   useToolCatalog,
-  useTranscriptItem
+  useTranscriptItem,
+  validateElicitationAnswer as validateAnswer,
+  validateElicitationValue as validateAnswerValue
 };
 //# sourceMappingURL=index.js.map