@springbrand/message-panel 0.2.0-alpha.50 → 0.2.0-alpha.51

package/cloud-os/chat/rich-blocks.tsx

@@ -146,6 +146,7 @@ interface AskQuestion {
   prompt: string;
   options: string[];
   allowCustom: boolean;
+  required: boolean;
   responseType: "text" | "single_select" | "multi_select" | "attachment";
 }
 
@@ -176,6 +177,7 @@ function questionsOf(input: Record<string, unknown>): AskQuestion[] {
         : "Choose an option",
       options,
       allowCustom: responseType === "text" || question.allowCustom === true,
+      required: question.required === true,
       responseType,
     };
   });
@@ -436,19 +438,25 @@ export function AskUserBlock({
   };
   // 服务端已经结算 = 这张卡永久不可操作，不管结算成什么。
   const resolved = outcome.kind !== "pending" || inFlight;
-  const valid = questions.length > 0 && questions.every(
-    (question, index) => question.responseType === "attachment"
-      ? Boolean(
-          attachmentField &&
-          attachmentField.attachments.length > 0 &&
-          !attachmentField.busy &&
-          !attachmentField.hasFailure
-        )
-      : question.responseType === "text"
-      ? Boolean(answerAt(index).text.trim())
-      : answerAt(index).selections.length > 0 ||
-        (question.allowCustom && Boolean(answerAt(index).text.trim())),
-  );
+  const valid = questions.length > 0 && questions.every((question, index) => {
+    const answer = answerAt(index);
+    const attachmentCount = question.responseType === "attachment"
+      ? attachmentField?.attachments.length ?? 0
+      : 0;
+    if (
+      !question.required && attachmentCount === 0 &&
+      answer.selections.length === 0 && !answer.text.trim()
+    ) return true;
+    if (question.responseType === "attachment") {
+      return Boolean(
+        attachmentCount > 0 && attachmentField &&
+        !attachmentField.busy && !attachmentField.hasFailure,
+      );
+    }
+    if (question.responseType === "text") return Boolean(answer.text.trim());
+    return answer.selections.length > 0 ||
+      (question.allowCustom && Boolean(answer.text.trim()));
+  });
   const buttonLabel = inFlight ? "Submitting…" : "Submit";
   const footnote = outcome.kind === "closed"
       ? outcome.reason === "user_replied_freeform"
@@ -525,6 +533,9 @@ export function AskUserBlock({
             >
               <p className="m-0 text-[14px] leading-[1.4] font-normal text-kumo-default">
                 {question.prompt}
+                {!question.required && (
+                  <span className="ml-1 text-kumo-inactive">Optional</span>
+                )}
               </p>
               {question.responseType === "attachment" && (
                 <AskUserAttachmentField

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@springbrand/message-panel",
-  "version": "0.2.0-alpha.50",
+  "version": "0.2.0-alpha.51",
   "type": "module",
   "files": [
     "src",

package/src/camel/camel-chat-messages.tsx

@@ -705,10 +705,14 @@ function CamelAskUser({
   const resolvedSubmitted = settledAnswers.length > 0;
   const valid = questions.length > 0 && questions.every((question, index) => {
     const responseType = askUserResponseType(question);
+    const answer = answerAt(index);
+    if (
+      answer.selections.length === 0 && !answer.text.trim()
+    ) return question.required !== true;
     if (responseType === "attachment") return false;
-    if (responseType === "text") return Boolean(answerAt(index).text.trim());
-    return answerAt(index).selections.length > 0 ||
-      (question.allowCustom === true && Boolean(answerAt(index).text.trim()));
+    if (responseType === "text") return Boolean(answer.text.trim());
+    return answer.selections.length > 0 ||
+      (question.allowCustom === true && Boolean(answer.text.trim()));
   });
 
   return (
@@ -745,7 +749,12 @@ function CamelAskUser({
           : [];
         return (
           <div className="space-y-2" key={`${prompt}:${questionIndex}`}>
-            <p className="text-sm text-foreground">{prompt}</p>
+            <p className="text-sm text-foreground">
+              {prompt}
+              {question.required !== true && (
+                <span className="ml-1 text-muted-foreground">Optional</span>
+              )}
+            </p>
             {attachmentQuestion && settledAttachments.length === 0 && (
               <p className="text-xs text-muted-foreground">
                 File upload is unavailable in this preview.
@@ -842,9 +851,7 @@ function CamelAskUser({
       <Button
         type="button"
         size="sm"
-        disabled={resolvedSubmitted || !valid || questions.some((question) =>
-          askUserResponseType(question) === "attachment"
-        )}
+        disabled={resolvedSubmitted || !valid}
         onClick={() => {
           onAnswer({
             answers: questions.map((_, index) => ({

package/src/parts/index.tsx

@@ -837,6 +837,7 @@ export interface AskQuestion {
   responseType: "text" | "single_select" | "multi_select" | "attachment";
   options?: string[];
   allowCustom?: boolean;
+  required?: boolean;
 }
 
 function askQuestionResponseType(question: AskQuestion) {
@@ -878,10 +879,14 @@ export function AskUserPart({
   const valid = questions.length > 0 && questions.every(
     (question, index) => {
       const responseType = askQuestionResponseType(question);
+      const answer = answerAt(index);
+      if (
+        answer.selections.length === 0 && !answer.text.trim()
+      ) return question.required !== true;
       if (responseType === "attachment") return false;
-      if (responseType === "text") return Boolean(answerAt(index).text.trim());
-      return answerAt(index).selections.length > 0 ||
-        (question.allowCustom === true && Boolean(answerAt(index).text.trim()));
+      if (responseType === "text") return Boolean(answer.text.trim());
+      return answer.selections.length > 0 ||
+        (question.allowCustom === true && Boolean(answer.text.trim()));
     },
   );
   const toggle = (questionIndex: number, option: string) => {
@@ -933,7 +938,10 @@ export function AskUserPart({
             key={`${questionIndex}:${question.question}`}
             disabled={resolvedSubmitted || inFlight || !onSubmit}
           >
-            <legend>{question.question}</legend>
+            <legend>
+              {question.question}
+              {question.required !== true && <span> Optional</span>}
+            </legend>
             <div>
               {choice && (question.options ?? []).map((option) => {
                 const selected = submittedAnswers[questionIndex]