@tutti-os/agent-gui 0.0.18 → 0.0.20

package/dist/index.js

@@ -13,7 +13,7 @@ import {
 import {
   AgentInteractivePromptSurface,
   approvalOptionDisplayLabel
-} from "./chunk-FEWMACBN.js";
+} from "./chunk-5H4ISRJQ.js";
 import {
   PLAN_IMPLEMENTATION_ACTION_FEEDBACK,
   PLAN_IMPLEMENTATION_ACTION_IMPLEMENT,
@@ -37,12 +37,13 @@ import {
   skillDescriptionForDisplay,
   skillTriggerForPrefix,
   useProjectedAgentConversation
-} from "./chunk-DT4W5Z2A.js";
+} from "./chunk-DIBNU26G.js";
 import {
   AgentMessageMarkdown,
+  ZoomableImage,
   cn,
   resolveWorkspaceLinkAction
-} from "./chunk-S5GS4GRM.js";
+} from "./chunk-7THDJWRR.js";
 import {
   AGENT_MENTION_FILTER_TAB_ORDER,
   AgentFileMentionPalette,
@@ -50,7 +51,7 @@ import {
   DEFAULT_AGENT_MENTION_FILTER,
   flattenAgentMentionPaletteEntries,
   preloadAgentMentionBrowse
-} from "./chunk-4RUK7VPA.js";
+} from "./chunk-7IFIA3DC.js";
 import {
   WORKSPACE_AGENT_ACTIVITY_RUNTIME_SESSION_ORIGIN,
   buildWorkspaceAgentActivityListViewModel,
@@ -71,14 +72,12 @@ import {
   resolveWorkspaceAgentSessionSortTimeUnixMs
 } from "./chunk-IBIMGLCD.js";
 import {
-  buildAgentSessionMentionHref,
-  buildAgentWorkspaceReferenceMentionHref,
   exitAgentFileMentionSuggestion,
   formatAgentMentionMarkdown,
   mentionItemToAttrs,
   normalizeAgentSessionMentionTitle,
   parseMentionItemFromHref
-} from "./chunk-5Z5HILKT.js";
+} from "./chunk-XAQQN6MP.js";
 import "./chunk-XJ34OIEQ.js";
 import {
   AgentActivityHostProvider,
@@ -92,11 +91,11 @@ import {
   useAgentActivitySnapshot,
   useAgentHostApi,
   useOptionalAgentActivityRuntime
-} from "./chunk-O5TUTXHT.js";
+} from "./chunk-IEBWFP7O.js";
 import "./chunk-TYGL25EL.js";
 import {
   AGENT_CONTEXT_MENTION_PROVIDER_IDS
-} from "./chunk-HIREVEZM.js";
+} from "./chunk-JM24HADP.js";
 import {
   normalizeAgentTitleText
 } from "./chunk-GCBDIQDX.js";
@@ -3171,13 +3170,17 @@ function normalizeAgentPromptContentBlocks(content) {
     if (block.type === "image") {
       const mimeType = block.mimeType?.trim();
       const data = block.data?.trim();
-      if (!data || mimeType !== "image/png" && mimeType !== "image/jpeg" && mimeType !== "image/webp") {
+      const imagePath = block.path?.trim();
+      if (!data && !imagePath || mimeType !== "image/png" && mimeType !== "image/jpeg" && mimeType !== "image/webp") {
         continue;
       }
       result.push({
         type: "image",
         mimeType,
-        data,
+        ...imagePath ? { path: imagePath } : { data },
+        ...block.uri?.trim() ? { uri: block.uri.trim() } : {},
+        ...block.uploadStatus?.trim() ? { uploadStatus: block.uploadStatus.trim() } : {},
+        ...block.assetId?.trim() ? { assetId: block.assetId.trim() } : {},
         ...block.name?.trim() ? { name: block.name.trim() } : {}
       });
       continue;
@@ -3200,7 +3203,7 @@ function agentPromptContentHasImage(content) {
 }
 function agentPromptContentImageBlocks(content) {
   return normalizeAgentPromptContentBlocks(content).filter(
-    (block) => block.type === "image" && typeof block.data === "string" && typeof block.mimeType === "string"
+    (block) => block.type === "image" && (typeof block.data === "string" || typeof block.path === "string") && typeof block.mimeType === "string"
   );
 }
 function agentPromptContentToComposerDraft(content, idPrefix) {
@@ -3225,10 +3228,13 @@ function agentComposerDraftToPromptContent(input) {
       provider: input.provider,
       skills: input.skills
     }),
-    ...input.draft.images.slice(0, MAX_AGENT_COMPOSER_DRAFT_IMAGES).map((image) => ({
+    ...input.draft.images.slice(0, MAX_AGENT_COMPOSER_DRAFT_IMAGES).filter((image) => !image.uploading && !image.uploadError).map((image) => ({
       type: "image",
       mimeType: image.mimeType,
-      data: image.data,
+      ...image.path ? { path: image.path } : { data: image.data },
+      ...image.uri ? { uri: image.uri } : {},
+      ...image.uploadStatus ? { uploadStatus: image.uploadStatus } : {},
+      ...image.assetId ? { assetId: image.assetId } : {},
       name: image.name
     }))
   ]);
@@ -3271,7 +3277,11 @@ function agentPromptImageBlockToDraftImage(image, idPrefix, index) {
     name: image.name?.trim() || `image-${index + 1}`,
     mimeType: image.mimeType,
     data: image.data,
-    previewUrl: `data:${image.mimeType};base64,${image.data}`
+    path: image.path,
+    uri: image.uri,
+    uploadStatus: image.uploadStatus,
+    assetId: image.assetId,
+    previewUrl: typeof image.data === "string" && image.data ? `data:${image.mimeType};base64,${image.data}` : image.path ?? ""
   };
 }
 
@@ -5846,6 +5856,9 @@ function useAgentGUIActivation({
   );
 }
 
+// agent-gui/agentGuiNode/controller/useAgentGUINodeController.ts
+import { createRichTextMentionHref } from "@tutti-os/ui-rich-text/core";
+
 // agent-gui/agentGuiNode/model/composerSettingsSupport.ts
 import {
   resolveAgentActivityCapability
@@ -6340,11 +6353,12 @@ function buildContinueInNewConversationPrompt(input) {
   const normalizedCurrentUserId = input.currentUserId?.trim() ?? "";
   const initiatorName = normalizedConversationUserId && input.userProfilesByUserId[normalizedConversationUserId]?.name?.trim() || normalizedCurrentUserId && input.userProfilesByUserId[normalizedCurrentUserId]?.name?.trim() || normalizedConversationUserId || normalizedCurrentUserId || translate("messages.agentThisSessionMentionLabel").trim();
   const mentionLabel = `${initiatorName} & ${providerLabel}${normalizedTitle ? ` ${normalizedTitle}` : ""}`.trim();
-  const href = buildAgentSessionMentionHref(
-    input.workspaceId,
-    input.agentSessionId,
-    input.provider
-  );
+  const href = createRichTextMentionHref({
+    providerId: "agent-session",
+    entityId: input.agentSessionId,
+    label: mentionLabel,
+    scope: { workspaceId: input.workspaceId }
+  });
   const mention = formatAgentMentionMarkdown({
     kind: "session",
     href,
@@ -6658,6 +6672,20 @@ function normalizeOptionalText2(value) {
   const trimmed = value.trim();
   return trimmed ? trimmed : null;
 }
+function resolveSameProviderActiveSessionModel(input) {
+  const agentSessionId = normalizeOptionalText2(input.agentSessionId);
+  if (agentSessionId === null) {
+    return null;
+  }
+  const runtimeSession = input.runtime.getSnapshot(input.workspaceId).sessions.find(
+    (candidate) => candidate.agentSessionId.trim() === agentSessionId
+  ) ?? null;
+  const activeProvider = normalizeOptionalText2(runtimeSession?.provider) ?? normalizeOptionalText2(input.activeProvider);
+  if (activeProvider !== input.provider) {
+    return null;
+  }
+  return normalizeOptionalText2(input.sessionState?.settings?.model) ?? normalizeOptionalText2(runtimeSession?.model);
+}
 function normalizeOptionalPrompt(value) {
   return typeof value === "string" ? value.trim() : "";
 }
@@ -7534,6 +7562,7 @@ function useAgentGUINodeController({
   const startingConversationIdRef = useRef4(null);
   const activatedConversationIdsRef = useRef4(/* @__PURE__ */ new Set());
   const failedNewConversationIdsRef = useRef4(/* @__PURE__ */ new Set());
+  const lastActiveModelByProviderRef = useRef4({});
   const pendingTurnIdBySessionIdRef = useRef4({});
   const conversationIdsRef = useRef4(
     new Set(conversations.map((conversation2) => conversation2.id))
@@ -9136,6 +9165,23 @@ function useAgentGUINodeController({
         const initialSettings = resolveEffectiveComposerSettings({
           settings: initialNodeSettings
         });
+        const currentActiveConversationId = activeConversationIdRef.current;
+        const currentActiveConversation = currentActiveConversationId ? resolveConversationSummaryById(
+          conversationsRef.current,
+          currentActiveConversationId,
+          transientConversationRef.current
+        ) : null;
+        const inheritedModel = normalizeOptionalText2(initialNodeSettings.model) === null ? resolveSameProviderActiveSessionModel({
+          activeProvider: currentActiveConversation?.provider ?? null,
+          agentSessionId: currentActiveConversationId,
+          provider,
+          runtime: agentActivityRuntime,
+          sessionState: activeSessionState,
+          workspaceId
+        }) ?? normalizeOptionalText2(
+          lastActiveModelByProviderRef.current[provider]
+        ) : null;
+        const effectiveInitialSettings = inheritedModel === null ? initialSettings : { ...initialSettings, model: inheritedModel };
         const snapshotComposerOptions = agentActivityRuntime.getSnapshot(workspaceId).composerOptionsByProvider?.[provider] ?? null;
         const snapshotDraftAgentSessionId = normalizedInitialContent.length > 0 && provider === "claude-code" ? draftAgentSessionIdFromComposerOptions(snapshotComposerOptions) : null;
         const draftAgentSessionId = snapshotDraftAgentSessionId && !activatedConversationIdsRef.current.has(
@@ -9175,11 +9221,11 @@ function useAgentGUINodeController({
         startingConversationIdRef.current = agentSessionId;
         draftSettingsBySessionIdRef.current = {
           ...draftSettingsBySessionIdRef.current,
-          [agentSessionId]: initialSettings
+          [agentSessionId]: effectiveInitialSettings
         };
         setDraftSettingsBySessionId((current) => ({
           ...current,
-          [agentSessionId]: initialSettings
+          [agentSessionId]: effectiveInitialSettings
         }));
         setIsLoadingMessages(true);
         return activation.activate({
@@ -9190,7 +9236,7 @@ function useAgentGUINodeController({
           initialContent: normalizedInitialContent,
           initialDisplayPrompt,
           title: initialConversationTitle,
-          settings: initialSettings,
+          settings: effectiveInitialSettings,
           openclawGatewayReady: provider === "openclaw" ? openclawGateway?.status === "ready" : void 0
         });
       })().then((result) => {
@@ -9346,6 +9392,7 @@ function useAgentGUINodeController({
       });
     },
     [
+      activeSessionState,
       currentUserId,
       data,
       defaultReasoningEffort,
@@ -11395,6 +11442,27 @@ function useAgentGUINodeController({
   ) : null;
   const pendingInteractivePrompt = serverInteractivePrompt ?? planImplementationPromptVM;
   const activeRuntimeSession = runtimeSessionsBySessionId.get(activeConversationId ?? "") ?? null;
+  useEffect4(() => {
+    const provider = normalizeOptionalText2(
+      activeRuntimeSession?.provider ?? activeConversation?.provider
+    );
+    if (provider === null) {
+      return;
+    }
+    const model = normalizeOptionalText2(activeSessionState?.settings?.model) ?? normalizeOptionalText2(activeRuntimeSession?.model);
+    if (model === null) {
+      return;
+    }
+    lastActiveModelByProviderRef.current = {
+      ...lastActiveModelByProviderRef.current,
+      [provider]: model
+    };
+  }, [
+    activeConversation?.provider,
+    activeRuntimeSession?.model,
+    activeRuntimeSession?.provider,
+    activeSessionState?.settings?.model
+  ]);
   const activeActivityDisplayStatus = activeConversationId ? agentActivityDisplayStatuses.get(activeConversationId) ?? null : null;
   const activeHasPendingSubmittedTurn = activeConversationId ? Boolean(pendingTurnIdBySessionIdRef.current[activeConversationId]) : false;
   const activeConversationBusy = agentActivityDisplayStatusBusy(activeActivityDisplayStatus) || activeHasPendingSubmittedTurn;
@@ -11984,6 +12052,10 @@ function UnavailableChatIcon(props) {
 import { StatusDot } from "@tutti-os/ui-system";
 
 // shared/utils/agentSessionMentionText.ts
+import {
+  isRichTextMentionHref,
+  parseRichTextMentionHref
+} from "@tutti-os/ui-rich-text/core";
 var MARKDOWN_LINK_PATTERN = /\[((?:\\.|[^\]\\])*)\]\(([^)\s]+)\)/g;
 var MARKDOWN_LABEL_ESCAPE_PATTERN = /\\([\\[\]()])/g;
 var SESSION_MENTION_DISPLAY_PREFIX_BY_LANGUAGE = {
@@ -12011,20 +12083,20 @@ function formatAgentSessionMentionText(value, options = {}) {
   const withSessionMentionsNormalized = trimmed.replace(
     MARKDOWN_LINK_PATTERN,
     (fullMatch, rawLabel, href) => {
-      const normalizedHref = href.trim().toLowerCase();
-      if (normalizedHref.startsWith("mention://agent-session")) {
-        return formatSessionLabel(
-          unescapeMarkdownLabel(rawLabel),
-          sessionMentionDisplayPrefix
-        );
+      const label = unescapeMarkdownLabel(rawLabel);
+      const mention = parseRichTextMentionHref(href, label);
+      if (!mention) {
+        return isRichTextMentionHref(href) ? label : fullMatch;
       }
-      if (normalizedHref.startsWith("mention://workspace-issue")) {
-        return formatIssueLabel(unescapeMarkdownLabel(rawLabel));
+      const providerId = mention.providerId.trim().toLowerCase();
+      const displayLabel = label || mention.label;
+      if (providerId === "agent-session") {
+        return formatSessionLabel(displayLabel, sessionMentionDisplayPrefix);
       }
-      if (!normalizedHref.startsWith("mention://")) {
-        return fullMatch;
+      if (providerId === "workspace-issue") {
+        return formatIssueLabel(displayLabel);
       }
-      return unescapeMarkdownLabel(rawLabel);
+      return displayLabel;
     }
   );
   const normalized = normalizeAgentTitleText(withSessionMentionsNormalized);
@@ -16648,6 +16720,7 @@ function AgentComposer({
   "use memo";
   const draftPrompt = draftContent.prompt;
   const draftImages = draftContent.images;
+  const agentActivityRuntime = useOptionalAgentActivityRuntime();
   const [isPaletteOpen, setIsPaletteOpen] = useState10(true);
   const [isReviewPickerOpen, setIsReviewPickerOpen] = useState10(false);
   const [highlightedIndex, setHighlightedIndex] = useState10(0);
@@ -16682,6 +16755,7 @@ function AgentComposer({
   const promptInputAreaRef = useRef12(null);
   const paletteContentRef = useRef12(null);
   const draftPromptRef = useRef12(draftPrompt);
+  const draftImagesRef = useRef12(draftImages);
   const submittedImagePreviewObservedBusyRef = useRef12(false);
   const promptTipRef = useRef12(null);
   const mentionControllerRef = useRef12(
@@ -16885,6 +16959,9 @@ function AgentComposer({
       });
     }
   }, [draftPrompt]);
+  useEffect11(() => {
+    draftImagesRef.current = draftImages;
+  }, [draftImages]);
   useEffect11(() => {
     if (previousSlashStatusAgentSessionIdRef.current === slashStatusAgentSessionId) {
       return;
@@ -17064,7 +17141,9 @@ function AgentComposer({
   );
   const submitCurrentPrompt = useStableEventCallback(() => {
     const canSubmitWhileSending = canQueueWhileBusy && isSendingTurn;
-    if (isSelectedProjectMissing || submitDisabled || disabled && !canQueueWhileBusy || isSendingTurn && !canSubmitWhileSending) {
+    const hasUploadingImages = draftImages.some((image) => image.uploading);
+    const hasFailedImages = draftImages.some((image) => image.uploadError);
+    if (isSelectedProjectMissing || submitDisabled || hasUploadingImages || hasFailedImages || disabled && !canQueueWhileBusy || isSendingTurn && !canSubmitWhileSending) {
       return;
     }
     const nextPrompt = draftPromptRef.current;
@@ -17435,30 +17514,92 @@ function AgentComposer({
       }
       setSubmittedImagePreview([]);
       submittedImagePreviewObservedBusyRef.current = false;
+      const currentDraftImages = draftImagesRef.current;
       const remainingSlots = Math.max(
         0,
-        MAX_AGENT_COMPOSER_DRAFT_IMAGES - draftImages.length
+        MAX_AGENT_COMPOSER_DRAFT_IMAGES - currentDraftImages.length
       );
       if (remainingSlots === 0) {
         return;
       }
+      const uploadPromptContent = agentActivityRuntime?.uploadPromptContent;
       const nextImages = images.slice(0, remainingSlots).map((image) => ({
         id: `${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`,
         name: image.name,
         mimeType: image.mimeType,
         data: image.data,
-        previewUrl: `data:${image.mimeType};base64,${image.data}`
+        previewUrl: `data:${image.mimeType};base64,${image.data}`,
+        uploading: Boolean(uploadPromptContent)
       }));
+      const nextDraftImages = [...currentDraftImages, ...nextImages];
+      draftImagesRef.current = nextDraftImages;
       onDraftContentChange({
         prompt: draftPromptRef.current,
-        images: [...draftImages, ...nextImages]
+        images: nextDraftImages
       });
+      if (!uploadPromptContent) {
+        return;
+      }
+      for (const draftImage of nextImages) {
+        void uploadPromptContent({
+          workspaceId,
+          content: [
+            {
+              type: "image",
+              mimeType: draftImage.mimeType,
+              data: draftImage.data,
+              name: draftImage.name
+            }
+          ]
+        }).then((result) => {
+          const uploadedImage = result.content.find(
+            (block) => block.type === "image"
+          );
+          const uploadedPath = uploadedImage?.path?.trim() ?? "";
+          if (!uploadedPath) {
+            throw new Error("Prompt image upload completed without path.");
+          }
+          const uploadedDraftImages = draftImagesRef.current.map(
+            (image) => image.id === draftImage.id ? {
+              id: image.id,
+              name: image.name,
+              mimeType: image.mimeType,
+              path: uploadedPath,
+              ...uploadedImage?.uri ? { uri: uploadedImage.uri } : {},
+              ...uploadedImage?.uploadStatus ? { uploadStatus: uploadedImage.uploadStatus } : {},
+              ...uploadedImage?.assetId ? { assetId: uploadedImage.assetId } : {},
+              previewUrl: image.previewUrl,
+              uploading: false
+            } : image
+          );
+          draftImagesRef.current = uploadedDraftImages;
+          onDraftContentChange({
+            prompt: draftPromptRef.current,
+            images: uploadedDraftImages
+          });
+        }).catch((error) => {
+          const message = error instanceof Error ? error.message : String(error);
+          const failedDraftImages = draftImagesRef.current.map(
+            (image) => image.id === draftImage.id ? {
+              ...image,
+              uploading: false,
+              uploadError: message
+            } : image
+          );
+          draftImagesRef.current = failedDraftImages;
+          onDraftContentChange({
+            prompt: draftPromptRef.current,
+            images: failedDraftImages
+          });
+        });
+      }
     },
     [
-      draftImages,
+      agentActivityRuntime,
       onDraftContentChange,
       onPromptImagesUnsupported,
-      promptImagesSupported
+      promptImagesSupported,
+      workspaceId
     ]
   );
   const handlePastedImages = useCallback9(
@@ -17469,12 +17610,16 @@ function AgentComposer({
   );
   const removeDraftImage = useCallback9(
     (id) => {
+      const nextDraftImages = draftImagesRef.current.filter(
+        (image) => image.id !== id
+      );
+      draftImagesRef.current = nextDraftImages;
       onDraftContentChange({
         prompt: draftPromptRef.current,
-        images: draftImages.filter((image) => image.id !== id)
+        images: nextDraftImages
       });
     },
-    [draftImages, onDraftContentChange]
+    [onDraftContentChange]
   );
   const applyReferencePickResult = useCallback9(
     (result) => {
@@ -17730,6 +17875,8 @@ function AgentComposer({
     [showFileMentionPalette, showFloatingCommandMenu]
   );
   const hasDraftContent = agentComposerDraftHasContent(draftContent);
+  const hasUploadingDraftImages = draftImages.some((image) => image.uploading);
+  const hasFailedDraftImages = draftImages.some((image) => image.uploadError);
   const isQueueMode = canQueueWhileBusy && hasDraftContent;
   const shouldShowStopButton = showStopButton && !isQueueMode;
   const sendButtonState = isQueueMode ? "queue" : shouldShowStopButton ? isInterrupting ? "stopping" : "interrupt" : isSendingTurn ? "loading" : "send";
@@ -17930,10 +18077,17 @@ function AgentComposer({
                             children: visibleDraftImages.map((image) => /* @__PURE__ */ jsxs13(
                               "div",
                               {
-                                className: "group relative aspect-square min-w-0 overflow-hidden rounded-[6px] border border-[var(--line-1)] bg-[var(--background-fronted)]",
+                                className: cn(
+                                  "group relative aspect-square min-w-0 overflow-hidden rounded-[6px] border border-[var(--line-1)] bg-[var(--background-fronted)]",
+                                  "[&>[data-rmiz]]:block [&>[data-rmiz]]:size-full",
+                                  "[&>[data-rmiz]>[data-rmiz-content]]:block [&>[data-rmiz]>[data-rmiz-content]]:size-full",
+                                  image.uploadError && "border-[color:color-mix(in_srgb,var(--danger)_55%,var(--line-1))]"
+                                ),
+                                "data-uploading": image.uploading ? "true" : void 0,
+                                "data-upload-error": image.uploadError ? "true" : void 0,
                                 children: [
                                   /* @__PURE__ */ jsx26(
-                                    "img",
+                                    ZoomableImage,
                                     {
                                       src: image.previewUrl,
                                       alt: image.name,
@@ -17941,6 +18095,23 @@ function AgentComposer({
                                       draggable: false
                                     }
                                   ),
+                                  image.uploading ? /* @__PURE__ */ jsx26(
+                                    "div",
+                                    {
+                                      className: "absolute inset-0 grid place-items-center bg-[color-mix(in_srgb,var(--background-fronted)_62%,transparent)]",
+                                      "data-testid": "agent-gui-composer-image-uploading",
+                                      children: /* @__PURE__ */ jsx26(
+                                        Spinner,
+                                        {
+                                          className: "text-[var(--text-primary)]",
+                                          size: 18,
+                                          strokeWidth: 2.4,
+                                          trackColor: "var(--transparency-hover)",
+                                          testId: "agent-gui-composer-image-upload-spinner"
+                                        }
+                                      )
+                                    }
+                                  ) : null,
                                   showingSubmittedImagePreview ? null : /* @__PURE__ */ jsx26(
                                     "button",
                                     {
@@ -18271,7 +18442,7 @@ function AgentComposer({
                         type: "submit",
                         className: AgentGUINode_styles_default.composerSendButton,
                         "data-state": sendButtonState,
-                        disabled: isSelectedProjectMissing || submitDisabled || !hasDraftContent || sendButtonBusy,
+                        disabled: isSelectedProjectMissing || submitDisabled || !hasDraftContent || hasUploadingDraftImages || hasFailedDraftImages || sendButtonBusy,
                         "aria-label": labels.send,
                         title: labels.send,
                         "aria-busy": sendButtonBusy,
@@ -18671,6 +18842,7 @@ function AttentionGlyph() {
 }
 
 // agent-gui/agentGuiNode/AgentGUINodeView.tsx
+import { createRichTextMentionHref as createRichTextMentionHref2 } from "@tutti-os/ui-rich-text/core";
 import { Fragment as Fragment8, jsx as jsx29, jsxs as jsxs15 } from "react/jsx-runtime";
 var AGENT_GUI_STICK_TO_BOTTOM_THRESHOLD_PX = 24;
 var AGENT_GUI_CONVERSATION_RAIL_SECTION_PAGE_SIZE = 5;
@@ -18983,11 +19155,18 @@ function AgentGUINodeView({
         const bundleIconUrl = bundle.iconUrl ?? void 0;
         return {
           kind: "workspace-reference",
-          href: buildAgentWorkspaceReferenceMentionHref(
-            viewModel.workspaceId,
-            handle,
-            { iconUrl: bundleIconUrl, fileCount: bundle.fileCount }
-          ),
+          href: createRichTextMentionHref2({
+            providerId: "workspace-reference",
+            entityId: handle.id,
+            label: bundle.displayName,
+            scope: {
+              workspaceId: viewModel.workspaceId,
+              source: handle.source,
+              ...handle.groupId?.trim() ? { groupId: handle.groupId.trim() } : {},
+              ...bundleIconUrl ? { icon: bundleIconUrl } : {},
+              ...bundle.fileCount > 0 ? { count: String(bundle.fileCount) } : {}
+            }
+          }),
           workspaceId: viewModel.workspaceId,
           targetId: handle.id,
           source: handle.source,