@dudousxd/nestjs-agent-react 0.11.0 → 0.13.0

package/README.md

@@ -186,12 +186,32 @@ const transcript = useChatTranscript({
 });
 
 // block.kind === 'elicitation' →
-// { toolCallId, preamble, questionCount, isPending, outcome, error,
-//   questions: [{ id, prompt, position, multiple, selected, isPristine,
+// { toolCallId, preamble, questionCount, isPending, isValid, outcome, error,
+//   questions: [{ id, prompt, description, input, position, multiple, selected, value, error,
+//                 isPristine, setValue(raw),
 //                 options: [{ value, label, hotkey, isSelected, isDefault, select() }] }],
 //   answer: { available, isSubmitting, run() }, skip: { … } }
 ```
 
+**Typed questions.** A question with `input` asks for a value instead of a pick — `input.type` is
+`text` · `textarea` · `number` · `boolean` · `date` · `email` · `url` · `select` (a pick from
+`options` again), with optional `placeholder`, `required`, `min`, `max` and `pattern`. `options` may
+be empty for one. Render the control from `input.type` and hand whatever it produces to
+`question.setValue(raw)`: it is coerced with `coerceAnswer` to the canonical strings the wire
+carries (numbers as decimals, booleans as `"true"`/`"false"`, dates as `YYYY-MM-DD`). `question.error`
+is the server's own verdict on the current selection (`validateAnswer`), and `block.isValid` is all
+of them — the answer route answers `400` with the same message for anything it would refuse.
+
+```tsx
+{q.input?.type === 'number' ? (
+  <input type="number" value={q.value} placeholder={q.input.placeholder}
+         min={q.input.min} max={q.input.max} onChange={(e) => q.setValue(e.target.value)} />
+) : q.input?.type === 'boolean' ? (
+  <input type="checkbox" checked={q.value === 'true'} onChange={(e) => q.setValue(e.target.checked)} />
+) : null}
+{q.error && !q.isPristine ? <small role="alert">{q.error}</small> : null}
+```
+
 Every option the agent pre-picked comes back as `isDefault` and starts `isSelected`, so confirming
 is enough. `answer.run()` submits **only the questions the user touched** — the rest are omitted on
 purpose, so the server applies the same defaults it showed and the settled row still records which

package/dist/index.cjs

@@ -44,6 +44,7 @@ __export(src_exports, {
   approvalCountdown: () => approvalCountdown,
   backgroundRunsFromThread: () => backgroundRunsFromThread,
   buildTranscriptBlocks: () => buildTranscriptBlocks,
+  coerceAnswer: () => coerceAnswer,
   correctedCallIds: () => correctedCallIds,
   createSkillsSource: () => createSkillsSource,
   describeTimestamp: () => describeTimestamp,
@@ -76,7 +77,9 @@ __export(src_exports, {
   useSpeechRecognition: () => useSpeechRecognition,
   useStickToBottom: () => useStickToBottom,
   useToolCatalog: () => useToolCatalog,
-  useTranscriptItem: () => useTranscriptItem
+  useTranscriptItem: () => useTranscriptItem,
+  validateAnswer: () => import_nestjs_agent_core.validateElicitationAnswer,
+  validateAnswerValue: () => import_nestjs_agent_core.validateElicitationValue
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -539,6 +542,9 @@ var AgentChatTransport = class {
                   props: event.props,
                   ...event.version !== void 0 ? {
                     version: event.version
+                  } : {},
+                  ...event.toolCallId !== void 0 ? {
+                    toolCallId: event.toolCallId
                   } : {}
                 }
               });
@@ -1057,8 +1063,66 @@ var import_react6 = __toESM(require("react"), 1);
 var import_react5 = require("react");
 
 // src/transcript/model.ts
+var import_nestjs_agent_core2 = require("@dudousxd/nestjs-agent-core");
 var import_ai2 = require("ai");
 
+// src/elicitation/answers.ts
+var import_nestjs_agent_core = require("@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
 var import_ai = require("ai");
 
@@ -1595,11 +1659,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 = (0, import_nestjs_agent_core2.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;
       }
@@ -1612,7 +1681,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
     });
@@ -1648,12 +1720,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 ? (0, import_nestjs_agent_core2.validateElicitationAnswer)({
+      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,
@@ -1688,6 +1786,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: {
@@ -1802,7 +1901,8 @@ function readUiComponent(part) {
     id,
     component: data.component,
     props: isRecord2(data.props) ? data.props : {},
-    version: typeof data.version === "number" ? data.version : null
+    version: typeof data.version === "number" ? data.version : null,
+    toolCallId: typeof data.toolCallId === "string" ? data.toolCallId : null
   };
 }
 __name(readUiComponent, "readUiComponent");
@@ -3196,7 +3296,7 @@ function useApprovalCountdown(expiresAt, options = {}) {
 __name(useApprovalCountdown, "useApprovalCountdown");
 
 // src/stored-message-to-ui-message.ts
-var import_nestjs_agent_core = require("@dudousxd/nestjs-agent-core");
+var import_nestjs_agent_core3 = require("@dudousxd/nestjs-agent-core");
 function isRefusal(result) {
   if (result.denied === true) {
     return true;
@@ -3209,7 +3309,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_core.DEFAULT_REFUSAL_REASON ? reason : void 0;
+    return typeof reason === "string" && reason !== import_nestjs_agent_core3.DEFAULT_REFUSAL_REASON ? reason : void 0;
   }
   return void 0;
 }
@@ -3240,8 +3340,10 @@ function storedMessageToUiMessage(message) {
       url: attachment.url
     });
   }
+  const toolCallIds = new Set((message.toolCalls ?? []).map((call) => call.id));
+  const pushedByCall = /* @__PURE__ */ new Map();
   for (const component of message.ui ?? []) {
-    parts.push({
+    const part = {
       type: "data-ui",
       id: component.id,
       data: {
@@ -3250,9 +3352,19 @@ function storedMessageToUiMessage(message) {
         props: component.props,
         ...component.version !== void 0 ? {
           version: component.version
+        } : {},
+        ...component.toolCallId !== void 0 ? {
+          toolCallId: component.toolCallId
         } : {}
       }
-    });
+    };
+    if (component.toolCallId !== void 0 && toolCallIds.has(component.toolCallId)) {
+      const list = pushedByCall.get(component.toolCallId) ?? [];
+      list.push(part);
+      pushedByCall.set(component.toolCallId, list);
+    } else {
+      parts.push(part);
+    }
   }
   for (const approval of message.approvals ?? []) {
     parts.push({
@@ -3323,6 +3435,7 @@ function storedMessageToUiMessage(message) {
         input: call.input
       }
     });
+    parts.push(...pushedByCall.get(call.id) ?? []);
   }
   return {
     id: message.id,
@@ -3757,6 +3870,7 @@ __name(mergeHeaders, "mergeHeaders");
   approvalCountdown,
   backgroundRunsFromThread,
   buildTranscriptBlocks,
+  coerceAnswer,
   correctedCallIds,
   createSkillsSource,
   describeTimestamp,
@@ -3789,6 +3903,8 @@ __name(mergeHeaders, "mergeHeaders");
   useSpeechRecognition,
   useStickToBottom,
   useToolCatalog,
-  useTranscriptItem
+  useTranscriptItem,
+  validateAnswer,
+  validateAnswerValue
 });
 //# sourceMappingURL=index.cjs.map