@tutti-os/agent-gui 0.0.18 → 0.0.19

package/dist/context-mention-provider.d.ts

@@ -1,4 +1,4 @@
-import { RichTextTriggerProvider, RichTextTriggerQueryInput } from '@tutti-os/ui-rich-text/types';
+import { RichTextTriggerProvider, RichTextTriggerInsertResult, RichTextTriggerQueryInput } from '@tutti-os/ui-rich-text/types';
 import { TuttiExternalAtProviderId } from '@tutti-os/workspace-external-core/contracts';
 
 declare const AGENT_CONTEXT_MENTION_PROVIDER_IDS: {
@@ -12,45 +12,9 @@ type AgentContextMentionProviderId = TuttiExternalAtProviderId;
 type AgentContextMentionQueryInput = RichTextTriggerQueryInput & {
     trigger: "@";
 };
-interface AgentContextMentionPresentation {
-    agentProviderId?: string;
-    agentIconUrl?: string;
-    iconUrl?: string;
-    thumbnailUrl?: string;
-    subtitle?: string;
-    description?: string;
-    participant?: string;
-    status?: string;
-    statusDataStatus?: string;
-    statusLabel?: string;
-    statusPulse?: string;
-    userAvatarPlaceholderUrl?: string;
-    /**
-     * 应用是否能够提供产物文件(reference)。"true" 表示支持,缺省/其它值表示不支持。
-     * 仅用于 @ 面板行末尾「查看产物文件」入口的展示判断,不持久化到 mention 节点。
-     */
-    referencesListSupported?: string;
-}
-type AgentContextMentionInsertResult = {
-    kind: "mention";
-    mention: {
-        entityId: string;
-        label: string;
-        scope?: Readonly<Record<string, string>>;
-        presentation?: AgentContextMentionPresentation;
-    };
-} | {
-    kind: "markdown-link";
-    label: string;
-    href: string;
-} | {
-    kind: "text";
-    text: string;
-};
-type AgentContextMentionProvider<TItem = any> = Omit<RichTextTriggerProvider<TItem>, "toInsertResult"> & {
+type AgentContextMentionInsertResult = RichTextTriggerInsertResult;
+type AgentContextMentionProvider<TItem = any> = Omit<RichTextTriggerProvider<TItem>, "trigger"> & {
     trigger: "@";
-    toInsertResult: (item: TItem) => AgentContextMentionInsertResult;
-    getItemIconUrl?: (item: TItem) => string | null | undefined | Promise<string | null | undefined>;
 };
 
-export { AGENT_CONTEXT_MENTION_PROVIDER_IDS, type AgentContextMentionInsertResult, type AgentContextMentionPresentation, type AgentContextMentionProvider, type AgentContextMentionProviderId, type AgentContextMentionQueryInput };
+export { AGENT_CONTEXT_MENTION_PROVIDER_IDS, type AgentContextMentionInsertResult, type AgentContextMentionProvider, type AgentContextMentionProviderId, type AgentContextMentionQueryInput };

package/dist/context-mention-provider.js

@@ -1,6 +1,6 @@
 import {
   AGENT_CONTEXT_MENTION_PROVIDER_IDS
-} from "./chunk-HIREVEZM.js";
+} from "./chunk-JM24HADP.js";
 export {
   AGENT_CONTEXT_MENTION_PROVIDER_IDS
 };

package/dist/index.d.ts

@@ -8,8 +8,8 @@ import { WorkspaceUserProjectService } from '@tutti-os/workspace-user-project/co
 import { ReferenceLocateTarget, WorkspaceFileReferenceAdapter, WorkspaceFileReference } from '@tutti-os/workspace-file-reference/contracts';
 import { ReferenceSourceAggregator } from '@tutti-os/workspace-file-reference/core';
 import { W as WorkspaceLinkAction } from './workspaceLinkActions-CqWZaCY4.js';
-import { A as AgentContextMentionItem } from './AgentMentionSearchController-DqssJ2-b.js';
-export { p as preloadAgentMentionBrowse } from './AgentMentionSearchController-DqssJ2-b.js';
+import { A as AgentContextMentionItem } from './AgentMentionSearchController-2Vjvmzh3.js';
+export { p as preloadAgentMentionBrowse } from './AgentMentionSearchController-2Vjvmzh3.js';
 import { AgentContextMentionProvider } from './context-mention-provider.js';
 export { AGENT_CONTEXT_MENTION_PROVIDER_IDS, AgentContextMentionProviderId } from './context-mention-provider.js';
 import { A as AgentMessageMarkdownWorkspaceAppIcon } from './AgentMessageMarkdown-DeYPURtF.js';
@@ -293,6 +293,16 @@ interface AgentActivityRuntimeReadSessionAttachmentInput {
     attachmentId: string;
     workspaceId: string;
 }
+type AgentActivityRuntimePromptContentBlock = AgentActivitySendInput["content"][number] & {
+    url?: string;
+};
+interface AgentActivityRuntimeUploadPromptContentInput {
+    content: AgentActivityRuntimePromptContentBlock[];
+    workspaceId: string;
+}
+interface AgentActivityRuntimeUploadPromptContentResult {
+    content: AgentActivityRuntimePromptContentBlock[];
+}
 interface AgentActivityRuntimeSessionAttachment {
     attachmentId: string;
     mimeType: string;
@@ -317,6 +327,7 @@ interface AgentActivityRuntime {
     /** @deprecated Use ensureSessionSynchronized. */
     retainSessionEvents(input: AgentActivityRuntimeRetainSessionEventsInput): () => void;
     sendInput(input: AgentActivitySendInput): Promise<AgentActivitySession>;
+    uploadPromptContent?(input: AgentActivityRuntimeUploadPromptContentInput): Promise<AgentActivityRuntimeUploadPromptContentResult>;
     readSessionAttachment?(input: AgentActivityRuntimeReadSessionAttachmentInput): Promise<AgentActivityRuntimeSessionAttachment>;
     setSessionPinned(input: AgentActivityRuntimeSetSessionPinnedInput): Promise<AgentActivitySession>;
     trackSettingsProjectChange?(input: AgentActivityRuntimeTrackSettingsProjectChangeInput): Promise<void>;
@@ -849,4 +860,4 @@ interface AgentActivityHostProviderProps extends PropsWithChildren {
 }
 declare function AgentActivityHostProvider({ agentActivityRuntime, agentHostApi, children }: AgentActivityHostProviderProps): JSX.Element;
 
-export { AgentActivityHostProvider, type AgentActivityHostProviderProps, type AgentActivityRuntime, type AgentActivityRuntimeListSessionMessagesInput, AgentActivityRuntimeProvider, type AgentActivityRuntimeProviderProps, type AgentActivityRuntimeRetainSessionEventsInput, type AgentActivityRuntimeSetSessionPinnedInput, type AgentActivityRuntimeUpdateSessionSettingsInput, type AgentActivityRuntimeWarmupOpenclawGatewayInput, type AgentActivitySnapshotProjection, AgentContextMentionProvider, AgentGUI, type AgentGUIProps, AgentGuiI18nLocale, type AgentHostApi, type AgentHostInputApi, type AgentHostRuntimeApi, type AgentProbeProvider, type AgentProbeSnapshot, type AgentProviderProbeListInput, type AgentProviderProbeListResult, type AgentUsageQuota, type AgentUsageSnapshot, agentGuiDockIconUrl, agentGuiDockIconUrls, agentHostSnapshotFromAgentActivitySnapshot, buildAgentActivitySnapshotProjection, getAgentActivityRuntime, getOptionalAgentActivityRuntime, projectCoreSessionStatus, resetAgentActivityRuntimeForTests, resolveAgentGUIExpandedWindowFrame, setAgentActivityRuntimeForTests, shouldAutoCollapseAgentGUIConversationRail, useAgentActivityRuntime, useAgentActivitySnapshot, useOptionalAgentActivityRuntime };
+export { AgentActivityHostProvider, type AgentActivityHostProviderProps, type AgentActivityRuntime, type AgentActivityRuntimeListSessionMessagesInput, type AgentActivityRuntimePromptContentBlock, AgentActivityRuntimeProvider, type AgentActivityRuntimeProviderProps, type AgentActivityRuntimeRetainSessionEventsInput, type AgentActivityRuntimeSetSessionPinnedInput, type AgentActivityRuntimeUpdateSessionSettingsInput, type AgentActivityRuntimeUploadPromptContentInput, type AgentActivityRuntimeUploadPromptContentResult, type AgentActivityRuntimeWarmupOpenclawGatewayInput, type AgentActivitySnapshotProjection, AgentContextMentionProvider, AgentGUI, type AgentGUIProps, AgentGuiI18nLocale, type AgentHostApi, type AgentHostInputApi, type AgentHostRuntimeApi, type AgentProbeProvider, type AgentProbeSnapshot, type AgentProviderProbeListInput, type AgentProviderProbeListResult, type AgentUsageQuota, type AgentUsageSnapshot, agentGuiDockIconUrl, agentGuiDockIconUrls, agentHostSnapshotFromAgentActivitySnapshot, buildAgentActivitySnapshotProjection, getAgentActivityRuntime, getOptionalAgentActivityRuntime, projectCoreSessionStatus, resetAgentActivityRuntimeForTests, resolveAgentGUIExpandedWindowFrame, setAgentActivityRuntimeForTests, shouldAutoCollapseAgentGUIConversationRail, useAgentActivityRuntime, useAgentActivitySnapshot, useOptionalAgentActivityRuntime };

package/dist/index.js

@@ -13,7 +13,7 @@ import {
 import {
   AgentInteractivePromptSurface,
   approvalOptionDisplayLabel
-} from "./chunk-FEWMACBN.js";
+} from "./chunk-B727YDVW.js";
 import {
   PLAN_IMPLEMENTATION_ACTION_FEEDBACK,
   PLAN_IMPLEMENTATION_ACTION_IMPLEMENT,
@@ -37,12 +37,13 @@ import {
   skillDescriptionForDisplay,
   skillTriggerForPrefix,
   useProjectedAgentConversation
-} from "./chunk-DT4W5Z2A.js";
+} from "./chunk-SY3ES2SA.js";
 import {
   AgentMessageMarkdown,
+  ZoomableImage,
   cn,
   resolveWorkspaceLinkAction
-} from "./chunk-S5GS4GRM.js";
+} from "./chunk-HFL5WGRF.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-5BVKJM77.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-222YHU5Z.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,14 @@ 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 url = block.url?.trim();
+      if (!data && !url || mimeType !== "image/png" && mimeType !== "image/jpeg" && mimeType !== "image/webp") {
         continue;
       }
       result.push({
         type: "image",
         mimeType,
-        data,
+        ...url ? { url } : { data },
         ...block.name?.trim() ? { name: block.name.trim() } : {}
       });
       continue;
@@ -3200,7 +3200,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.url === "string") && typeof block.mimeType === "string"
   );
 }
 function agentPromptContentToComposerDraft(content, idPrefix) {
@@ -3225,10 +3225,10 @@ 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.url ? { url: image.url } : { data: image.data },
       name: image.name
     }))
   ]);
@@ -3271,7 +3271,8 @@ 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}`
+    url: image.url,
+    previewUrl: typeof image.data === "string" && image.data ? `data:${image.mimeType};base64,${image.data}` : image.url ?? ""
   };
 }
 
@@ -5846,6 +5847,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 +6344,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 +6663,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 +7553,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 +9156,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 +9212,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 +9227,7 @@ function useAgentGUINodeController({
           initialContent: normalizedInitialContent,
           initialDisplayPrompt,
           title: initialConversationTitle,
-          settings: initialSettings,
+          settings: effectiveInitialSettings,
           openclawGatewayReady: provider === "openclaw" ? openclawGateway?.status === "ready" : void 0
         });
       })().then((result) => {
@@ -9346,6 +9383,7 @@ function useAgentGUINodeController({
       });
     },
     [
+      activeSessionState,
       currentUserId,
       data,
       defaultReasoningEffort,
@@ -11395,6 +11433,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 +12043,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 +12074,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 +16711,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 +16746,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 +16950,9 @@ function AgentComposer({
       });
     }
   }, [draftPrompt]);
+  useEffect11(() => {
+    draftImagesRef.current = draftImages;
+  }, [draftImages]);
   useEffect11(() => {
     if (previousSlashStatusAgentSessionIdRef.current === slashStatusAgentSessionId) {
       return;
@@ -17064,7 +17132,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 +17505,89 @@ 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 uploadedUrl = uploadedImage?.url?.trim() ?? "";
+          if (!uploadedUrl) {
+            throw new Error("Prompt image upload completed without url.");
+          }
+          const uploadedDraftImages = draftImagesRef.current.map(
+            (image) => image.id === draftImage.id ? {
+              id: image.id,
+              name: image.name,
+              mimeType: image.mimeType,
+              url: uploadedUrl,
+              previewUrl: uploadedUrl,
+              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 +17598,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 +17863,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 +18065,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 +18083,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 +18430,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 +18830,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 +19143,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,