glitchgrab 1.36.0 → 1.37.0

package/dist/index.js

@@ -1318,6 +1318,7 @@ function AssistSheet({
   onSeverityChange,
   showSeverity,
   onDuplicateChange,
+  onConversationChange,
   isSubmitting,
   submitted,
   onSend,
@@ -1365,7 +1366,10 @@ function AssistSheet({
       onDegrade(result.degraded);
       return;
     }
-    if (result.conversationId) setConversationId(result.conversationId);
+    if (result.conversationId) {
+      setConversationId(result.conversationId);
+      onConversationChange == null ? void 0 : onConversationChange(result.conversationId);
+    }
     setDuplicate((_a = result.duplicate) != null ? _a : null);
     onDuplicateChange == null ? void 0 : onDuplicateChange((_c = (_b = result.duplicate) == null ? void 0 : _b.number) != null ? _c : null);
     if (result.solved) {
@@ -1535,20 +1539,24 @@ function AssistSheet({
                         "button",
                         {
                           type: "button",
+                          "data-gg-write-myself": "",
                           onClick: onClose,
-                          "aria-label": "Close and write it myself",
+                          "aria-label": "Write it myself instead",
                           style: {
                             flexShrink: 0,
-                            border: "none",
+                            border: `1px solid ${t2.inputBorder}`,
+                            borderRadius: "999px",
                             background: "transparent",
                             color: t2.textMuted,
                             cursor: "pointer",
-                            fontSize: narrow ? "18px" : "12px",
+                            fontSize: "11.5px",
                             lineHeight: 1,
                             fontFamily: "inherit",
-                            padding: narrow ? "4px 6px" : "6px 4px"
+                            whiteSpace: "nowrap",
+                            // ~32px tall either way — this is the escape hatch, not a hint.
+                            padding: "9px 11px"
                           },
-                          children: narrow ? "\xD7" : "Write it myself"
+                          children: "Write it myself"
                         }
                       )
                     ]
@@ -2106,7 +2114,7 @@ function AssistSheet({
                     )
                   }
                 ),
-                !submitted && phase !== "type" && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+                !submitted && phase !== "type" && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
                   "div",
                   {
                     style: {
@@ -2116,134 +2124,157 @@ function AssistSheet({
                       paddingBottom: narrow ? "max(12px, env(safe-area-inset-bottom))" : "12px",
                       backgroundColor: t2.bg
                     },
-                    children: phase === "solved" ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-                      "button",
-                      {
-                        type: "button",
-                        "data-gg-sheet-send": "",
-                        onClick: () => (onFinish != null ? onFinish : onClose)(),
-                        style: {
-                          width: "100%",
-                          padding: "12px",
-                          borderRadius: "10px",
-                          border: "none",
-                          backgroundColor: t2.accent,
-                          color: t2.accentText,
-                          fontSize: "14px",
-                          fontWeight: 700,
-                          fontFamily: "inherit",
-                          cursor: "pointer"
-                        },
-                        children: "Done"
-                      }
-                    ) : phase === "rating" ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-                      "button",
-                      {
-                        type: "button",
-                        "data-gg-sheet-send": "",
-                        onClick: onSend,
-                        disabled: isSubmitting || rating < 1,
-                        style: {
-                          width: "100%",
-                          padding: "12px",
-                          borderRadius: "10px",
-                          border: "none",
-                          backgroundColor: isSubmitting || rating < 1 ? t2.bgSecondary : "#f59e0b",
-                          color: isSubmitting || rating < 1 ? t2.textMuted : "#1a1a1a",
-                          fontSize: "14px",
-                          fontWeight: 700,
-                          fontFamily: "inherit",
-                          cursor: isSubmitting || rating < 1 ? "default" : "pointer"
-                        },
-                        children: isSubmitting ? "Sending\u2026" : rating < 1 ? "Pick a star first" : "Send Rating"
-                      }
-                    ) : phase === "draft" ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-                      "button",
-                      {
-                        type: "button",
-                        "data-gg-sheet-send": "",
-                        onClick: onSend,
-                        disabled: isSubmitting || !description.trim(),
-                        style: {
-                          width: "100%",
-                          padding: "12px",
-                          borderRadius: "10px",
-                          border: "none",
-                          backgroundColor: isSubmitting || !description.trim() ? t2.bgSecondary : t2.accent,
-                          color: isSubmitting || !description.trim() ? t2.textMuted : t2.accentText,
-                          fontSize: "14px",
-                          fontWeight: 700,
-                          fontFamily: "inherit",
-                          cursor: isSubmitting || !description.trim() ? "default" : "pointer"
-                        },
-                        children: isSubmitting ? "Sending\u2026" : duplicate ? `Add to #${duplicate.number}` : "Send Report"
-                      }
-                    ) : /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { style: { display: "flex", gap: "8px", alignItems: "flex-end" }, children: [
-                      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-                        "textarea",
+                    children: [
+                      phase === "solved" ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+                        "button",
                         {
-                          ref: inputRef,
-                          value: input,
-                          onChange: (e) => setInput(e.target.value),
-                          onKeyDown: (e) => {
-                            if (e.key === "Enter" && !e.shiftKey) {
-                              e.preventDefault();
-                              send(input);
-                            }
+                          type: "button",
+                          "data-gg-sheet-send": "",
+                          onClick: () => (onFinish != null ? onFinish : onClose)(),
+                          style: {
+                            width: "100%",
+                            padding: "12px",
+                            borderRadius: "10px",
+                            border: "none",
+                            backgroundColor: t2.accent,
+                            color: t2.accentText,
+                            fontSize: "14px",
+                            fontWeight: 700,
+                            fontFamily: "inherit",
+                            cursor: "pointer"
                           },
-                          placeholder: "Type your answer\u2026",
-                          rows: 1,
-                          disabled: busy,
-                          autoFocus: true,
+                          children: "Done"
+                        }
+                      ) : phase === "rating" ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+                        "button",
+                        {
+                          type: "button",
+                          "data-gg-sheet-send": "",
+                          onClick: onSend,
+                          disabled: isSubmitting || rating < 1,
                           style: {
-                            flex: 1,
-                            minHeight: "42px",
-                            maxHeight: "120px",
-                            padding: "11px 12px",
+                            width: "100%",
+                            padding: "12px",
                             borderRadius: "10px",
-                            border: `1px solid ${t2.inputBorder}`,
-                            backgroundColor: t2.inputBg,
-                            color: t2.text,
-                            fontSize: "13px",
-                            lineHeight: 1.4,
+                            border: "none",
+                            backgroundColor: isSubmitting || rating < 1 ? t2.bgSecondary : "#f59e0b",
+                            color: isSubmitting || rating < 1 ? t2.textMuted : "#1a1a1a",
+                            fontSize: "14px",
+                            fontWeight: 700,
                             fontFamily: "inherit",
-                            resize: "none",
-                            outline: "none",
-                            boxSizing: "border-box"
-                          }
+                            cursor: isSubmitting || rating < 1 ? "default" : "pointer"
+                          },
+                          children: isSubmitting ? "Sending\u2026" : rating < 1 ? "Pick a star first" : "Send Rating"
                         }
-                      ),
-                      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+                      ) : phase === "draft" ? /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
                         "button",
                         {
                           type: "button",
                           "data-gg-sheet-send": "",
-                          onClick: () => send(input),
-                          disabled: busy || !input.trim(),
-                          "aria-label": "Send message",
+                          onClick: onSend,
+                          disabled: isSubmitting || !description.trim(),
                           style: {
-                            flexShrink: 0,
-                            width: "42px",
-                            height: "42px",
+                            width: "100%",
+                            padding: "12px",
                             borderRadius: "10px",
                             border: "none",
-                            display: "inline-flex",
-                            alignItems: "center",
-                            justifyContent: "center",
-                            backgroundColor: busy || !input.trim() ? t2.bgSecondary : t2.accent,
-                            color: busy || !input.trim() ? t2.textMuted : t2.accentText,
-                            cursor: busy || !input.trim() ? "default" : "pointer"
+                            backgroundColor: isSubmitting || !description.trim() ? t2.bgSecondary : t2.accent,
+                            color: isSubmitting || !description.trim() ? t2.textMuted : t2.accentText,
+                            fontSize: "14px",
+                            fontWeight: 700,
+                            fontFamily: "inherit",
+                            cursor: isSubmitting || !description.trim() ? "default" : "pointer"
                           },
-                          children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("svg", { width: "17", height: "17", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-                            "path",
-                            {
-                              d: "M3 20.5L21.5 12 3 3.5V10l12 2-12 2v6.5z",
-                              fill: "currentColor"
+                          children: isSubmitting ? "Sending\u2026" : duplicate ? `Add to #${duplicate.number}` : "Send Report"
+                        }
+                      ) : /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { style: { display: "flex", gap: "8px", alignItems: "flex-end" }, children: [
+                        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+                          "textarea",
+                          {
+                            ref: inputRef,
+                            value: input,
+                            onChange: (e) => setInput(e.target.value),
+                            onKeyDown: (e) => {
+                              if (e.key === "Enter" && !e.shiftKey) {
+                                e.preventDefault();
+                                send(input);
+                              }
+                            },
+                            placeholder: "Type your answer\u2026",
+                            rows: 1,
+                            disabled: busy,
+                            autoFocus: true,
+                            style: {
+                              flex: 1,
+                              minHeight: "42px",
+                              maxHeight: "120px",
+                              padding: "11px 12px",
+                              borderRadius: "10px",
+                              border: `1px solid ${t2.inputBorder}`,
+                              backgroundColor: t2.inputBg,
+                              color: t2.text,
+                              fontSize: "13px",
+                              lineHeight: 1.4,
+                              fontFamily: "inherit",
+                              resize: "none",
+                              outline: "none",
+                              boxSizing: "border-box"
                             }
-                          ) })
+                          }
+                        ),
+                        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+                          "button",
+                          {
+                            type: "button",
+                            "data-gg-sheet-send": "",
+                            onClick: () => send(input),
+                            disabled: busy || !input.trim(),
+                            "aria-label": "Send message",
+                            "data-gg-send-message": "",
+                            style: {
+                              flexShrink: 0,
+                              width: "42px",
+                              height: "42px",
+                              borderRadius: "10px",
+                              border: "none",
+                              display: "inline-flex",
+                              alignItems: "center",
+                              justifyContent: "center",
+                              backgroundColor: busy || !input.trim() ? t2.bgSecondary : t2.accent,
+                              color: busy || !input.trim() ? t2.textMuted : t2.accentText,
+                              cursor: busy || !input.trim() ? "default" : "pointer"
+                            },
+                            children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("svg", { width: "17", height: "17", viewBox: "0 0 24 24", fill: "none", "aria-hidden": "true", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+                              "path",
+                              {
+                                d: "M3 20.5L21.5 12 3 3.5V10l12 2-12 2v6.5z",
+                                fill: "currentColor"
+                              }
+                            ) })
+                          }
+                        )
+                      ] }),
+                      phase === "chat" && messages.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+                        "button",
+                        {
+                          type: "button",
+                          "data-gg-write-myself": "",
+                          onClick: onClose,
+                          style: {
+                            display: "block",
+                            margin: "8px auto 0",
+                            border: "none",
+                            background: "transparent",
+                            color: t2.textMuted,
+                            fontSize: "11.5px",
+                            fontFamily: "inherit",
+                            padding: "6px 8px",
+                            cursor: "pointer"
+                          },
+                          children: "Not getting it? Fill the form yourself \u2192"
                         }
                       )
-                    ] })
+                    ]
                   }
                 )
               ]
@@ -2615,6 +2646,7 @@ function ReportDialog({
   const [assistUsed, setAssistUsed] = (0, import_react.useState)(false);
   const [typeChosen, setTypeChosen] = (0, import_react.useState)(false);
   const [duplicateIssueNumber, setDuplicateIssueNumber] = (0, import_react.useState)(null);
+  const [aiConversationId, setAiConversationId] = (0, import_react.useState)(null);
   const [isEnhanced, setIsEnhanced] = (0, import_react.useState)(false);
   const [originalDescription, setOriginalDescription] = (0, import_react.useState)(
     null
@@ -2667,6 +2699,10 @@ function ReportDialog({
   const sarvamChunksRef = (0, import_react.useRef)([]);
   const spaceTimerRef = (0, import_react.useRef)(null);
   const isPushToTalkRef = (0, import_react.useRef)(false);
+  const spaceEditsRef = (0, import_react.useRef)(0);
+  const descriptionRef = (0, import_react.useRef)("");
+  const lastVoiceTextRef = (0, import_react.useRef)(null);
+  const hadWebSpeechRef = (0, import_react.useRef)(false);
   (0, import_react.useEffect)(() => {
     if (!isOpen) return;
     const HOST_LAYERS = '[role="dialog"],[role="alertdialog"],[role="menu"],[role="listbox"]';
@@ -2927,6 +2963,22 @@ function ReportDialog({
     }, 3e3);
     return () => clearInterval(id);
   }, [isOpen, transcribeAudio2]);
+  (0, import_react.useEffect)(() => {
+    descriptionRef.current = description;
+  }, [description]);
+  const rebaseVoiceOnUserEdits = () => {
+    var _a2;
+    const live = descriptionRef.current;
+    const baseline = (_a2 = lastVoiceTextRef.current) != null ? _a2 : textBeforeVoiceRef.current;
+    if (live === baseline) return;
+    voiceBaseRef.current = live;
+    textBeforeVoiceRef.current = live;
+  };
+  const setDescriptionFromVoice = (text) => {
+    lastVoiceTextRef.current = text;
+    descriptionRef.current = text;
+    setDescription(text);
+  };
   const stopVoice = () => {
     var _a2, _b2;
     usingWebSpeechRef.current = false;
@@ -2993,6 +3045,8 @@ function ReportDialog({
       stopListeningAndTranscribe();
       return;
     }
+    lastVoiceTextRef.current = null;
+    hadWebSpeechRef.current = false;
     const SpeechRec = typeof window !== "undefined" ? window.SpeechRecognition || window.webkitSpeechRecognition : void 0;
     let stream = null;
     try {
@@ -3007,13 +3061,14 @@ function ReportDialog({
     if (stream && transcribeAudio2) {
       streamRef.current = stream;
       sarvamChunksRef.current = [];
-      textBeforeVoiceRef.current = description;
+      textBeforeVoiceRef.current = descriptionRef.current;
       const rec = new MediaRecorder(stream);
       mediaRecorderRef.current = rec;
       rec.ondataavailable = (e) => {
         if (e.data.size > 0) sarvamChunksRef.current.push(e.data);
       };
       rec.onstop = async () => {
+        var _a2;
         stream.getTracks().forEach((t22) => t22.stop());
         if (streamRef.current === stream) streamRef.current = null;
         mediaRecorderRef.current = null;
@@ -3025,11 +3080,18 @@ function ReportDialog({
           const blob = new Blob(chunks, { type: rec.mimeType || "audio/webm" });
           const text = await transcribeAudio2(blob);
           if (text.trim()) {
-            const sep = textBeforeVoiceRef.current.trim() ? " " : "";
-            setDescription(textBeforeVoiceRef.current + sep + text.trim());
-            setValidationError(null);
-            setIsEnhanced(false);
-            setOriginalDescription(null);
+            const live = descriptionRef.current;
+            const baseline = (_a2 = lastVoiceTextRef.current) != null ? _a2 : textBeforeVoiceRef.current;
+            const userEdited = live !== baseline;
+            if (userEdited && hadWebSpeechRef.current) {
+            } else {
+              const base = userEdited ? live : textBeforeVoiceRef.current;
+              const sep = base.trim() ? " " : "";
+              setDescriptionFromVoice(base + sep + text.trim());
+              setValidationError(null);
+              setIsEnhanced(false);
+              setOriginalDescription(null);
+            }
           }
         } catch (e) {
         }
@@ -3040,8 +3102,9 @@ function ReportDialog({
     if (SpeechRec) {
       setVoiceError(null);
       usingWebSpeechRef.current = true;
-      voiceBaseRef.current = description;
-      textBeforeVoiceRef.current = description;
+      hadWebSpeechRef.current = true;
+      voiceBaseRef.current = descriptionRef.current;
+      textBeforeVoiceRef.current = descriptionRef.current;
       const recognition = new SpeechRec();
       recognition.lang = "en-IN";
       recognition.interimResults = true;
@@ -3056,12 +3119,13 @@ function ReportDialog({
           if (event.results[i].isFinal) finalText += text;
           else interimText += text;
         }
+        rebaseVoiceOnUserEdits();
         if (finalText) {
           const sep = voiceBaseRef.current.trim() ? " " : "";
           voiceBaseRef.current += sep + finalText.trim();
         }
         const liveText = interimText ? voiceBaseRef.current + (voiceBaseRef.current.trim() ? " " : "") + interimText : voiceBaseRef.current;
-        setDescription(liveText);
+        setDescriptionFromVoice(liveText);
         setValidationError(null);
       };
       recognition.onend = () => {
@@ -3088,37 +3152,54 @@ function ReportDialog({
       setIsListening(true);
     }
   };
+  const cancelPushToTalkArm = () => {
+    if (!spaceTimerRef.current) return;
+    clearTimeout(spaceTimerRef.current);
+    spaceTimerRef.current = null;
+  };
+  const notePushToTalkEdit = () => {
+    if (!spaceTimerRef.current) return;
+    spaceEditsRef.current += 1;
+    if (spaceEditsRef.current > 1) cancelPushToTalkArm();
+  };
   const handleSpaceDown = (e) => {
-    var _a2;
-    if (e.code !== "Space") return;
+    if (e.code !== "Space") {
+      if (!e.metaKey && !e.ctrlKey && !e.altKey) cancelPushToTalkArm();
+      return;
+    }
     if (isListening || isPushToTalkRef.current) {
       e.preventDefault();
       return;
     }
     if (e.repeat || !transcribeAudio2 || isTranscribing || spaceTimerRef.current)
       return;
-    const pos = (_a2 = e.currentTarget.selectionStart) != null ? _a2 : description.length;
+    if (e.currentTarget.value !== "") return;
+    spaceEditsRef.current = 0;
     spaceTimerRef.current = setTimeout(() => {
+      var _a2;
       spaceTimerRef.current = null;
       isPushToTalkRef.current = true;
-      setDescription(
-        (prev) => prev[pos] === " " ? prev.slice(0, pos) + prev.slice(pos + 1) : prev
-      );
-      requestAnimationFrame(() => {
-        if (textareaRef.current) {
-          textareaRef.current.selectionStart = pos;
-          textareaRef.current.selectionEnd = pos;
-        }
-      });
+      const el = textareaRef.current;
+      const caret = (_a2 = el == null ? void 0 : el.selectionStart) != null ? _a2 : null;
+      if (el && caret !== null && caret === el.selectionEnd && el.value[caret - 1] === " ") {
+        const cut = caret - 1;
+        setDescription(
+          (prev) => prev[cut] === " " ? prev.slice(0, cut) + prev.slice(cut + 1) : prev
+        );
+        descriptionRef.current = descriptionRef.current.slice(0, cut) + descriptionRef.current.slice(cut + 1);
+        requestAnimationFrame(() => {
+          if (textareaRef.current) {
+            textareaRef.current.selectionStart = cut;
+            textareaRef.current.selectionEnd = cut;
+          }
+        });
+      }
       void toggleVoice();
     }, 400);
   };
   const handleSpaceUp = (e) => {
     if (e.code !== "Space") return;
-    if (spaceTimerRef.current) {
-      clearTimeout(spaceTimerRef.current);
-      spaceTimerRef.current = null;
-    }
+    cancelPushToTalkArm();
     if (isPushToTalkRef.current) {
       isPushToTalkRef.current = false;
       stopListeningAndTranscribe();
@@ -3166,6 +3247,9 @@ function ReportDialog({
       if (duplicateIssueNumber) {
         metadata.duplicateIssueNumber = String(duplicateIssueNumber);
       }
+      if (aiConversationId) {
+        metadata.aiConversationId = aiConversationId;
+      }
       const result = await report(
         // The RATING branch returned above, so anything reaching here is a real
         // ReportType — the widened tile union can't leak into the report API.
@@ -3178,6 +3262,8 @@ function ReportDialog({
         setDescription("");
         setScreenshots([]);
         setAttachments([]);
+        setAiConversationId(null);
+        setDuplicateIssueNumber(null);
         setTimeout(() => {
           setSubmitted(false);
           handleClose();
@@ -3800,6 +3886,7 @@ function ReportDialog({
                               ref: textareaRef,
                               value: description,
                               onChange: (e) => {
+                                notePushToTalkEdit();
                                 setDescription(e.target.value);
                                 if (validationError) setValidationError(null);
                                 if (isEnhanced) {
@@ -4917,6 +5004,7 @@ function ReportDialog({
           setStep(2);
         },
         onDuplicateChange: setDuplicateIssueNumber,
+        onConversationChange: setAiConversationId,
         onFinish: handleClose,
         rating,
         onRatingChange: (value) => {
@@ -5936,6 +6024,12 @@ function GlitchgrabProviderInner({
       return assistTurn(
         {
           ...params,
+          // Same identity the report itself carries, from the same prop.
+          reporter: session ? {
+            key: session.userId,
+            name: session.name ? String(session.name) : null,
+            email: session.email ? String(session.email) : null
+          } : void 0,
           context: {
             ...(_a = params.context) != null ? _a : {},
             url: ctx.url,
@@ -5947,7 +6041,7 @@ function GlitchgrabProviderInner({
         baseUrl
       );
     },
-    [token, baseUrl]
+    [token, baseUrl, session]
   );
   const transcribe = (0, import_react5.useCallback)(
     async (blob) => {