npm - @yushaw/sanqian-chat - Versions diffs - 0.2.30 → 0.2.33 - Mend

@yushaw/sanqian-chat 0.2.30 → 0.2.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/renderer/index.js CHANGED Viewed

@@ -5991,7 +5991,7 @@ function createIpcAdapter() {
         onEvent({ ...event, stream_id: streamId });
       });
       try {
-        await api.stream({
+        const streamPromise = api.stream({
           streamId,
           messages,
           conversationId,
@@ -5999,6 +5999,11 @@ function createIpcAdapter() {
           attachedResources: options?.attachedResources,
           sessionResources: options?.sessionResources
         });
+        void streamPromise.catch((e) => {
+          streamCallbacks.delete(streamId);
+          const errorMessage = e instanceof Error ? e.message : "Stream error";
+          onEvent({ type: "error", error: errorMessage, stream_id: streamId });
+        });
         return {
           cancel: async () => {
             await api.cancelStream({ streamId });
@@ -7895,6 +7900,7 @@ var ChatInput = (0, import_react23.memo)(
     const textareaRef = (0, import_react23.useRef)(null);
     const submitInFlightRef = (0, import_react23.useRef)(false);
     const inputRevisionRef = (0, import_react23.useRef)(0);
+    const buttonActionRef = (0, import_react23.useRef)(null);
     const canSend = (text.trim().length > 0 || allowEmptySubmit) && !disabled && !isLoading;
     const showStopButton = isStreaming && !!onStop;
     const showSpinner = isLoading && !showStopButton;
@@ -7943,6 +7949,28 @@ var ChatInput = (0, import_react23.memo)(
       },
       [text, canSend, onSend]
     );
+    const handleActionPointerDown = (0, import_react23.useCallback)(
+      (_e) => {
+        buttonActionRef.current = showStopButton ? "stop" : "send";
+      },
+      [showStopButton]
+    );
+    const clearButtonAction = (0, import_react23.useCallback)(() => {
+      buttonActionRef.current = null;
+    }, []);
+    const handleActionClick = (0, import_react23.useCallback)(
+      (e) => {
+        const action = buttonActionRef.current ?? (showStopButton ? "stop" : "send");
+        buttonActionRef.current = null;
+        if (action === "stop") {
+          e.preventDefault();
+          onStop?.();
+          return;
+        }
+        void handleSubmit(e);
+      },
+      [showStopButton, onStop, handleSubmit]
+    );
     const handleKeyDown = (0, import_react23.useCallback)(
       (e) => {
         if (e.key === "Enter" && !e.shiftKey && !e.nativeEvent.isComposing) {
@@ -8001,8 +8029,11 @@ var ChatInput = (0, import_react23.memo)(
             /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
               "button",
               {
-                type: showStopButton ? "button" : "submit",
-                onClick: showStopButton ? onStop : void 0,
+                type: "button",
+                onPointerDown: handleActionPointerDown,
+                onPointerCancel: clearButtonAction,
+                onBlur: clearButtonAction,
+                onClick: handleActionClick,
                 disabled: !showStopButton && !canSend,
                 className: "chat-input-send-btn",
                 "aria-label": showStopButton ? stopLabel : sendLabel,
@@ -8233,7 +8264,6 @@ var HitlCard = (0, import_react24.memo)(function HitlCard2({
     borderColor: "rgba(220, 38, 38, 0.45)",
     boxShadow: "0 0 0 2px rgba(220, 38, 38, 0.11)"
   } : void 0;
-  const requiredHintStyle = isDarkMode ? { color: "rgba(252, 165, 165, 0.92)" } : { color: "rgba(185, 28, 28, 0.84)" };
   return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
     "div",
     {
@@ -8282,74 +8312,46 @@ var HitlCard = (0, import_react24.memo)(function HitlCard2({
               /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("code", { className: "text-[10px]", children: JSON.stringify(interrupt.args, null, 0) })
             ] })
           ] }),
-          isUserInput && interrupt.options && interrupt.options.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { className: "space-y-1.5", children: [
-            interrupt.options.map((option, index) => {
-              const isSelected = selectedIndices.includes(index);
-              const optionStyle = isSelected ? isDarkMode ? { borderColor: "rgba(96, 165, 250, 0.75)", background: "rgba(59, 130, 246, 0.24)" } : { borderColor: "rgba(37, 99, 235, 0.36)", background: "rgba(239, 246, 255, 0.98)" } : isDarkMode ? { borderColor: "rgba(113, 113, 122, 0.6)", background: "rgba(9, 9, 11, 0.84)" } : { borderColor: "rgba(113, 113, 122, 0.34)", background: "rgba(250, 250, 250, 0.96)" };
-              return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
-                "label",
-                {
-                  className: `flex cursor-pointer items-center gap-2 rounded p-2 transition-colors ${isSelected ? isDarkMode ? "border-blue-500/50 bg-blue-500/20" : "border-blue-200 bg-blue-50" : `${inputBg} border-transparent hover:border-zinc-300`} border`,
-                  style: optionStyle,
-                  children: [
-                    /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
-                      "input",
-                      {
-                        type: interrupt.multi_select ? "checkbox" : "radio",
-                        name: "hitl-options",
-                        checked: isSelected,
-                        onChange: () => handleOptionToggle(index),
-                        style: optionControlStyle
-                      }
-                    ),
-                    /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("span", { className: `text-sm ${textPrimary} break-words ${isSelected ? "font-semibold" : "font-medium"}`, children: option })
-                  ]
-                },
-                index
-              );
-            }),
-            /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: "min-h-[18px]", children: /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
-              "div",
-              {
-                className: `flex items-center gap-1 text-xs transition-all duration-150 ${showRequiredError ? "translate-y-0 opacity-100" : "-translate-y-1 opacity-0"}`,
-                style: requiredHintStyle,
-                "aria-live": "polite",
-                children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("span", { className: "inline-block h-1.5 w-1.5 rounded-full bg-current opacity-75" }),
-                  /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("span", { children: t.requiredField })
-                ]
-              }
-            ) })
-          ] }),
-          isUserInput && (!interrupt.options || interrupt.options.length === 0) && /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", { children: [
-            /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
-              "input",
+          isUserInput && interrupt.options && interrupt.options.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: "space-y-1.5", children: interrupt.options.map((option, index) => {
+            const isSelected = selectedIndices.includes(index);
+            const optionStyle = isSelected ? isDarkMode ? { borderColor: "rgba(96, 165, 250, 0.75)", background: "rgba(59, 130, 246, 0.24)" } : { borderColor: "rgba(37, 99, 235, 0.36)", background: "rgba(239, 246, 255, 0.98)" } : isDarkMode ? { borderColor: "rgba(113, 113, 122, 0.6)", background: "rgba(9, 9, 11, 0.84)" } : { borderColor: "rgba(113, 113, 122, 0.34)", background: "rgba(250, 250, 250, 0.96)" };
+            return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
+              "label",
               {
-                ref: inputRef,
-                type: "text",
-                value: answer,
-                onChange: (e) => handleAnswerChange(e.target.value),
-                onKeyDown: handleKeyDown,
-                onCompositionStart: () => setIsComposing(true),
-                onCompositionEnd: () => setIsComposing(false),
-                placeholder: interrupt.default ? `${t.defaultPrefix}: ${interrupt.default}` : t.enterResponse,
-                className: `w-full rounded-lg border px-3 py-2 text-sm ${inputBorder} ${inputBg} ${textPrimary} placeholder:${textSecondary} ${showRequiredError ? "focus:border-red-400 focus:ring-red-400/25" : "focus:border-blue-500 focus:ring-blue-500/40"} focus:outline-none focus:ring-2`,
-                style: inputValidationStyle
-              }
-            ),
-            /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { className: "mt-1 min-h-[18px]", children: /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
-              "div",
-              {
-                className: `flex items-center gap-1 text-xs transition-all duration-150 ${showRequiredError ? "translate-y-0 opacity-100" : "-translate-y-1 opacity-0"}`,
-                style: requiredHintStyle,
-                "aria-live": "polite",
+                className: `flex cursor-pointer items-center gap-2 rounded p-2 transition-colors ${isSelected ? isDarkMode ? "border-blue-500/50 bg-blue-500/20" : "border-blue-200 bg-blue-50" : `${inputBg} border-transparent hover:border-zinc-300`} border`,
+                style: optionStyle,
                 children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("span", { className: "inline-block h-1.5 w-1.5 rounded-full bg-current opacity-75" }),
-                  /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("span", { children: t.requiredField })
+                  /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+                    "input",
+                    {
+                      type: interrupt.multi_select ? "checkbox" : "radio",
+                      name: "hitl-options",
+                      checked: isSelected,
+                      onChange: () => handleOptionToggle(index),
+                      style: optionControlStyle
+                    }
+                  ),
+                  /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("span", { className: `text-sm ${textPrimary} break-words ${isSelected ? "font-semibold" : "font-medium"}`, children: option })
                 ]
-              }
-            ) })
-          ] }),
+              },
+              index
+            );
+          }) }),
+          isUserInput && (!interrupt.options || interrupt.options.length === 0) && /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime12.jsx)(
+            "input",
+            {
+              ref: inputRef,
+              type: "text",
+              value: answer,
+              onChange: (e) => handleAnswerChange(e.target.value),
+              onKeyDown: handleKeyDown,
+              onCompositionStart: () => setIsComposing(true),
+              onCompositionEnd: () => setIsComposing(false),
+              placeholder: interrupt.default ? `${t.defaultPrefix}: ${interrupt.default}` : t.enterResponse,
+              className: `w-full rounded-lg border px-3 py-2 text-sm ${inputBorder} ${inputBg} ${textPrimary} placeholder:${textSecondary} ${showRequiredError ? "focus:border-red-400 focus:ring-red-400/25" : "focus:border-blue-500 focus:ring-blue-500/40"} focus:outline-none focus:ring-2`,
+              style: inputValidationStyle
+            }
+          ) }),
           isApproval && /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)(
             "label",
             {

package/dist/renderer/index.mjs CHANGED Viewed

@@ -5903,7 +5903,7 @@ function createIpcAdapter() {
         onEvent({ ...event, stream_id: streamId });
       });
       try {
-        await api.stream({
+        const streamPromise = api.stream({
           streamId,
           messages,
           conversationId,
@@ -5911,6 +5911,11 @@ function createIpcAdapter() {
           attachedResources: options?.attachedResources,
           sessionResources: options?.sessionResources
         });
+        void streamPromise.catch((e) => {
+          streamCallbacks.delete(streamId);
+          const errorMessage = e instanceof Error ? e.message : "Stream error";
+          onEvent({ type: "error", error: errorMessage, stream_id: streamId });
+        });
         return {
           cancel: async () => {
             await api.cancelStream({ streamId });
@@ -7823,6 +7828,7 @@ var ChatInput = memo7(
     const textareaRef = useRef9(null);
     const submitInFlightRef = useRef9(false);
     const inputRevisionRef = useRef9(0);
+    const buttonActionRef = useRef9(null);
     const canSend = (text.trim().length > 0 || allowEmptySubmit) && !disabled && !isLoading;
     const showStopButton = isStreaming && !!onStop;
     const showSpinner = isLoading && !showStopButton;
@@ -7871,6 +7877,28 @@ var ChatInput = memo7(
       },
       [text, canSend, onSend]
     );
+    const handleActionPointerDown = useCallback14(
+      (_e) => {
+        buttonActionRef.current = showStopButton ? "stop" : "send";
+      },
+      [showStopButton]
+    );
+    const clearButtonAction = useCallback14(() => {
+      buttonActionRef.current = null;
+    }, []);
+    const handleActionClick = useCallback14(
+      (e) => {
+        const action = buttonActionRef.current ?? (showStopButton ? "stop" : "send");
+        buttonActionRef.current = null;
+        if (action === "stop") {
+          e.preventDefault();
+          onStop?.();
+          return;
+        }
+        void handleSubmit(e);
+      },
+      [showStopButton, onStop, handleSubmit]
+    );
     const handleKeyDown = useCallback14(
       (e) => {
         if (e.key === "Enter" && !e.shiftKey && !e.nativeEvent.isComposing) {
@@ -7929,8 +7957,11 @@ var ChatInput = memo7(
             /* @__PURE__ */ jsx11(
               "button",
               {
-                type: showStopButton ? "button" : "submit",
-                onClick: showStopButton ? onStop : void 0,
+                type: "button",
+                onPointerDown: handleActionPointerDown,
+                onPointerCancel: clearButtonAction,
+                onBlur: clearButtonAction,
+                onClick: handleActionClick,
                 disabled: !showStopButton && !canSend,
                 className: "chat-input-send-btn",
                 "aria-label": showStopButton ? stopLabel : sendLabel,
@@ -8161,7 +8192,6 @@ var HitlCard = memo8(function HitlCard2({
     borderColor: "rgba(220, 38, 38, 0.45)",
     boxShadow: "0 0 0 2px rgba(220, 38, 38, 0.11)"
   } : void 0;
-  const requiredHintStyle = isDarkMode ? { color: "rgba(252, 165, 165, 0.92)" } : { color: "rgba(185, 28, 28, 0.84)" };
   return /* @__PURE__ */ jsxs6(
     "div",
     {
@@ -8210,74 +8240,46 @@ var HitlCard = memo8(function HitlCard2({
               /* @__PURE__ */ jsx12("code", { className: "text-[10px]", children: JSON.stringify(interrupt.args, null, 0) })
             ] })
           ] }),
-          isUserInput && interrupt.options && interrupt.options.length > 0 && /* @__PURE__ */ jsxs6("div", { className: "space-y-1.5", children: [
-            interrupt.options.map((option, index) => {
-              const isSelected = selectedIndices.includes(index);
-              const optionStyle = isSelected ? isDarkMode ? { borderColor: "rgba(96, 165, 250, 0.75)", background: "rgba(59, 130, 246, 0.24)" } : { borderColor: "rgba(37, 99, 235, 0.36)", background: "rgba(239, 246, 255, 0.98)" } : isDarkMode ? { borderColor: "rgba(113, 113, 122, 0.6)", background: "rgba(9, 9, 11, 0.84)" } : { borderColor: "rgba(113, 113, 122, 0.34)", background: "rgba(250, 250, 250, 0.96)" };
-              return /* @__PURE__ */ jsxs6(
-                "label",
-                {
-                  className: `flex cursor-pointer items-center gap-2 rounded p-2 transition-colors ${isSelected ? isDarkMode ? "border-blue-500/50 bg-blue-500/20" : "border-blue-200 bg-blue-50" : `${inputBg} border-transparent hover:border-zinc-300`} border`,
-                  style: optionStyle,
-                  children: [
-                    /* @__PURE__ */ jsx12(
-                      "input",
-                      {
-                        type: interrupt.multi_select ? "checkbox" : "radio",
-                        name: "hitl-options",
-                        checked: isSelected,
-                        onChange: () => handleOptionToggle(index),
-                        style: optionControlStyle
-                      }
-                    ),
-                    /* @__PURE__ */ jsx12("span", { className: `text-sm ${textPrimary} break-words ${isSelected ? "font-semibold" : "font-medium"}`, children: option })
-                  ]
-                },
-                index
-              );
-            }),
-            /* @__PURE__ */ jsx12("div", { className: "min-h-[18px]", children: /* @__PURE__ */ jsxs6(
-              "div",
-              {
-                className: `flex items-center gap-1 text-xs transition-all duration-150 ${showRequiredError ? "translate-y-0 opacity-100" : "-translate-y-1 opacity-0"}`,
-                style: requiredHintStyle,
-                "aria-live": "polite",
-                children: [
-                  /* @__PURE__ */ jsx12("span", { className: "inline-block h-1.5 w-1.5 rounded-full bg-current opacity-75" }),
-                  /* @__PURE__ */ jsx12("span", { children: t.requiredField })
-                ]
-              }
-            ) })
-          ] }),
-          isUserInput && (!interrupt.options || interrupt.options.length === 0) && /* @__PURE__ */ jsxs6("div", { children: [
-            /* @__PURE__ */ jsx12(
-              "input",
+          isUserInput && interrupt.options && interrupt.options.length > 0 && /* @__PURE__ */ jsx12("div", { className: "space-y-1.5", children: interrupt.options.map((option, index) => {
+            const isSelected = selectedIndices.includes(index);
+            const optionStyle = isSelected ? isDarkMode ? { borderColor: "rgba(96, 165, 250, 0.75)", background: "rgba(59, 130, 246, 0.24)" } : { borderColor: "rgba(37, 99, 235, 0.36)", background: "rgba(239, 246, 255, 0.98)" } : isDarkMode ? { borderColor: "rgba(113, 113, 122, 0.6)", background: "rgba(9, 9, 11, 0.84)" } : { borderColor: "rgba(113, 113, 122, 0.34)", background: "rgba(250, 250, 250, 0.96)" };
+            return /* @__PURE__ */ jsxs6(
+              "label",
               {
-                ref: inputRef,
-                type: "text",
-                value: answer,
-                onChange: (e) => handleAnswerChange(e.target.value),
-                onKeyDown: handleKeyDown,
-                onCompositionStart: () => setIsComposing(true),
-                onCompositionEnd: () => setIsComposing(false),
-                placeholder: interrupt.default ? `${t.defaultPrefix}: ${interrupt.default}` : t.enterResponse,
-                className: `w-full rounded-lg border px-3 py-2 text-sm ${inputBorder} ${inputBg} ${textPrimary} placeholder:${textSecondary} ${showRequiredError ? "focus:border-red-400 focus:ring-red-400/25" : "focus:border-blue-500 focus:ring-blue-500/40"} focus:outline-none focus:ring-2`,
-                style: inputValidationStyle
-              }
-            ),
-            /* @__PURE__ */ jsx12("div", { className: "mt-1 min-h-[18px]", children: /* @__PURE__ */ jsxs6(
-              "div",
-              {
-                className: `flex items-center gap-1 text-xs transition-all duration-150 ${showRequiredError ? "translate-y-0 opacity-100" : "-translate-y-1 opacity-0"}`,
-                style: requiredHintStyle,
-                "aria-live": "polite",
+                className: `flex cursor-pointer items-center gap-2 rounded p-2 transition-colors ${isSelected ? isDarkMode ? "border-blue-500/50 bg-blue-500/20" : "border-blue-200 bg-blue-50" : `${inputBg} border-transparent hover:border-zinc-300`} border`,
+                style: optionStyle,
                 children: [
-                  /* @__PURE__ */ jsx12("span", { className: "inline-block h-1.5 w-1.5 rounded-full bg-current opacity-75" }),
-                  /* @__PURE__ */ jsx12("span", { children: t.requiredField })
+                  /* @__PURE__ */ jsx12(
+                    "input",
+                    {
+                      type: interrupt.multi_select ? "checkbox" : "radio",
+                      name: "hitl-options",
+                      checked: isSelected,
+                      onChange: () => handleOptionToggle(index),
+                      style: optionControlStyle
+                    }
+                  ),
+                  /* @__PURE__ */ jsx12("span", { className: `text-sm ${textPrimary} break-words ${isSelected ? "font-semibold" : "font-medium"}`, children: option })
                 ]
-              }
-            ) })
-          ] }),
+              },
+              index
+            );
+          }) }),
+          isUserInput && (!interrupt.options || interrupt.options.length === 0) && /* @__PURE__ */ jsx12("div", { children: /* @__PURE__ */ jsx12(
+            "input",
+            {
+              ref: inputRef,
+              type: "text",
+              value: answer,
+              onChange: (e) => handleAnswerChange(e.target.value),
+              onKeyDown: handleKeyDown,
+              onCompositionStart: () => setIsComposing(true),
+              onCompositionEnd: () => setIsComposing(false),
+              placeholder: interrupt.default ? `${t.defaultPrefix}: ${interrupt.default}` : t.enterResponse,
+              className: `w-full rounded-lg border px-3 py-2 text-sm ${inputBorder} ${inputBg} ${textPrimary} placeholder:${textSecondary} ${showRequiredError ? "focus:border-red-400 focus:ring-red-400/25" : "focus:border-blue-500 focus:ring-blue-500/40"} focus:outline-none focus:ring-2`,
+              style: inputValidationStyle
+            }
+          ) }),
           isApproval && /* @__PURE__ */ jsxs6(
             "label",
             {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@yushaw/sanqian-chat",
-  "version": "0.2.30",
+  "version": "0.2.33",
   "description": "Floating chat window SDK for Sanqian AI Assistant",
   "main": "./dist/main/index.js",
   "types": "./dist/main/index.d.ts",