@dxos/plugin-thread 0.8.3 → 0.8.4-main.1f223c7

package/dist/lib/browser/{chunk-PG5CTFKK.mjs → chunk-ZH2WPTNP.mjs}

@@ -1,53 +1,63 @@
 import {
   ThreadAction,
   ThreadType
-} from "./chunk-AEXWNS6Z.mjs";
+} from "./chunk-KTWYVC5X.mjs";
 import {
   ChannelContainer
-} from "./chunk-XZKBN3NS.mjs";
+} from "./chunk-7W7QK5ZP.mjs";
 import {
   ThreadCapabilities
-} from "./chunk-R5MDLUPC.mjs";
+} from "./chunk-4APCDRSH.mjs";
 import {
   MessageContainer,
+  buttonClassNames,
+  buttonGroupClassNames,
   command
-} from "./chunk-TAFSCSUR.mjs";
+} from "./chunk-PBMNFG3B.mjs";
 import {
   useStatus
-} from "./chunk-5P5BH5GE.mjs";
+} from "./chunk-RI3Z6MK3.mjs";
 import {
   getMessageMetadata
-} from "./chunk-JKQUJOTX.mjs";
+} from "./chunk-GERVMFQW.mjs";
 import {
-  THREAD_PLUGIN
-} from "./chunk-IIUTBDVB.mjs";
+  meta
+} from "./chunk-EV4JWI7L.mjs";
 
-// packages/plugins/plugin-thread/src/components/CallDebugPanel.tsx
+// src/components/CallDebugPanel.tsx
 import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
 import { WebRTCStats } from "@peermetrics/webrtc-stats";
 import React, { useEffect, useMemo, useState } from "react";
-import { Panel } from "@dxos/devtools";
+import { truncateKey } from "@dxos/debug";
+import { JsonView, Panel } from "@dxos/devtools";
 import { log } from "@dxos/log";
-import { Input, useTranslation } from "@dxos/react-ui";
-import { Json } from "@dxos/react-ui-syntax-highlighter";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-thread/src/components/CallDebugPanel.tsx";
+import { IconButton, Input, useTranslation } from "@dxos/react-ui";
+var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-thread/src/components/CallDebugPanel.tsx";
 var CallDebugPanel = ({ state }) => {
   var _effect = _useSignals();
   try {
-    const users = state?.call?.users;
-    const self = state?.call?.self;
-    const { t } = useTranslation(THREAD_PLUGIN);
+    const { t } = useTranslation(meta.id);
     const [open, setOpen] = useState(false);
     const handleToggle = () => setOpen(!open);
+    const [showServiceHistory, setShowServiceHistory] = useState(false);
+    const handleToggleServiceHistory = () => setShowServiceHistory(!showServiceHistory);
+    const handleCopyRaw = async () => {
+      await navigator.clipboard.writeText(JSON.stringify({
+        users: state?.call?.users,
+        stats
+      }, null, 2));
+    };
     const [showDetailedWebRTCStats, setShowDetailedWebRTCStats] = useState(false);
     const handleShowDetailedWebRTCStats = () => setShowDetailedWebRTCStats(!showDetailedWebRTCStats);
     const webrtcStats = useMemo(() => new WebRTCStats({
       getStatsInterval: 1e3
     }), []);
-    const [stats, setStats] = useState({});
+    const [stats, setStats] = useState();
     useEffect(() => {
       const pc = state?.media.peer?.session?.peerConnection;
-      const handleStats = (stats2) => setStats(stats2.data);
+      const handleStats = (stats2) => {
+        setStats(stats2.data);
+      };
       let added = false;
       if (pc && showDetailedWebRTCStats) {
         webrtcStats.addConnection({
@@ -74,7 +84,7 @@ var CallDebugPanel = ({ state }) => {
             connectionId: "1"
           }, {
             F: __dxlog_file,
-            L: 55,
+            L: 62,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -84,6 +94,10 @@ var CallDebugPanel = ({ state }) => {
       state?.media.peer?.session?.peerConnection,
       showDetailedWebRTCStats
     ]);
+    const rows = useMemo(() => getCallStatusTable(state), [
+      state?.call.users,
+      state?.media.pulledAudioTracks
+    ]);
     return /* @__PURE__ */ React.createElement(Panel, {
       id: "meeting-status",
       icon: "ph--video-conference--regular",
@@ -93,53 +107,111 @@ var CallDebugPanel = ({ state }) => {
       maxHeight: false,
       info: /* @__PURE__ */ React.createElement("div", {
         className: "flex items-center gap-2"
-      }, /* @__PURE__ */ React.createElement("span", {
-        title: "Joined"
-      }, self?.joined ? "Active" : "Inactive"), users?.length !== void 0 && /* @__PURE__ */ React.createElement("span", {
-        title: "Users"
-      }, users?.length ?? 0, " User(s)"))
+      }, " ", state?.call.joined ? "Active" : "Inactive")
     }, /* @__PURE__ */ React.createElement("div", {
-      className: "flex flex-col gap-2 overflow-y-auto"
+      className: "flex flex-col w-full gap-2 text-xs"
     }, /* @__PURE__ */ React.createElement("div", {
-      className: "flex items-row gap-2"
+      className: "flex items-center gap-2"
     }, /* @__PURE__ */ React.createElement(Input.Root, null, /* @__PURE__ */ React.createElement(Input.Label, {
       classNames: "text-sm"
     }, t("show webrtc stats title")), /* @__PURE__ */ React.createElement(Input.Checkbox, {
       checked: showDetailedWebRTCStats,
       onCheckedChange: handleShowDetailedWebRTCStats
-    }))), /* @__PURE__ */ React.createElement(Json, {
+    }))), /* @__PURE__ */ React.createElement("div", {
+      className: "flex items-center gap-2"
+    }, /* @__PURE__ */ React.createElement(Input.Root, null, /* @__PURE__ */ React.createElement(Input.Label, {
+      classNames: "text-sm"
+    }, t("show calls history title")), /* @__PURE__ */ React.createElement(Input.Checkbox, {
+      checked: showServiceHistory,
+      onCheckedChange: handleToggleServiceHistory
+    }))), /* @__PURE__ */ React.createElement("div", {
+      className: "flex items-center gap-2"
+    }, /* @__PURE__ */ React.createElement(IconButton, {
       classNames: "text-sm",
+      icon: "ph--copy--regular",
+      label: "copy raw",
+      onClick: handleCopyRaw
+    })), /* @__PURE__ */ React.createElement(Table, {
+      rows
+    }), showDetailedWebRTCStats && /* @__PURE__ */ React.createElement(JsonView, {
       data: {
-        users,
-        activities: state?.call?.activities,
-        ...showDetailedWebRTCStats ? {
-          webrtc: {
-            connectionState: state?.media.peer?.session?.peerConnection.connectionState,
-            iceConnectionState: state?.media.peer?.session?.peerConnection.iceConnectionState,
-            stats
-          }
-        } : {},
-        tracks: state?.media.peer?.session?.peerConnection.getTransceivers().map((transceiver) => {
-          const track = transceiver.direction === "recvonly" ? transceiver.receiver.track : transceiver.sender.track;
-          return {
-            id: track?.id,
-            kind: track?.kind,
-            direction: transceiver.direction,
-            enabled: track?.enabled,
-            muted: track?.muted,
-            readyState: track?.readyState,
-            settings: track?.getSettings()
-          };
-        }),
-        callsServiceHistory: state?.media.peer?.history.get()
+        stats
+      }
+    }), showServiceHistory && /* @__PURE__ */ React.createElement(JsonView, {
+      data: {
+        history: state?.media.peer?.history.get()
       }
     })));
   } finally {
     _effect.f();
   }
 };
+var getCallStatusTable = (state) => {
+  if (!state || !state.call?.users) {
+    return [];
+  }
+  const self = state.call.self;
+  const users = state.call.users.filter((user) => user.id !== self.id).map((user) => {
+    const isOk = {
+      audio: user.tracks?.audio && state.media.pulledAudioTracks[user.tracks?.audio]?.ctx.disposed === false,
+      video: user.tracks?.video && state.media.pulledVideoStreams[user.tracks?.video]?.ctx.disposed === false,
+      screenshare: user.tracks?.screenshare && state.media.pulledVideoStreams[user.tracks?.screenshare]?.ctx.disposed === false
+    };
+    return {
+      ...user,
+      isOk
+    };
+  });
+  return [
+    [
+      "users",
+      state.call.users.length ?? 0
+    ],
+    [
+      "*self* " + (self?.name ?? truncateKey(self.id, 8)),
+      self?.tracks?.audio && state.media.pushedAudioTrack ? "AUD \u2705" : "AUD \u274C",
+      self?.tracks?.video && state.media.pushedVideoTrack ? "VID \u2705" : "VID \u274C",
+      self?.tracks?.screenshareEnabled ? self.tracks.screenshareEnabled && state.media.pushedScreenshareTrack ? "SCR \u2705" : "SCR \u274C" : void 0
+    ],
+    ...users.map((user) => [
+      user.name ?? truncateKey(user.id, 8),
+      user.isOk.audio ? "AUD \u2705" : "AUD \u274C",
+      user.isOk.video ? "VID \u2705" : "VID \u274C",
+      user.tracks?.screenshareEnabled ? user.isOk.screenshare ? "SCR \u2705" : "SCR \u274C" : void 0
+    ]),
+    [
+      "ICE",
+      state.media.peer?.session?.peerConnection.iceConnectionState ?? "no connection"
+    ]
+  ];
+};
+(function(Unit2) {
+  Unit2.KB = (n) => ((n ?? 0) / 1e3).toFixed(2);
+})(Unit || (Unit = {}));
+var Table = ({ rows }) => {
+  var _effect = _useSignals();
+  try {
+    return /* @__PURE__ */ React.createElement("div", {
+      className: "w-full text-xs font-mono"
+    }, rows.map(([prefix, label, value, unit], i) => /* @__PURE__ */ React.createElement("div", {
+      key: i,
+      className: "grid grid-cols-[3fr_1fr_1fr_1fr]"
+    }, /* @__PURE__ */ React.createElement("div", {
+      className: "p-1"
+    }, prefix), /* @__PURE__ */ React.createElement("div", {
+      className: "p-1"
+    }, label), /* @__PURE__ */ React.createElement("div", {
+      className: "p-1"
+    }, value), /* @__PURE__ */ React.createElement("div", {
+      className: "p-1"
+    }, unit))));
+  } finally {
+    _effect.f();
+  }
+};
+var Unit;
 
-// packages/plugins/plugin-thread/src/components/CallSidebar.tsx
+// src/components/CallSidebar.tsx
 import { useSignals as _useSignals2 } from "@preact-signals/safe-react/tracking";
 import React2 from "react";
 import { useCapability } from "@dxos/app-framework";
@@ -155,100 +227,51 @@ var CallSidebar = () => {
   }
 };
 
-// packages/plugins/plugin-thread/src/components/ThreadComplementary.tsx
+// src/components/ThreadComplementary.tsx
 import { useSignals as _useSignals6 } from "@preact-signals/safe-react/tracking";
 import React6, { useCallback as useCallback2, useMemo as useMemo3 } from "react";
-import { Capabilities, LayoutAction, createIntent, useCapability as useCapability2, useCapabilities, useIntentDispatcher } from "@dxos/app-framework";
+import { Capabilities, CollaborationActions, LayoutAction, createIntent, useCapabilities, useCapability as useCapability2, useIntentDispatcher } from "@dxos/app-framework";
 import { Filter, Obj, Query, Relation as Relation3 } from "@dxos/echo";
-import { fullyQualifiedId as fullyQualifiedId3, getSpace as getSpace2, useQuery } from "@dxos/react-client/echo";
+import { Ref as Ref2, fullyQualifiedId as fullyQualifiedId3, getSpace as getSpace2, useQuery } from "@dxos/react-client/echo";
 import { useIdentity as useIdentity2 } from "@dxos/react-client/halo";
 import { useThemeContext as useThemeContext2, useTranslation as useTranslation4 } from "@dxos/react-ui";
 import { useAttended } from "@dxos/react-ui-attention";
 import { StackItem } from "@dxos/react-ui-stack";
 import { Tabs } from "@dxos/react-ui-tabs";
+import { mx as mx2 } from "@dxos/react-ui-theme";
 import { AnchoredTo } from "@dxos/schema";
 
-// packages/plugins/plugin-thread/src/components/index.ts
+// src/components/index.ts
 import { lazy } from "react";
 
-// packages/plugins/plugin-thread/src/components/CommentContainer.tsx
+// src/components/CommentsContainer.tsx
+import { useSignals as _useSignals4 } from "@preact-signals/safe-react/tracking";
+import React4, { useEffect as useEffect2 } from "react";
+import { Relation as Relation2 } from "@dxos/echo";
+import { fullyQualifiedId as fullyQualifiedId2 } from "@dxos/react-client/echo";
+import { Callout, Icon, Trans, useTranslation as useTranslation3 } from "@dxos/react-ui";
+
+// src/components/CommentsThreadContainer.tsx
 import { useSignals as _useSignals3 } from "@preact-signals/safe-react/tracking";
-import { CheckCircle, X } from "@phosphor-icons/react";
 import React3, { useCallback, useMemo as useMemo2, useRef, useState as useState2 } from "react";
-import { Relation } from "@dxos/echo";
-import { RefArray } from "@dxos/live-object";
+import { Ref, Relation } from "@dxos/echo";
 import { fullyQualifiedId, getSpace, useMembers } from "@dxos/react-client/echo";
 import { useIdentity } from "@dxos/react-client/halo";
-import { Button, Tag, Tooltip, useThemeContext, useTranslation as useTranslation2 } from "@dxos/react-ui";
+import { IconButton as IconButton2, Tag, Tooltip, useThemeContext, useTranslation as useTranslation2 } from "@dxos/react-ui";
 import { createBasicExtensions, createThemeExtensions, listener } from "@dxos/react-ui-editor";
-import { getSize, hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from "@dxos/react-ui-theme";
-import { MessageTextbox, Thread, ThreadFooter, ThreadHeading } from "@dxos/react-ui-thread";
+import { hoverableControlItem, hoverableControls, hoverableFocusedWithinControls, mx } from "@dxos/react-ui-theme";
+import { MessageTextbox, Thread } from "@dxos/react-ui-thread";
 import { isNonNullable } from "@dxos/util";
-var sizeClass = getSize(4);
-var commentControlClassNames = "!p-1 !min-bs-0 transition-opacity";
-var ToggleResolvedButton = ({ isResolved, onResolve }) => {
-  var _effect = _useSignals3();
-  try {
-    const { t } = useTranslation2(THREAD_PLUGIN);
-    const label = t(isResolved ? "mark as unresolved label" : "mark as resolved label");
-    return /* @__PURE__ */ React3.createElement(Tooltip.Trigger, {
-      asChild: true,
-      content: label
-    }, /* @__PURE__ */ React3.createElement(Button, {
-      variant: "ghost",
-      "data-testid": "thread.toggle-resolved",
-      onClick: onResolve,
-      classNames: [
-        commentControlClassNames,
-        !isResolved && hoverableControlItem
-      ]
-    }, /* @__PURE__ */ React3.createElement("span", {
-      className: "sr-only"
-    }, label), isResolved ? /* @__PURE__ */ React3.createElement(CheckCircle, {
-      className: sizeClass,
-      weight: "fill"
-    }) : /* @__PURE__ */ React3.createElement(CheckCircle, {
-      className: sizeClass
-    })));
-  } finally {
-    _effect.f();
-  }
-};
-var DeleteThreadButton = ({ onDelete }) => {
-  var _effect = _useSignals3();
-  try {
-    const { t } = useTranslation2(THREAD_PLUGIN);
-    const label = t("delete thread label");
-    return /* @__PURE__ */ React3.createElement(Tooltip.Trigger, {
-      asChild: true,
-      content: label
-    }, /* @__PURE__ */ React3.createElement(Button, {
-      variant: "ghost",
-      "data-testid": "thread.delete",
-      onClick: onDelete,
-      classNames: [
-        commentControlClassNames,
-        hoverableControlItem
-      ]
-    }, /* @__PURE__ */ React3.createElement("span", {
-      className: "sr-only"
-    }, label), /* @__PURE__ */ React3.createElement(X, {
-      className: sizeClass
-    })));
-  } finally {
-    _effect.f();
-  }
-};
-var CommentContainer = ({ anchor, current, onAttend, onComment, onResolve, onMessageDelete, onThreadDelete }) => {
+var CommentsThreadContainer = ({ anchor, current, onAttend, onComment, onResolve, onMessageDelete, onThreadDelete, onAcceptProposal }) => {
   var _effect = _useSignals3();
   try {
+    const { t } = useTranslation2(meta.id);
     const identity = useIdentity();
     const space = getSpace(anchor);
     const members = useMembers(space?.key);
     const detached = !anchor.anchor;
     const thread = Relation.getSource(anchor);
     const activity = useStatus(space, fullyQualifiedId(thread));
-    const { t } = useTranslation2(THREAD_PLUGIN);
     const threadScrollRef = useRef(null);
     const { themeMode } = useThemeContext();
     const textboxMetadata = getMessageMetadata(fullyQualifiedId(thread), identity);
@@ -289,6 +312,10 @@ var CommentContainer = ({ anchor, current, onAttend, onComment, onResolve, onMes
       onThreadDelete,
       anchor
     ]);
+    const handleAcceptProposal = useCallback((id) => onAcceptProposal?.(anchor, id), [
+      onAcceptProposal,
+      anchor
+    ]);
     const handleComment = useCallback(() => {
       if (!messageRef.current) {
         return false;
@@ -302,11 +329,12 @@ var CommentContainer = ({ anchor, current, onAttend, onComment, onResolve, onMes
       anchor,
       identity
     ]);
-    return /* @__PURE__ */ React3.createElement(Thread, {
-      onClickCapture: handleAttend,
-      onFocusCapture: handleAttend,
+    return /* @__PURE__ */ React3.createElement(Thread.Root, {
+      id: fullyQualifiedId(thread),
+      classNames: "pbs-2 border-be border-subduedSeparator last:border-none",
       current,
-      id: fullyQualifiedId(thread)
+      onClickCapture: handleAttend,
+      onFocusCapture: handleAttend
     }, /* @__PURE__ */ React3.createElement("div", {
       role: "none",
       className: mx("col-span-2 grid grid-cols-[var(--rail-size)_1fr_min-content]", hoverableControls, hoverableFocusedWithinControls)
@@ -314,28 +342,47 @@ var CommentContainer = ({ anchor, current, onAttend, onComment, onResolve, onMes
       asChild: true,
       content: t("detached thread label"),
       side: "top"
-    }, /* @__PURE__ */ React3.createElement(ThreadHeading, {
+    }, /* @__PURE__ */ React3.createElement(Thread.Header, {
       detached: true
-    }, thread.name)) : /* @__PURE__ */ React3.createElement(ThreadHeading, null, thread.name), /* @__PURE__ */ React3.createElement("div", {
-      className: "flex flex-row items-center pli-1"
+    }, thread.name)) : /* @__PURE__ */ React3.createElement(Thread.Header, null, thread.name), /* @__PURE__ */ React3.createElement("div", {
+      role: "none",
+      className: buttonGroupClassNames
     }, thread.status === "staged" && /* @__PURE__ */ React3.createElement(Tag, {
       palette: "neutral"
-    }, t("draft button")), onResolve && !(thread?.status === "staged") && /* @__PURE__ */ React3.createElement(ToggleResolvedButton, {
-      isResolved: thread?.status === "resolved",
-      onResolve: handleResolve
-    }), onThreadDelete && /* @__PURE__ */ React3.createElement(DeleteThreadButton, {
-      onDelete: handleThreadDelete
-    }))), RefArray.targets(thread.messages?.filter(isNonNullable) ?? []).map((message) => /* @__PURE__ */ React3.createElement(MessageContainer, {
+    }, t("draft button")), onResolve && !(thread?.status === "staged") && /* @__PURE__ */ React3.createElement(IconButton2, {
+      "data-testid": "thread.resolve",
+      variant: "ghost",
+      icon: thread?.status === "resolved" ? "ph--check--fill" : "ph--check--regular",
+      iconOnly: true,
+      label: t("resolve thread label"),
+      classNames: [
+        buttonClassNames,
+        thread?.status !== "resolved" && hoverableControlItem
+      ],
+      onClick: handleResolve
+    }), onThreadDelete && /* @__PURE__ */ React3.createElement(IconButton2, {
+      "data-testid": "thread.delete",
+      variant: "ghost",
+      icon: "ph--x--regular",
+      iconOnly: true,
+      label: t("delete thread label"),
+      classNames: [
+        buttonClassNames,
+        hoverableControlItem
+      ],
+      onClick: handleThreadDelete
+    }))), Ref.Array.targets(thread.messages?.filter(isNonNullable) ?? []).map((message) => /* @__PURE__ */ React3.createElement(MessageContainer, {
       key: message.id,
       editable: true,
       message,
       members,
-      onDelete: handleMessageDelete
+      onDelete: handleMessageDelete,
+      onAcceptProposal: handleAcceptProposal
     })), /* @__PURE__ */ React3.createElement(MessageTextbox, {
       extensions,
       onSend: handleComment,
       ...textboxMetadata
-    }), /* @__PURE__ */ React3.createElement(ThreadFooter, {
+    }), /* @__PURE__ */ React3.createElement(Thread.Status, {
       activity
     }, t("activity message")), /* @__PURE__ */ React3.createElement("div", {
       role: "none",
@@ -347,16 +394,11 @@ var CommentContainer = ({ anchor, current, onAttend, onComment, onResolve, onMes
   }
 };
 
-// packages/plugins/plugin-thread/src/components/CommentsContainer.tsx
-import { useSignals as _useSignals4 } from "@preact-signals/safe-react/tracking";
-import React4, { useEffect as useEffect2 } from "react";
-import { Relation as Relation2 } from "@dxos/echo";
-import { fullyQualifiedId as fullyQualifiedId2 } from "@dxos/react-client/echo";
-import { Callout, Icon, Trans, useTranslation as useTranslation3 } from "@dxos/react-ui";
+// src/components/CommentsContainer.tsx
 var CommentsContainer = ({ anchors, currentId, showResolvedThreads, ...props }) => {
   var _effect = _useSignals4();
   try {
-    const { t } = useTranslation3(THREAD_PLUGIN);
+    const { t } = useTranslation3(meta.id);
     const filteredAnchors = showResolvedThreads ? anchors.filter((anchor) => !!Relation2.getSource(anchor)) : anchors.filter((anchor) => {
       const thread = Relation2.getSource(anchor);
       return thread && thread.status !== "resolved";
@@ -387,45 +429,45 @@ var CommentsContainer = ({ anchors, currentId, showResolvedThreads, ...props })
         }
       }))));
     }
-    return filteredAnchors.map((anchor) => {
+    return /* @__PURE__ */ React4.createElement("div", null, filteredAnchors.map((anchor) => {
       const thread = Relation2.getSource(anchor);
       const threadId = fullyQualifiedId2(thread);
-      return /* @__PURE__ */ React4.createElement(CommentContainer, {
+      return /* @__PURE__ */ React4.createElement(CommentsThreadContainer, {
         key: threadId,
         anchor,
         current: currentId === threadId,
         ...props
       });
-    });
+    }));
   } finally {
     _effect.f();
   }
 };
 
-// packages/plugins/plugin-thread/src/components/ThreadSettings.tsx
+// src/components/ThreadSettings.tsx
 import { useSignals as _useSignals5 } from "@preact-signals/safe-react/tracking";
 import React5 from "react";
-import { DeprecatedFormContainer } from "@dxos/react-ui-form";
+import { ControlPage } from "@dxos/react-ui-form";
 var ThreadSettings = ({ settings }) => {
   var _effect = _useSignals5();
   try {
-    return /* @__PURE__ */ React5.createElement(DeprecatedFormContainer, null);
+    return /* @__PURE__ */ React5.createElement(ControlPage, null);
   } finally {
     _effect.f();
   }
 };
 
-// packages/plugins/plugin-thread/src/components/index.ts
-var ChannelContainer2 = lazy(() => import("./ChannelContainer-PKFBVENP.mjs"));
-var ChatContainer = lazy(() => import("./ChatContainer-RSOKYAMK.mjs"));
+// src/components/index.ts
+var ChannelContainer2 = lazy(() => import("./ChannelContainer-4PYFOIDK.mjs"));
+var ChatContainer = lazy(() => import("./ChatContainer-EXNNREYB.mjs"));
 
-// packages/plugins/plugin-thread/src/components/ThreadComplementary.tsx
+// src/components/ThreadComplementary.tsx
 var ThreadComplementary = ({ subject }) => {
   var _effect = _useSignals6();
   try {
+    const { t } = useTranslation4(meta.id);
     const { dispatchPromise: dispatch } = useIntentDispatcher();
     const identity = useIdentity2();
-    const { t } = useTranslation4(THREAD_PLUGIN);
     const { tx } = useThemeContext2();
     const subjectId = fullyQualifiedId3(subject);
     const { state, getViewState } = useCapability2(ThreadCapabilities.MutableState);
@@ -504,6 +546,26 @@ var ThreadComplementary = ({ subject }) => {
       dispatch,
       subject
     ]);
+    const handleAcceptProposal = useCallback2(async (anchor, messageId) => {
+      const thread = Relation3.getSource(anchor);
+      const messageIndex = thread.messages.findIndex(Ref2.hasObjectId(messageId));
+      const message = thread.messages[messageIndex]?.target;
+      const proposal = message?.blocks.find((block) => block._tag === "proposal");
+      if (!proposal || !anchor.anchor) {
+        return;
+      }
+      await dispatch(createIntent(CollaborationActions.AcceptProposal, {
+        subject,
+        anchor: anchor.anchor,
+        proposal
+      }));
+      await dispatch(createIntent(ThreadAction.ToggleResolved, {
+        thread
+      }));
+    }, [
+      dispatch,
+      subject
+    ]);
     const comments = /* @__PURE__ */ React6.createElement(CommentsContainer, {
       anchors,
       currentId: attended.includes(subjectId) ? state.current : void 0,
@@ -512,28 +574,34 @@ var ThreadComplementary = ({ subject }) => {
       onComment: handleComment,
       onResolve: handleResolve,
       onMessageDelete: handleMessageDelete,
-      onThreadDelete: handleThreadDelete
+      onThreadDelete: handleThreadDelete,
+      onAcceptProposal: handleAcceptProposal
     });
     return /* @__PURE__ */ React6.createElement(StackItem.Content, {
-      toolbar: true
+      toolbar: true,
+      classNames: "overflow-hidden"
     }, /* @__PURE__ */ React6.createElement(Tabs.Root, {
       value: showResolvedThreads ? "all" : "unresolved",
       orientation: "horizontal",
-      classNames: 'contents [&_[role="tabpanel"]]:min-bs-0 [&_[role="tabpanel"]]:overflow-y-auto [&_[role="tabpanel"]]:scrollbar-thin',
+      classNames: [
+        'contents [&_[role="tabpanel"]]:min-bs-0 [&_[role="tabpanel"]]:overflow-y-auto [&_[role="tabpanel"]]:scrollbar-thin'
+      ],
       onValueChange: onChangeViewState
     }, /* @__PURE__ */ React6.createElement(Tabs.Tablist, {
-      classNames: tx("toolbar.root", "toolbar", {})
+      classNames: mx2("bg-toolbarSurface border-b border-subduedSeparator")
     }, /* @__PURE__ */ React6.createElement(Tabs.Tab, {
       value: "unresolved",
       classNames: "text-sm"
     }, t("show unresolved label")), /* @__PURE__ */ React6.createElement(Tabs.Tab, {
       value: "all",
       classNames: "text-sm"
-    }, t("show all label"))), /* @__PURE__ */ React6.createElement(Tabs.Tabpanel, {
+    }, t("show all label"))), /* @__PURE__ */ React6.createElement("div", {
+      className: "overflow-y-auto"
+    }, /* @__PURE__ */ React6.createElement(Tabs.Tabpanel, {
       value: "all"
     }, showResolvedThreads && comments), /* @__PURE__ */ React6.createElement(Tabs.Tabpanel, {
       value: "unresolved"
-    }, !showResolvedThreads && comments)));
+    }, !showResolvedThreads && comments))));
   } finally {
     _effect.f();
   }
@@ -547,4 +615,4 @@ export {
   ChannelContainer2 as ChannelContainer,
   ChatContainer
 };
-//# sourceMappingURL=chunk-PG5CTFKK.mjs.map
+//# sourceMappingURL=chunk-ZH2WPTNP.mjs.map