@dudousxd/nestjs-agent-react 0.23.0 → 0.25.0

package/dist/index.cjs

@@ -99,22 +99,87 @@ __export(src_exports, {
   useThreads: () => useThreads,
   useToolCatalog: () => useToolCatalog,
   useTranscriptItem: () => useTranscriptItem,
-  validateAnswer: () => import_nestjs_agent_core.validateElicitationAnswer,
-  validateAnswerValue: () => import_nestjs_agent_core.validateElicitationValue
+  validateAnswer: () => import_nestjs_agent_core2.validateElicitationAnswer,
+  validateAnswerValue: () => import_nestjs_agent_core2.validateElicitationValue
 });
 module.exports = __toCommonJS(src_exports);
 
+// src/http-error.ts
+function readErrorAnswer(text) {
+  if (text == null || text === "") return {
+    body: void 0,
+    message: void 0,
+    code: void 0
+  };
+  let body = text;
+  try {
+    body = JSON.parse(text);
+  } catch {
+    return {
+      body: text,
+      message: void 0,
+      code: void 0
+    };
+  }
+  if (body === null || typeof body !== "object") return {
+    body,
+    message: void 0,
+    code: void 0
+  };
+  const record = body;
+  const message = typeof record.message === "string" && record.message !== "" ? record.message : Array.isArray(record.message) && record.message.length > 0 && record.message.every((each) => typeof each === "string") ? record.message.join("; ") : void 0;
+  const code = typeof record.code === "string" && record.code !== "" ? record.code : void 0;
+  return {
+    body,
+    message,
+    code
+  };
+}
+__name(readErrorAnswer, "readErrorAnswer");
+async function readErrorResponse(response) {
+  let text;
+  try {
+    text = await response.text();
+  } catch {
+    text = void 0;
+  }
+  return readErrorAnswer(text);
+}
+__name(readErrorResponse, "readErrorResponse");
+function reportHttpError(listener, error) {
+  if (listener === void 0) return;
+  try {
+    listener(error);
+  } catch {
+  }
+}
+__name(reportHttpError, "reportHttpError");
+
 // src/client.ts
-var AgentHttpError = class extends Error {
+var AgentHttpError = class _AgentHttpError extends Error {
   static {
     __name(this, "AgentHttpError");
   }
   status;
   method;
   path;
-  constructor(status, method, path, statusText) {
-    super(`Agent request failed: ${method} ${path} \u2192 ${status} ${statusText}`), this.status = status, this.method = method, this.path = path;
+  /** The answer's body: parsed JSON, else its text; `undefined` when empty. */
+  body;
+  /** The body's `code` (`quota_exceeded`, …), when the server sent one. */
+  code;
+  constructor(status, method, path, statusText, answer = {
+    body: void 0,
+    message: void 0,
+    code: void 0
+  }) {
+    super(answer.message ?? `Agent request failed: ${method} ${path} \u2192 ${status} ${statusText}`), this.status = status, this.method = method, this.path = path;
     this.name = "AgentHttpError";
+    this.body = answer.body;
+    this.code = answer.code;
+  }
+  /** Read a refused `response`'s body into an error. */
+  static async from(response, method, path) {
+    return new _AgentHttpError(response.status, method, path, response.statusText, await readErrorResponse(response));
   }
 };
 function normalizeAgentPath(path) {
@@ -149,7 +214,7 @@ var AgentClient = class {
       } : {}
     });
     if (!response.ok || !response.body) {
-      throw new AgentHttpError(response.status, "POST", `${this.agentPath()}/chat`, response.statusText);
+      throw await this.failure(response, "POST", `${this.agentPath()}/chat`);
     }
     return streamResponse(response);
   }
@@ -176,7 +241,7 @@ var AgentClient = class {
       return null;
     }
     if (!response.ok || !response.body) {
-      throw new AgentHttpError(response.status, "GET", `${this.agentPath()}${path}`, response.statusText);
+      throw await this.failure(response, "GET", `${this.agentPath()}${path}`);
     }
     return streamResponse(response);
   }
@@ -269,7 +334,9 @@ var AgentClient = class {
       };
       xhr.onload = () => {
         if (xhr.status < 200 || xhr.status >= 300) {
-          reject(new AgentHttpError(xhr.status, "POST", `${this.agentPath()}/attachments`, xhr.statusText));
+          const error = new AgentHttpError(xhr.status, "POST", `${this.agentPath()}/attachments`, xhr.statusText, readErrorAnswer(xhr.responseText));
+          reportHttpError(this.options.onHttpError, error);
+          reject(error);
           return;
         }
         onProgress?.(1);
@@ -332,6 +399,7 @@ var AgentClient = class {
   * out takes the pre-picked default the request carried, resolved server-side against the request
   * the run already holds. Omit the whole object and the user has confirmed every pre-picked
   * answer — which is the point of the surface, so it is a valid submission rather than a blank.
+  * `via` names the surface the answer came through (the server records `'web'` when omitted).
   */
   answerToolCall(input) {
     return this.request("POST", "/tool-call/answer", input);
@@ -354,7 +422,10 @@ var AgentClient = class {
       path: this.agentPath(),
       headers: /* @__PURE__ */ __name(() => this.resolveHeaders(), "headers"),
       fetch: this.fetchImpl(),
-      ...this.credentials()
+      ...this.credentials(),
+      ...this.options.onHttpError !== void 0 ? {
+        onHttpError: this.options.onHttpError
+      } : {}
     };
   }
   baseUrl() {
@@ -397,9 +468,15 @@ var AgentClient = class {
     });
     return this.handleResponse(response, method, path);
   }
+  /** The error for a refused `response`, already reported to `onHttpError`. */
+  async failure(response, method, path) {
+    const error = await AgentHttpError.from(response, method, path);
+    reportHttpError(this.options.onHttpError, error);
+    return error;
+  }
   async handleResponse(response, method, path) {
     if (!response.ok) {
-      throw new AgentHttpError(response.status, method, path, response.statusText);
+      throw await this.failure(response, method, path);
     }
     if (response.status === 204) return void 0;
     const text = await response.text();
@@ -967,6 +1044,13 @@ var AgentChatTransport = class {
                 }
               });
               break;
+            case "message-metadata":
+              ensureStarted();
+              controller.enqueue({
+                type: "message-metadata",
+                messageMetadata: event.metadata
+              });
+              break;
             case "title":
             case "cancelled":
               forwardAsData(event, true);
@@ -1747,14 +1831,16 @@ __name(GenerativeUI, "GenerativeUI");
 
 // src/provider.tsx
 var AgentBackendContext = sharedContext("@dudousxd/nestjs-agent-react:agent-backend");
-function AgentProvider({ backend, baseUrl, path, headers, getHeaders, credentials, fetch, attachments, genui, children }) {
+function AgentProvider({ backend, baseUrl, path, headers, getHeaders, credentials, fetch, onHttpError, attachments, genui, children }) {
   const latestHeaders = (0, import_react5.useRef)({
     headers,
-    getHeaders
+    getHeaders,
+    onHttpError
   });
   latestHeaders.current = {
     headers,
-    getHeaders
+    getHeaders,
+    onHttpError
   };
   const upload = attachments?.upload;
   const value = (0, import_react5.useMemo)(() => backend ?? new AgentClient({
@@ -1775,6 +1861,7 @@ function AgentProvider({ backend, baseUrl, path, headers, getHeaders, credential
         upload
       }
     } : {},
+    onHttpError: /* @__PURE__ */ __name((error) => latestHeaders.current.onHttpError?.(error), "onHttpError"),
     getHeaders: /* @__PURE__ */ __name(async () => {
       const current = latestHeaders.current;
       const dynamic = await current.getHeaders?.() ?? {};
@@ -2188,6 +2275,7 @@ function useModels(options = {}) {
       providers,
       models,
       defaultModel: data?.default ?? null,
+      locked: data?.locked ?? null,
       find: /* @__PURE__ */ __name((id) => id == null ? void 0 : byId.get(id), "find"),
       isLoading,
       error,
@@ -2203,6 +2291,7 @@ function useModels(options = {}) {
 __name(useModels, "useModels");
 
 // src/quota/use-quota.ts
+var import_nestjs_agent_core = require("@dudousxd/nestjs-agent-core");
 var import_react11 = require("react");
 
 // src/threads/threads-events.ts
@@ -2258,6 +2347,7 @@ function useQuota(options = {}) {
       day: windows.find((window2) => window2.period === "day"),
       month: windows.find((window2) => window2.period === "month"),
       blocked: data?.blocked ?? null,
+      warning: data === void 0 || data.blocked !== void 0 ? null : data.warning ?? (0, import_nestjs_agent_core.quotaWarning)(windows) ?? null,
       isLoading,
       error,
       refresh
@@ -2701,11 +2791,11 @@ var import_react18 = __toESM(require("react"), 1);
 var import_react17 = require("react");
 
 // src/transcript/model.ts
-var import_nestjs_agent_core2 = require("@dudousxd/nestjs-agent-core");
+var import_nestjs_agent_core3 = require("@dudousxd/nestjs-agent-core");
 var import_ai2 = require("ai");
 
 // src/elicitation/answers.ts
-var import_nestjs_agent_core = require("@dudousxd/nestjs-agent-core");
+var import_nestjs_agent_core2 = require("@dudousxd/nestjs-agent-core");
 function pad(value) {
   return String(value).padStart(2, "0");
 }
@@ -3300,7 +3390,7 @@ function readElicitationRequest(part) {
     if (!isRecord3(candidate) || typeof candidate.id !== "string" || typeof candidate.prompt !== "string") {
       return null;
     }
-    const input2 = (0, import_nestjs_agent_core2.readElicitationInput)(candidate.input) ?? null;
+    const input2 = (0, import_nestjs_agent_core3.readElicitationInput)(candidate.input) ?? null;
     const rawOptions = Array.isArray(candidate.options) ? candidate.options : [];
     if (rawOptions.length === 0 && (input2 === null || input2.type === "select")) {
       return null;
@@ -3346,7 +3436,9 @@ function readElicitationOutcome(part) {
     answers,
     skipped: output.skipped,
     defaulted: Array.isArray(output.defaulted) ? output.defaulted.filter((id) => typeof id === "string") : [],
-    summary: typeof output.summary === "string" ? output.summary : null
+    summary: typeof output.summary === "string" ? output.summary : null,
+    answeredBy: typeof output.answeredBy === "string" ? output.answeredBy : null,
+    answeredVia: typeof output.answeredVia === "string" ? output.answeredVia : null
   };
 }
 __name(readElicitationOutcome, "readElicitationOutcome");
@@ -3358,7 +3450,7 @@ 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 ? (0, import_nestjs_agent_core2.validateElicitationAnswer)({
+    const error = isPending ? (0, import_nestjs_agent_core3.validateElicitationAnswer)({
       id: question.id,
       prompt: question.prompt,
       options: question.options.map(({ value, label }) => ({
@@ -5007,7 +5099,7 @@ function useApprovalCountdown(expiresAt, options = {}) {
 __name(useApprovalCountdown, "useApprovalCountdown");
 
 // src/stored-message-to-ui-message.ts
-var import_nestjs_agent_core3 = require("@dudousxd/nestjs-agent-core");
+var import_nestjs_agent_core4 = require("@dudousxd/nestjs-agent-core");
 function isRefusal(result) {
   if (result.denied === true) {
     return true;
@@ -5020,7 +5112,7 @@ function refusalReason(result) {
   const { output } = result;
   if (output !== null && typeof output === "object" && "reason" in output) {
     const reason = output.reason;
-    return typeof reason === "string" && reason !== import_nestjs_agent_core3.DEFAULT_REFUSAL_REASON ? reason : void 0;
+    return typeof reason === "string" && reason !== import_nestjs_agent_core4.DEFAULT_REFUSAL_REASON ? reason : void 0;
   }
   return void 0;
 }
@@ -5121,13 +5213,19 @@ function storedMessageToUiMessage(message) {
   for (const call of message.toolCalls ?? []) {
     const result = message.toolResults?.find((candidate) => candidate.id === call.id);
     const toolKind2 = call.kind;
+    const toolMetadata = {
+      ...toolKind2 !== void 0 ? {
+        toolKind: toolKind2
+      } : {},
+      ...call.parentId !== void 0 ? {
+        parentId: call.parentId
+      } : {}
+    };
     parts.push({
       type: `tool-${call.name}`,
       toolCallId: call.id,
-      ...toolKind2 !== void 0 ? {
-        toolMetadata: {
-          toolKind: toolKind2
-        }
+      ...Object.keys(toolMetadata).length > 0 ? {
+        toolMetadata
       } : {},
       ...result !== void 0 ? isRefusal(result) ? {
         // A declined action is NOT an available output. Reloading a thread used to bring one
@@ -5155,6 +5253,8 @@ function storedMessageToUiMessage(message) {
     parts.push(...pushedByCall.get(call.id) ?? []);
   }
   const metadata = {
+    // The host's own facts first: the library's keys win on a clash.
+    ...message.metadata,
     ...message.feedback !== void 0 ? {
       feedback: message.feedback
     } : {},
@@ -5214,6 +5314,8 @@ function mergeTurn(rows) {
   const feedback = lastRow.feedback;
   const createdAt = rows[0]?.createdAt;
   const metadata = {
+    // Host facts of every row, a later row's winning (the turn's final state), under the library's.
+    ...Object.assign({}, ...rows.map((row) => row.metadata ?? {})),
     ...usage !== void 0 ? {
       usage
     } : {},
@@ -5286,6 +5388,7 @@ function useAgentChat(options = {}) {
   const [pickedModel, setPickedModel] = (0, import_react23.useState)(void 0);
   const pickedModelRef = (0, import_react23.useRef)(pickedModel);
   pickedModelRef.current = pickedModel;
+  const lockedRef = (0, import_react23.useRef)(false);
   const pendingPin = (0, import_react23.useRef)(void 0);
   const regenerateNext = (0, import_react23.useRef)(false);
   const currentThreadId = (0, import_react23.useCallback)(() => latest.current.threadId ?? createdThreadId.current, []);
@@ -5333,8 +5436,13 @@ function useAgentChat(options = {}) {
         const regenerate2 = regenerateNext.current;
         regenerateNext.current = false;
         const threadId = currentThreadId();
-        const model = current.model ?? pickedModelRef.current;
+        const model = current.model ?? (lockedRef.current ? void 0 : pickedModelRef.current);
         return {
+          // Read per send: a host that switches agents before the first message (a picker on a
+          // new chat) sends the one picked now, not the one this chat mounted with.
+          ...current.agent !== void 0 ? {
+            agent: current.agent
+          } : {},
           ...threadId !== void 0 ? {
             threadId
           } : {},
@@ -5422,6 +5530,7 @@ function useAgentChat(options = {}) {
     setRunId(void 0);
     setActiveRunId(null);
     setThreadModel(null);
+    setPickedModel(void 0);
     setBackgroundRuns([]);
     setHistoryError(null);
     autoResumeRunIdRef.current = void 0;
@@ -5586,19 +5695,25 @@ function useAgentChat(options = {}) {
   }, [
     client
   ]);
-  const answer = (0, import_react23.useCallback)(async ({ toolCallId, answers }) => {
+  const answer = (0, import_react23.useCallback)(async ({ toolCallId, answers, via }) => {
     await requireBackendMethod(client, "answerToolCall")({
       toolCallId,
       ...answers !== void 0 ? {
         answers
+      } : {},
+      ...via !== void 0 ? {
+        via
       } : {}
     });
   }, [
     client
   ]);
-  const skip = (0, import_react23.useCallback)(async ({ toolCallId }) => {
+  const skip = (0, import_react23.useCallback)(async ({ toolCallId, via }) => {
     await requireBackendMethod(client, "skipToolCall")({
-      toolCallId
+      toolCallId,
+      ...via !== void 0 ? {
+        via
+      } : {}
     });
   }, [
     client
@@ -5678,10 +5793,14 @@ function useAgentChat(options = {}) {
     modelsWantedRef.current = true;
     queueMicrotask(() => setModelsWanted(true));
   }, []);
-  const selectModel = (0, import_react23.useCallback)((id) => setPickedModel(id), []);
+  lockedRef.current = catalog.locked !== null;
+  const selectModel = (0, import_react23.useCallback)((id) => {
+    if (!lockedRef.current) setPickedModel(id);
+  }, []);
   const pinToThread = (0, import_react23.useCallback)(async (model) => {
     const threadId = currentThreadId();
     setThreadModel(model);
+    setPickedModel(void 0);
     if (threadId === void 0) {
       pendingPin.current = {
         model
@@ -5707,7 +5826,16 @@ function useAgentChat(options = {}) {
       wantModels();
       return catalog.providers;
     },
-    selected: options.model ?? pickedModel ?? threadModel ?? catalog.defaultModel ?? null,
+    selected: catalog.locked?.model ?? options.model ?? pickedModel ?? threadModel ?? catalog.defaultModel ?? null,
+    pinned: threadModel,
+    get defaultModel() {
+      wantModels();
+      return catalog.defaultModel;
+    },
+    get locked() {
+      wantModels();
+      return catalog.locked;
+    },
     select: selectModel,
     pinToThread,
     isLoading: modelsWanted && catalog.isLoading,
@@ -5735,10 +5863,26 @@ function useAgentChat(options = {}) {
     const current = composerRef.current;
     if (current.blockedBy !== null) return;
     const refs = current.files.refs;
+    const files2 = current.files.items.flatMap((item) => item.status === "ready" && item.attachment !== void 0 ? [
+      {
+        type: "file",
+        mediaType: item.attachment.contentType,
+        filename: item.attachment.name,
+        url: item.attachment.url,
+        providerMetadata: {
+          agent: {
+            mediaId: item.attachment.mediaId
+          }
+        }
+      }
+    ] : []);
     const draft = current.text.trim();
     setText("");
     current.files.clear();
-    await sendMessage({
+    await sendMessage(files2.length > 0 ? {
+      text: draft,
+      files: files2
+    } : {
       text: draft
     }, refs.length > 0 ? {
       body: {