glitchgrab 1.46.0 → 1.47.0

package/dist/index.js

@@ -747,7 +747,7 @@ async function findSimilarIssues(description, token, baseUrl, identity) {
   }
 }
 async function assistTurn(params, token, baseUrl) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
   const offline = {
     conversationId: null,
     question: null,
@@ -781,8 +781,9 @@ async function assistTurn(params, token, baseUrl) {
       options: (_g = (_f = envelope.data) == null ? void 0 : _f.options) != null ? _g : [],
       report: (_i = (_h = envelope.data) == null ? void 0 : _h.report) != null ? _i : null,
       duplicate: (_k = (_j = envelope.data) == null ? void 0 : _j.duplicate) != null ? _k : null,
-      solved: (_m = (_l = envelope.data) == null ? void 0 : _l.solved) != null ? _m : null,
-      aboutGlitchgrab: ((_n = envelope.data) == null ? void 0 : _n.aboutGlitchgrab) === true,
+      related: (_m = (_l = envelope.data) == null ? void 0 : _l.related) != null ? _m : null,
+      solved: (_o = (_n = envelope.data) == null ? void 0 : _n.solved) != null ? _o : null,
+      aboutGlitchgrab: ((_p = envelope.data) == null ? void 0 : _p.aboutGlitchgrab) === true,
       degraded: null
     };
   } catch (e) {
@@ -1639,7 +1640,7 @@ function AssistSheet({
     onDegrade(message, retryable);
   }
   async function runTurn(history2) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     setBusy(true);
     let result;
     const events = takeEvents();
@@ -1683,8 +1684,9 @@ function AssistSheet({
       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);
+    const attach = result.duplicate ? { ...result.duplicate, kind: "duplicate" } : result.related ? { ...result.related, kind: "related" } : null;
+    setDuplicate(attach);
+    onDuplicateChange == null ? void 0 : onDuplicateChange((_a = attach == null ? void 0 : attach.number) != null ? _a : null, attach == null ? void 0 : attach.kind);
     setGlitchgrabOffer(!!result.aboutGlitchgrab && !!onReportGlitchgrabProblem && !!result.question);
     if (result.solved) {
       setSolved(result.solved);
@@ -1703,7 +1705,7 @@ function AssistSheet({
     }
     if (result.question) {
       setMessages([...history2, { role: "assistant", content: result.question }]);
-      setOptions((_d = result.options) != null ? _d : []);
+      setOptions((_b = result.options) != null ? _b : []);
       return;
     }
     onDegrade("The assistant had nothing to add \u2014 write your report below and send it as normal.");
@@ -1776,15 +1778,15 @@ function AssistSheet({
           minWidth: 0
         },
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { style: { color: t2.text, fontWeight: 600 }, children: title ? "Our team is already on this" : `Our team is already on #${duplicate.number}` }),
+          /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { style: { color: t2.text, fontWeight: 600 }, children: duplicate.kind === "related" ? title ? "Your request goes onto this issue" : `Connected to #${duplicate.number}` : title ? "Our team is already on this" : `Our team is already on #${duplicate.number}` }),
           title && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("span", { style: { color: t2.textMuted, wordBreak: "break-word" }, children: [
             "#",
             duplicate.number,
             " ",
             duplicate.title
           ] }),
-          duplicate.status && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { style: { color: t2.text, fontWeight: 600 }, children: duplicate.status }),
-          footer && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { style: { color: t2.textMuted }, children: footer })
+          duplicate.status && duplicate.kind !== "related" && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { style: { color: t2.text, fontWeight: 600 }, children: duplicate.status }),
+          footer && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { style: { color: t2.textMuted }, children: duplicate.kind === "related" ? "Added as a separate request on it, not a repeat \u2014 the team sees both." : footer })
         ]
       }
     );
@@ -2454,7 +2456,7 @@ function AssistSheet({
                                       textTransform: "uppercase",
                                       color: t2.accent
                                     },
-                                    children: duplicate ? `What we'll add to #${duplicate.number} \xB7 edit anything` : "Your report \xB7 edit anything"
+                                    children: duplicate ? `What we'll add to #${duplicate.number}${duplicate.kind === "related" ? " as a related request" : ""} \xB7 edit anything` : "Your report \xB7 edit anything"
                                   }
                                 ),
                                 renderKnownIssue({
@@ -4000,6 +4002,8 @@ function ReportDialog({
   const [selfReportPrefill, setSelfReportPrefill] = (0, import_react.useState)("");
   const [typeChosen, setTypeChosen] = (0, import_react.useState)(false);
   const [duplicateIssueNumber, setDuplicateIssueNumber] = (0, import_react.useState)(null);
+  const [duplicateKind, setDuplicateKind] = (0, import_react.useState)("duplicate");
+  const [addedAsRelated, setAddedAsRelated] = (0, import_react.useState)(false);
   const [similarIssues, setSimilarIssues] = (0, import_react.useState)(null);
   const [checkingSimilar, setCheckingSimilar] = (0, import_react.useState)(false);
   const [attachingTo, setAttachingTo] = (0, import_react.useState)(null);
@@ -4436,6 +4440,7 @@ function ReportDialog({
     setReportType("BUG");
     setTypeChosen(false);
     setDuplicateIssueNumber(null);
+    setDuplicateKind("duplicate");
     setSimilarIssues(null);
     setPickedSimilar(null);
     setCheckingSimilar(false);
@@ -4628,7 +4633,7 @@ function ReportDialog({
     }
   };
   const handleSubmit = async (opts) => {
-    var _a2, _b;
+    var _a2, _b, _c;
     try {
       if (isSubmitting) return;
       if (isRating) {
@@ -4666,6 +4671,7 @@ function ReportDialog({
         return;
       }
       const duplicateOf = (_a2 = opts == null ? void 0 : opts.duplicateOf) != null ? _a2 : duplicateIssueNumber;
+      const attachKind = (opts == null ? void 0 : opts.duplicateOf) ? (_b = opts.kind) != null ? _b : "duplicate" : duplicateKind;
       if (findSimilarIssues2 && !(opts == null ? void 0 : opts.skipSimilar) && !duplicateOf && !aiConversationId) {
         setIsSubmitting(true);
         setCheckingSimilar(true);
@@ -4701,6 +4707,7 @@ function ReportDialog({
       }
       if (duplicateOf) {
         metadata.duplicateIssueNumber = String(duplicateOf);
+        if (attachKind === "related") metadata.duplicateKind = "related";
       }
       if (aiConversationId) {
         metadata.aiConversationId = aiConversationId;
@@ -4714,14 +4721,16 @@ function ReportDialog({
       );
       if (result) {
         setAddedToIssue(duplicateOf && result.issueNumber === duplicateOf ? duplicateOf : null);
+        setAddedAsRelated(!!duplicateOf && result.issueNumber === duplicateOf && attachKind === "related");
         const queued = result.status === "QUEUED" && !!result.message;
-        setQueuedMessage(queued ? (_b = result.message) != null ? _b : null : null);
+        setQueuedMessage(queued ? (_c = result.message) != null ? _c : null : null);
         setSubmitted(true);
         setDescription("");
         setScreenshots([]);
         setAttachments([]);
         setAiConversationId(null);
         setDuplicateIssueNumber(null);
+        setDuplicateKind("duplicate");
         setSimilarIssues(null);
         setPickedSimilar(null);
         setTimeout(() => {
@@ -5049,7 +5058,7 @@ function ReportDialog({
                             },
                             children: queuedMessage
                           }
-                        ) : addedToIssue ? `Added to #${addedToIssue}. Thank you!` : `${getTypeLabel(reportType)} sent. Thank you!`
+                        ) : addedToIssue ? `Added to #${addedToIssue}${addedAsRelated ? " as a related request" : ""}. Thank you!` : `${getTypeLabel(reportType)} sent. Thank you!`
                       }
                     ) : /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_jsx_runtime4.Fragment, { children: [
                       step === 1 && headerSlot ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { style: { marginBottom: "14px" }, children: headerSlot }) : null,
@@ -6294,8 +6303,8 @@ function ReportDialog({
                               },
                               children: [
                                 /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { style: { display: "flex", flexDirection: "column", gap: "2px" }, children: [
-                                  /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { style: { color: t2.text, fontWeight: 600, fontSize: "13px" }, children: "Our team may already have this" }),
-                                  /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { style: { color: t2.textMuted, fontSize: "12px", lineHeight: 1.5 }, children: similarIssues.length > 1 ? "Pick the one that matches \u2014 your report is added to it, so the team sees everyone hitting it in one place." : "If it's the same problem, pick it \u2014 your report is added to it, so the team sees everyone hitting it in one place." })
+                                  /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { style: { color: t2.text, fontWeight: 600, fontSize: "13px" }, children: "Our team may already have this, or something close" }),
+                                  /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("span", { style: { color: t2.textMuted, fontSize: "12px", lineHeight: 1.5 }, children: similarIssues.length > 1 ? "Pick the one that matches. Same problem, or a different request for the same feature \u2014 it's added to that issue, so the team has it in one place." : "Same problem, or a different request for the same feature? Pick it \u2014 it's added to that issue, so the team has it in one place." })
                                 ] }),
                                 /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
                                   "div",
@@ -6400,7 +6409,8 @@ function ReportDialog({
                                       if (!pickedSimilar) return;
                                       setAttachingTo(pickedSimilar);
                                       setDuplicateIssueNumber(pickedSimilar);
-                                      void handleSubmit({ duplicateOf: pickedSimilar });
+                                      setDuplicateKind("duplicate");
+                                      void handleSubmit({ duplicateOf: pickedSimilar, kind: "duplicate" });
                                     },
                                     style: {
                                       width: "100%",
@@ -6415,7 +6425,7 @@ function ReportDialog({
                                       cursor: isSubmitting || !pickedSimilar ? "not-allowed" : "pointer",
                                       fontFamily: "inherit"
                                     },
-                                    children: typeof attachingTo === "number" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_jsx_runtime4.Fragment, { children: [
+                                    children: typeof attachingTo === "number" && duplicateKind !== "related" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_jsx_runtime4.Fragment, { children: [
                                       /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(ButtonSpinner, {}),
                                       "Adding to #",
                                       attachingTo,
@@ -6423,6 +6433,39 @@ function ReportDialog({
                                     ] }) : pickedSimilar ? `Add to #${pickedSimilar}` : "Pick the matching issue"
                                   }
                                 ),
+                                pickedSimilar && /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
+                                  "button",
+                                  {
+                                    type: "button",
+                                    disabled: isSubmitting,
+                                    onClick: () => {
+                                      setAttachingTo(pickedSimilar);
+                                      setDuplicateIssueNumber(pickedSimilar);
+                                      setDuplicateKind("related");
+                                      void handleSubmit({ duplicateOf: pickedSimilar, kind: "related" });
+                                    },
+                                    style: {
+                                      width: "100%",
+                                      minHeight: "40px",
+                                      marginTop: "-4px",
+                                      padding: "9px 10px",
+                                      borderRadius: "8px",
+                                      border: "1px solid rgba(245,158,11,0.4)",
+                                      backgroundColor: "transparent",
+                                      color: isSubmitting ? t2.textMuted : t2.text,
+                                      fontSize: "13px",
+                                      fontWeight: 600,
+                                      cursor: isSubmitting ? "not-allowed" : "pointer",
+                                      fontFamily: "inherit"
+                                    },
+                                    children: typeof attachingTo === "number" && duplicateKind === "related" ? /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_jsx_runtime4.Fragment, { children: [
+                                      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(ButtonSpinner, {}),
+                                      "Adding to #",
+                                      attachingTo,
+                                      "\u2026"
+                                    ] }) : `Related request \u2014 add to #${pickedSimilar}`
+                                  }
+                                ),
                                 /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
                                   "button",
                                   {
@@ -6769,7 +6812,10 @@ function ReportDialog({
           setTypeChosen(true);
           setStep(2);
         },
-        onDuplicateChange: setDuplicateIssueNumber,
+        onDuplicateChange: (issueNumber, kind) => {
+          setDuplicateIssueNumber(issueNumber);
+          setDuplicateKind(issueNumber && kind === "related" ? "related" : "duplicate");
+        },
         onConversationChange: setAiConversationId,
         onFinish: handleClose,
         rating,