@tutti-os/agent-gui 0.0.28 → 0.0.30

package/dist/index.js

@@ -13,7 +13,7 @@ import {
 import {
   AgentInteractivePromptSurface,
   approvalOptionDisplayLabel
-} from "./chunk-LHN26OIP.js";
+} from "./chunk-RDCBACWR.js";
 import {
   PLAN_IMPLEMENTATION_ACTION_FEEDBACK,
   PLAN_IMPLEMENTATION_ACTION_IMPLEMENT,
@@ -36,13 +36,13 @@ import {
   skillDescriptionForDisplay,
   skillTriggerForPrefix,
   useProjectedAgentConversation
-} from "./chunk-LKT3EFGR.js";
+} from "./chunk-J2DMJREM.js";
 import {
   AgentMessageMarkdown,
   ZoomableImage,
   cn,
   resolveWorkspaceLinkAction
-} from "./chunk-IBQO76IY.js";
+} from "./chunk-AFTAFV2C.js";
 import {
   AGENT_MENTION_FILTER_TAB_ORDER,
   AgentFileMentionPalette,
@@ -50,22 +50,23 @@ import {
   DEFAULT_AGENT_MENTION_FILTER,
   agentMentionItemKey,
   preloadAgentMentionBrowse
-} from "./chunk-ILBFIZCI.js";
+} from "./chunk-MFWZKYZ4.js";
 import {
   WORKSPACE_AGENT_ACTIVITY_RUNTIME_SESSION_ORIGIN,
   buildWorkspaceAgentActivityListViewModel,
+  createWorkspaceAgentActivityUserMessageIdFromClientSubmitId,
   isWorkspaceAgentActivityRuntimeSessionOrigin,
   isWorkspaceAgentUntitledTask,
   mergeWorkspaceAgentActivityDurableAndOverlayMessages,
   normalizeOptionalWorkspaceAgentStatus,
   selectWorkspaceAgentActivityOverlayMessages
-} from "./chunk-B7DTDZVT.js";
+} from "./chunk-OOQIJXCA.js";
 import {
   MANAGED_AGENT_ICON_FALLBACK_URL,
   MANAGED_AGENT_ICON_URLS,
   Spinner,
   normalizeManagedAgentProvider
-} from "./chunk-F7XLV7M3.js";
+} from "./chunk-WPWZKKKV.js";
 import "./chunk-MTFSQWZ6.js";
 import {
   resolveWorkspaceAgentSessionSortTimeUnixMs
@@ -76,8 +77,8 @@ import {
   mentionItemToAttrs,
   normalizeAgentSessionMentionTitle,
   parseMentionItemFromHref
-} from "./chunk-XAQQN6MP.js";
-import "./chunk-XJ34OIEQ.js";
+} from "./chunk-FG66NW5M.js";
+import "./chunk-Y35GDLP2.js";
 import {
   AgentActivityHostProvider,
   AgentActivityRuntimeProvider,
@@ -90,7 +91,7 @@ import {
   useAgentActivitySnapshot,
   useAgentHostApi,
   useOptionalAgentActivityRuntime
-} from "./chunk-EWWAG26H.js";
+} from "./chunk-SGQ4C7JE.js";
 import "./chunk-TYGL25EL.js";
 import {
   AGENT_CONTEXT_MENTION_PROVIDER_IDS
@@ -105,7 +106,7 @@ import {
   getActiveUiLanguage,
   translate,
   useTranslation
-} from "./chunk-GLDKFIWM.js";
+} from "./chunk-RQ3HEF42.js";
 import "./chunk-LUGELG5V.js";
 import "./chunk-PJP5BUU6.js";
 
@@ -3277,7 +3278,7 @@ function agentComposerDraftToPromptContent(input) {
       type: "file",
       ...file.mimeType ? { mimeType: file.mimeType } : {},
       ...file.path ? { path: file.path } : {},
-      ...file.hostPath ? { hostPath: file.hostPath } : {},
+      ...!file.path && file.hostPath ? { hostPath: file.hostPath } : {},
       ...file.assetId ? { assetId: file.assetId } : {},
       ...file.sizeBytes ? { sizeBytes: file.sizeBytes } : {},
       name: file.name,
@@ -5874,6 +5875,7 @@ function useAgentGUIActivation({
           cwd: input.cwd,
           initialContent: input.initialContent,
           initialDisplayPrompt: input.initialDisplayPrompt,
+          metadata: input.metadata,
           title: input.title,
           settings: input.settings,
           visible: input.visible,
@@ -6340,6 +6342,82 @@ function reportAgentGUICancelDiagnostic(input) {
   } catch {
   }
 }
+function reportAgentSubmitTraceDiagnostic(input) {
+  const reportDiagnostic = input.runtime.reportDiagnostic;
+  if (!reportDiagnostic) {
+    return;
+  }
+  const nowUnixMs = Date.now();
+  try {
+    void Promise.resolve(
+      reportDiagnostic.call(input.runtime, {
+        details: {
+          agentSessionId: input.trace.agentSessionId,
+          blockCount: input.trace.blockCount,
+          clientSubmitId: input.trace.clientSubmitId,
+          elapsedMs: Math.max(0, nowUnixMs - input.trace.startedAtUnixMs),
+          hasImage: input.trace.hasImage,
+          promptLength: input.trace.promptLength,
+          queued: input.trace.queued,
+          startedAtUnixMs: input.trace.startedAtUnixMs,
+          traceEvent: input.event,
+          turnId: input.trace.turnId,
+          ...input.fields ?? {}
+        },
+        event: "agent.submit.trace",
+        level: "info",
+        source: "agent-gui",
+        workspaceId: input.workspaceId
+      })
+    ).catch(() => {
+    });
+  } catch {
+  }
+}
+function scheduleAgentSubmitTracePaint(input) {
+  const logPaint = () => reportAgentSubmitTraceDiagnostic({
+    event: input.event ?? "optimistic_user_message_painted",
+    runtime: input.runtime,
+    trace: input.trace,
+    workspaceId: input.workspaceId
+  });
+  const requestFrame = globalThis.requestAnimationFrame;
+  if (typeof requestFrame !== "function") {
+    setTimeout(logPaint, 0);
+    return;
+  }
+  requestFrame(() => requestFrame(logPaint));
+}
+function createAgentSubmitTraceState(input) {
+  return {
+    agentSessionId: input.agentSessionId,
+    blockCount: input.content.length,
+    clientSubmitId: createAgentSubmitTraceId(),
+    hasImage: agentPromptContentHasImage(input.content),
+    promptLength: input.prompt.length,
+    queued: input.queued,
+    startedAtUnixMs: input.startedAtUnixMs,
+    turnId: null
+  };
+}
+function agentSubmitTraceMetadata(trace) {
+  return {
+    clientSubmitId: trace.clientSubmitId,
+    clientSubmittedAtUnixMs: trace.startedAtUnixMs,
+    promptBlockCount: trace.blockCount,
+    promptHasImage: trace.hasImage,
+    promptLength: trace.promptLength,
+    queued: trace.queued,
+    source: "agent-gui"
+  };
+}
+function createAgentSubmitTraceId() {
+  if (typeof globalThis.crypto?.randomUUID === "function") {
+    return globalThis.crypto.randomUUID();
+  }
+  const fallbackHex = Math.random().toString(16).slice(2).padEnd(12, "0");
+  return `submit-${Date.now().toString(36)}-${fallbackHex.slice(0, 12)}`;
+}
 function cancelResultSessionStatusIsNonBusy(result) {
   const status = normalizeOptionalWorkspaceAgentStatus({
     currentPhase: result.session.currentPhase,
@@ -6347,6 +6425,64 @@ function cancelResultSessionStatusIsNonBusy(result) {
   });
   return status !== null && status.kind !== "working" && status.kind !== "waiting";
 }
+function shouldClearSubmittedDraft(input) {
+  const currentDraft = input.currentDraft;
+  if (!currentDraft) {
+    return false;
+  }
+  const submittedPrompt = agentPromptContentDisplayText(
+    input.submittedContent
+  ).trim();
+  if (currentDraft.prompt.trim() !== submittedPrompt) {
+    return false;
+  }
+  const submittedImages = input.submittedContent.filter(
+    (block) => block.type === "image"
+  );
+  if (currentDraft.images.length !== submittedImages.length) {
+    return false;
+  }
+  const imagesMatch = currentDraft.images.every((image, index) => {
+    const submittedImage = submittedImages[index];
+    if (!submittedImage || image.mimeType !== submittedImage.mimeType) {
+      return false;
+    }
+    const draftPath = image.path?.trim() ?? "";
+    const submittedPath = submittedImage.path?.trim() ?? "";
+    const draftData = image.data?.trim() ?? "";
+    const submittedData = submittedImage.data?.trim() ?? "";
+    const draftName = image.name.trim();
+    const submittedName = submittedImage.name?.trim() ?? "";
+    return draftPath === submittedPath && draftData === submittedData && draftName === submittedName;
+  });
+  if (!imagesMatch) {
+    return false;
+  }
+  const currentFiles = currentDraft.files ?? [];
+  const submittedFiles = input.submittedContent.filter(
+    (block) => block.type === "file"
+  );
+  if (currentFiles.length !== submittedFiles.length) {
+    return false;
+  }
+  return currentFiles.every((file, index) => {
+    const submittedFile = submittedFiles[index];
+    if (!submittedFile) {
+      return false;
+    }
+    const draftPath = file.path?.trim() ?? "";
+    const submittedPath = submittedFile.path?.trim() ?? "";
+    const draftHostPath = file.hostPath?.trim() ?? "";
+    const submittedHostPath = submittedFile.hostPath?.trim() ?? "";
+    const draftAssetId = file.assetId?.trim() ?? "";
+    const submittedAssetId = submittedFile.assetId?.trim() ?? "";
+    const draftMimeType = file.mimeType?.trim() ?? "";
+    const submittedMimeType = submittedFile.mimeType?.trim() ?? "";
+    const draftName = file.name.trim();
+    const submittedName = submittedFile.name?.trim() ?? "";
+    return draftPath === submittedPath && draftHostPath === submittedHostPath && draftAssetId === submittedAssetId && draftMimeType === submittedMimeType && draftName === submittedName && file.sizeBytes === submittedFile.sizeBytes;
+  });
+}
 function cancelBusySource(input) {
   if (input.hasActivePrompt) {
     return "interactive_prompt";
@@ -6860,11 +6996,14 @@ function createAgentGUIConversationId() {
   return `00000000-0000-4000-8000-${fallbackHex.slice(0, 12)}`;
 }
 function createOptimisticPromptMessage(input) {
+  const clientSubmitMessageId = input.clientSubmitId ? createWorkspaceAgentActivityUserMessageIdFromClientSubmitId(
+    input.clientSubmitId
+  ) : null;
   return {
     id: Math.max(1, Math.floor(input.occurredAtUnixMs)),
     workspaceId: input.workspaceId,
     agentSessionId: input.agentSessionId,
-    messageId: `optimistic:user:${input.turnId}`,
+    messageId: clientSubmitMessageId ?? `optimistic:user:${input.turnId}`,
     version: Math.max(1, Math.floor(input.occurredAtUnixMs)),
     turnId: input.turnId,
     role: "user",
@@ -6872,6 +7011,7 @@ function createOptimisticPromptMessage(input) {
     payload: {
       __agentGuiOptimisticPrompt: true,
       actorId: input.userId,
+      ...input.clientSubmitId ? { clientSubmitId: input.clientSubmitId } : {},
       content: input.content,
       text: input.prompt
     },
@@ -6879,6 +7019,9 @@ function createOptimisticPromptMessage(input) {
     startedAtUnixMs: input.occurredAtUnixMs
   };
 }
+function createPendingOptimisticTurnId(clientSubmitId) {
+  return `pending:${clientSubmitId}`;
+}
 function projectAgentGUIMessagesToTimelineItems(messages) {
   return mergeAgentGUITimelineItems(
     [],
@@ -6922,6 +7065,12 @@ function normalizeAgentGUIOpenSessionRequest(request) {
 function recordValue2(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
+function appServerStartupMetadata(runtimeContext) {
+  return recordValue2(runtimeContext?.appServerStartup);
+}
+function isAppServerStartupLoading(runtimeContext, key) {
+  return appServerStartupMetadata(runtimeContext)?.[key] === "loading";
+}
 function draftAgentSessionIdFromComposerOptions(options) {
   return normalizeConfigOptionValue(
     options?.runtimeContext?.draftAgentSessionId
@@ -7069,7 +7218,7 @@ function arePermissionConfigsEqual(left, right) {
   );
 }
 function areComposerSettingsVMsEqual(left, right) {
-  return sameComposerSettings(left.sessionSettings, right.sessionSettings) && areComposerSettingsDraftsEqual(left.draftSettings, right.draftSettings) && left.supportsModel === right.supportsModel && left.supportsReasoningEffort === right.supportsReasoningEffort && left.supportsSpeed === right.supportsSpeed && (left.supportsPermissionMode ?? false) === (right.supportsPermissionMode ?? false) && left.supportsPlanMode === right.supportsPlanMode && (left.supportsBrowser ?? false) === (right.supportsBrowser ?? false) && (left.supportsComputerUse ?? false) === (right.supportsComputerUse ?? false) && left.isSettingsLoading === right.isSettingsLoading && left.modelUnavailable === right.modelUnavailable && left.reasoningUnavailable === right.reasoningUnavailable && left.speedUnavailable === right.speedUnavailable && (left.permissionModeUnavailable ?? false) === (right.permissionModeUnavailable ?? false) && (left.planExclusiveWithPermissionMode ?? false) === (right.planExclusiveWithPermissionMode ?? false) && (left.selectedModelValue ?? null) === (right.selectedModelValue ?? null) && (left.selectedReasoningEffortValue ?? null) === (right.selectedReasoningEffortValue ?? null) && (left.selectedSpeedValue ?? null) === (right.selectedSpeedValue ?? null) && (left.selectedPermissionModeValue ?? null) === (right.selectedPermissionModeValue ?? null) && arePermissionConfigsEqual(left.permissionConfig, right.permissionConfig) && (left.selectedProjectPath ?? null) === (right.selectedProjectPath ?? null) && Boolean(left.projectLocked) === Boolean(right.projectLocked) && areComposerSettingOptionListsEqual(
+  return sameComposerSettings(left.sessionSettings, right.sessionSettings) && areComposerSettingsDraftsEqual(left.draftSettings, right.draftSettings) && left.supportsModel === right.supportsModel && left.supportsReasoningEffort === right.supportsReasoningEffort && left.supportsSpeed === right.supportsSpeed && (left.supportsPermissionMode ?? false) === (right.supportsPermissionMode ?? false) && left.supportsPlanMode === right.supportsPlanMode && (left.supportsBrowser ?? false) === (right.supportsBrowser ?? false) && (left.supportsComputerUse ?? false) === (right.supportsComputerUse ?? false) && left.isSettingsLoading === right.isSettingsLoading && Boolean(left.isModelOptionsLoading) === Boolean(right.isModelOptionsLoading) && left.modelUnavailable === right.modelUnavailable && left.reasoningUnavailable === right.reasoningUnavailable && left.speedUnavailable === right.speedUnavailable && (left.permissionModeUnavailable ?? false) === (right.permissionModeUnavailable ?? false) && (left.planExclusiveWithPermissionMode ?? false) === (right.planExclusiveWithPermissionMode ?? false) && (left.selectedModelValue ?? null) === (right.selectedModelValue ?? null) && (left.selectedReasoningEffortValue ?? null) === (right.selectedReasoningEffortValue ?? null) && (left.selectedSpeedValue ?? null) === (right.selectedSpeedValue ?? null) && (left.selectedPermissionModeValue ?? null) === (right.selectedPermissionModeValue ?? null) && arePermissionConfigsEqual(left.permissionConfig, right.permissionConfig) && (left.selectedProjectPath ?? null) === (right.selectedProjectPath ?? null) && Boolean(left.projectLocked) === Boolean(right.projectLocked) && areComposerSettingOptionListsEqual(
     left.availableModels,
     right.availableModels
   ) && areComposerSettingOptionListsEqual(
@@ -7256,6 +7405,28 @@ function readNodeDefaultDraftSettings(input) {
   });
 }
 function conversationStatusFromStatePatch(patch) {
+  const turnPhase = patch.turn?.phase?.trim() ?? "";
+  if (turnPhase === "settled") {
+    switch (patch.turn?.outcome?.trim()) {
+      case "failed":
+        return "failed";
+      case "canceled":
+      case "interrupted":
+        return "canceled";
+      case "completed":
+      default:
+        return "completed";
+    }
+  }
+  switch (turnPhase) {
+    case "submitted":
+    case "running":
+      return "working";
+    case "waiting":
+      return "waiting";
+    default:
+      break;
+  }
   const normalized = normalizeOptionalWorkspaceAgentStatus({
     lifecycleStatus: patch.lifecycleStatus,
     currentPhase: patch.currentPhase,
@@ -7279,7 +7450,7 @@ function conversationStatusFromStatePatch(patch) {
   }
 }
 function hasSessionControlStatePatch(patch) {
-  return normalizeOptionalText2(patch.permissionModeId) !== null || patch.settings !== void 0 || patch.runtimeContext !== void 0;
+  return normalizeOptionalText2(patch.permissionModeId) !== null || patch.settings !== void 0 || patch.runtimeContext !== void 0 || patch.submitAvailability !== void 0 || patch.turn?.submitAvailability !== void 0 || patch.turn?.phase !== void 0;
 }
 function mergeSessionControlStatePatch(current, patch) {
   if (!current || !hasSessionControlStatePatch(patch)) {
@@ -7338,6 +7509,21 @@ function mergeSessionControlStatePatch(current, patch) {
       permissionModeId: effectivePermissionMode
     };
   }
+  const submitAvailability = patch.submitAvailability ?? patch.turn?.submitAvailability;
+  if (submitAvailability !== void 0) {
+    next.submitAvailability = submitAvailability;
+    changed = true;
+  }
+  if (patch.turn?.phase) {
+    next.turnLifecycle = {
+      activeTurnId: patch.turn.activeTurnId !== void 0 ? patch.turn.activeTurnId : patch.turn.phase === "settled" ? null : patch.turn.turnId,
+      phase: patch.turn.phase,
+      settling: patch.turn.settling,
+      outcome: patch.turn.outcome ?? null,
+      completedCommand: patch.turn.completedCommand ?? null
+    };
+    changed = true;
+  }
   if (patch.occurredAtUnixMs !== void 0 && Number.isFinite(patch.occurredAtUnixMs)) {
     next.updatedAtUnixMs = patch.occurredAtUnixMs;
     changed = true;
@@ -7345,6 +7531,19 @@ function mergeSessionControlStatePatch(current, patch) {
   return changed ? next : current;
 }
 function conversationStatusFromSessionState(state) {
+  if (state.turnLifecycle?.phase) {
+    return conversationStatusFromStatePatch({
+      agentSessionId: state.agentSessionId,
+      turn: {
+        turnId: state.turnLifecycle.activeTurnId ?? "",
+        activeTurnId: state.turnLifecycle.activeTurnId,
+        phase: state.turnLifecycle.phase,
+        outcome: state.turnLifecycle.outcome ?? void 0,
+        settling: state.turnLifecycle.settling,
+        completedCommand: state.turnLifecycle.completedCommand ?? void 0
+      }
+    });
+  }
   return conversationStatusFromStatusValue(state.status);
 }
 function conversationStatusFromStatusValue(value) {
@@ -7846,6 +8045,7 @@ function useAgentGUINodeController({
   const failedNewConversationIdsRef = useRef4(/* @__PURE__ */ new Set());
   const lastActiveModelByProviderRef = useRef4({});
   const pendingTurnIdBySessionIdRef = useRef4({});
+  const submitTraceBySessionIdRef = useRef4({});
   const conversationIdsRef = useRef4(
     new Set(conversations.map((conversation2) => conversation2.id))
   );
@@ -9197,9 +9397,36 @@ function useAgentGUINodeController({
       }
       const normalizedLastError = patch.lastError?.trim() ?? "";
       const nextStatus = conversationStatusFromStatePatch(patch);
+      const hasStructuredTurnLifecycle = Boolean(patch.turn?.phase?.trim());
       const hasControlStatePatch = hasSessionControlStatePatch(patch);
       const pendingTurnId = pendingTurnIdBySessionIdRef.current[agentSessionId]?.trim() ?? "";
       const patchTurnId = patch.turn?.turnId?.trim() ?? "";
+      const patchActiveTurnId = patch.turn?.activeTurnId?.trim() ?? "";
+      const structuredTurnPhase = patch.turn?.phase?.trim() ?? "";
+      const submitTrace = submitTraceBySessionIdRef.current[agentSessionId];
+      if (submitTrace && structuredTurnPhase) {
+        const matchesTraceTurn = !submitTrace.turnId || patchTurnId === submitTrace.turnId || patchActiveTurnId === submitTrace.turnId;
+        if (matchesTraceTurn) {
+          if (!submitTrace.turnId && (patchTurnId || patchActiveTurnId)) {
+            submitTrace.turnId = patchTurnId || patchActiveTurnId;
+          }
+          reportAgentSubmitTraceDiagnostic({
+            event: `lifecycle.${structuredTurnPhase}`,
+            runtime: agentActivityRuntime,
+            trace: submitTrace,
+            workspaceId,
+            fields: {
+              outcome: patch.turn?.outcome ?? null,
+              submitAvailability: patch.turn?.submitAvailability ?? null
+            }
+          });
+          if (structuredTurnPhase === "settled") {
+            const next = { ...submitTraceBySessionIdRef.current };
+            delete next[agentSessionId];
+            submitTraceBySessionIdRef.current = next;
+          }
+        }
+      }
       const clearedPendingSubmittedTurn = Boolean(
         pendingTurnId && (patchTurnId && patchTurnId === pendingTurnId || nextStatus !== null && !conversationBusyStatus2(nextStatus))
       );
@@ -9247,7 +9474,7 @@ function useAgentGUINodeController({
         const timelineItems = projectAgentGUIMessagesToTimelineItems(
           resolveSessionMessages(agentSessionId)
         );
-        const status = resolveConversationStatusFromTimelineEvidence({
+        const status = hasStructuredTurnLifecycle ? nextStatus ?? conversation2.status : resolveConversationStatusFromTimelineEvidence({
           status: nextStatus ?? conversation2.status,
           timelineItems
         });
@@ -9276,7 +9503,7 @@ function useAgentGUINodeController({
         const timelineItems = projectAgentGUIMessagesToTimelineItems(
           resolveSessionMessages(agentSessionId)
         );
-        const transientStatus = resolveConversationStatusFromTimelineEvidence({
+        const transientStatus = hasStructuredTurnLifecycle ? nextStatus ?? transient.status : resolveConversationStatusFromTimelineEvidence({
           status: nextStatus ?? transient.status,
           timelineItems
         });
@@ -9492,6 +9719,23 @@ function useAgentGUINodeController({
         const agentSessionId = draftAgentSessionId ?? createAgentGUIConversationId();
         pendingCreateAgentSessionId = agentSessionId;
         const createdAtUnixMs = Date.now();
+        const submitTrace = createAgentSubmitTraceState({
+          agentSessionId,
+          content: normalizedInitialContent,
+          prompt: normalizedInitialPrompt,
+          queued: false,
+          startedAtUnixMs: createdAtUnixMs
+        });
+        submitTraceBySessionIdRef.current = {
+          ...submitTraceBySessionIdRef.current,
+          [agentSessionId]: submitTrace
+        };
+        reportAgentSubmitTraceDiagnostic({
+          event: "submit.begin",
+          runtime: agentActivityRuntime,
+          trace: submitTrace,
+          workspaceId
+        });
         const optimisticConversation = {
           id: agentSessionId,
           userId: currentUserId?.trim() ?? "",
@@ -9509,10 +9753,47 @@ function useAgentGUINodeController({
           updatedAtUnixMs: createdAtUnixMs
         };
         setTransientConversation(optimisticConversation);
+        isComposerHomeRef.current = false;
+        setIsComposerHome(false);
+        activeConversationIdRef.current = agentSessionId;
+        setActiveConversationId(agentSessionId);
+        setIntent({ tag: "active", id: agentSessionId });
+        persistActiveConversation(agentSessionId);
         setAgentSessionViewMessagesLoading(
           sessionViewRef(agentSessionId),
           true
         );
+        reportAgentSubmitTraceDiagnostic({
+          event: "optimistic_state_applied",
+          runtime: agentActivityRuntime,
+          trace: submitTrace,
+          workspaceId,
+          fields: { mode: "new" }
+        });
+        recordLocalMessages(agentSessionId, [
+          createOptimisticPromptMessage({
+            workspaceId,
+            agentSessionId,
+            turnId: createPendingOptimisticTurnId(submitTrace.clientSubmitId),
+            clientSubmitId: submitTrace.clientSubmitId,
+            userId: currentUserId?.trim() || "user",
+            prompt: normalizedInitialPrompt,
+            content: [...normalizedInitialContent],
+            occurredAtUnixMs: createdAtUnixMs
+          })
+        ]);
+        reportAgentSubmitTraceDiagnostic({
+          event: "optimistic_user_message_recorded",
+          runtime: agentActivityRuntime,
+          trace: submitTrace,
+          workspaceId,
+          fields: { mode: "new" }
+        });
+        scheduleAgentSubmitTracePaint({
+          runtime: agentActivityRuntime,
+          trace: submitTrace,
+          workspaceId
+        });
         if (conversationListQuery) {
           markAgentGUIConversationCreatePending({
             query: conversationListQuery,
@@ -9529,7 +9810,19 @@ function useAgentGUINodeController({
           ...current,
           [agentSessionId]: effectiveInitialSettings
         }));
+        setDraftBySessionId((current) => ({
+          ...current,
+          [nodeDefaultDraftContentKey(dataRef.current.provider)]: emptyAgentComposerDraft(),
+          [agentSessionId]: emptyAgentComposerDraft()
+        }));
         setIsLoadingMessages(true);
+        reportAgentSubmitTraceDiagnostic({
+          event: "activation.requested",
+          runtime: agentActivityRuntime,
+          trace: submitTrace,
+          workspaceId,
+          fields: { mode: "new" }
+        });
         return activation.activate({
           mode: "new",
           agentSessionId,
@@ -9537,12 +9830,36 @@ function useAgentGUINodeController({
           cwd: selectedProjectPath2 ?? "",
           initialContent: normalizedInitialContent,
           initialDisplayPrompt,
+          metadata: agentSubmitTraceMetadata(submitTrace),
           title: initialConversationTitle,
           settings: effectiveInitialSettings,
           openclawGatewayReady: provider === "openclaw" ? openclawGateway?.status === "ready" : void 0
         });
       })().then((result) => {
         const agentSessionId = result.session.agentSessionId;
+        const submitTrace = submitTraceBySessionIdRef.current[agentSessionId];
+        if (submitTrace) {
+          reportAgentSubmitTraceDiagnostic({
+            event: "activation.resolved",
+            runtime: agentActivityRuntime,
+            trace: submitTrace,
+            workspaceId,
+            fields: {
+              mode: "new",
+              sessionStatus: result.session.status
+            }
+          });
+          reportAgentSubmitTraceDiagnostic({
+            event: "submit.accepted",
+            runtime: agentActivityRuntime,
+            trace: submitTrace,
+            workspaceId,
+            fields: {
+              mode: "new",
+              sessionStatus: result.session.status
+            }
+          });
+        }
         if (conversationListQuery) {
           clearAgentGUIConversationCreatePending({
             query: conversationListQuery,
@@ -9630,6 +9947,22 @@ function useAgentGUINodeController({
           });
         }
         const shouldShowFailedConversation = startingConversationIdRef.current === agentSessionId || activeConversationIdRef.current === null && isComposerHomeRef.current;
+        const submitTrace = submitTraceBySessionIdRef.current[agentSessionId];
+        if (submitTrace) {
+          const nextTraces = { ...submitTraceBySessionIdRef.current };
+          delete nextTraces[agentSessionId];
+          submitTraceBySessionIdRef.current = nextTraces;
+          reportAgentSubmitTraceDiagnostic({
+            event: "submit.failed",
+            runtime: agentActivityRuntime,
+            trace: submitTrace,
+            workspaceId,
+            fields: {
+              errorCode: getAgentGUIErrorCode(error) ?? "unknown",
+              mode: "new"
+            }
+          });
+        }
         if (!shouldShowFailedConversation && !isCurrentConversation(agentSessionId)) {
           setAgentSessionViewMessagesLoading(
             sessionViewRef(agentSessionId),
@@ -9709,6 +10042,7 @@ function useAgentGUINodeController({
       isCurrentConversation,
       agentActivityRuntime,
       pendingCreateOwnerKey,
+      recordLocalMessages,
       unactivateIfStale,
       workspaceId
     ]
@@ -9908,6 +10242,23 @@ function useAgentGUINodeController({
       }
       const submittedPromptText = displayPrompt && displayPrompt.trim() ? displayPrompt : agentPromptContentDisplayText(normalizedContent);
       const submittedAtUnixMs = Date.now();
+      const submitTrace = createAgentSubmitTraceState({
+        agentSessionId,
+        content: normalizedContent,
+        prompt: submittedPromptText,
+        queued: queuedPromptId !== void 0,
+        startedAtUnixMs: submittedAtUnixMs
+      });
+      submitTraceBySessionIdRef.current = {
+        ...submitTraceBySessionIdRef.current,
+        [agentSessionId]: submitTrace
+      };
+      reportAgentSubmitTraceDiagnostic({
+        event: "submit.begin",
+        runtime: agentActivityRuntime,
+        trace: submitTrace,
+        workspaceId
+      });
       const previousConversationStatus = resolveConversationSummaryById(
         conversationsRef.current,
         agentSessionId,
@@ -9951,22 +10302,67 @@ function useAgentGUINodeController({
         currentPhase: "working",
         occurredAtUnixMs: submittedAtUnixMs
       });
+      reportAgentSubmitTraceDiagnostic({
+        event: "optimistic_state_applied",
+        runtime: agentActivityRuntime,
+        trace: submitTrace,
+        workspaceId
+      });
       void Promise.resolve().then(() => {
         if (!isCurrentConversation(agentSessionId)) {
           return null;
         }
+        reportAgentSubmitTraceDiagnostic({
+          event: "send_input.requested",
+          runtime: agentActivityRuntime,
+          trace: submitTrace,
+          workspaceId
+        });
         return agentActivityRuntime.sendInput({
           workspaceId,
           agentSessionId,
           content: normalizedContent,
-          displayPrompt: displayPrompt && displayPrompt.trim() ? displayPrompt : null
+          displayPrompt: displayPrompt && displayPrompt.trim() ? displayPrompt : null,
+          metadata: agentSubmitTraceMetadata(submitTrace)
         });
       }).then((result) => {
         if (!result || !isCurrentConversation(agentSessionId)) {
           return;
         }
-        const submittedStatus = conversationStatusFromStatusValue(
-          projectCoreSessionStatus(result.status)
+        submitTrace.turnId = result.turnId.trim() || null;
+        reportAgentSubmitTraceDiagnostic({
+          event: "send_input.resolved",
+          runtime: agentActivityRuntime,
+          trace: submitTrace,
+          workspaceId,
+          fields: {
+            submitAvailability: result.submitAvailability,
+            turnLifecycle: result.turnLifecycle
+          }
+        });
+        reportAgentSubmitTraceDiagnostic({
+          event: "submit.accepted",
+          runtime: agentActivityRuntime,
+          trace: submitTrace,
+          workspaceId,
+          fields: {
+            submitAvailability: result.submitAvailability,
+            turnLifecycle: result.turnLifecycle
+          }
+        });
+        const submittedStatus = conversationStatusFromStatePatch({
+          agentSessionId,
+          turn: {
+            turnId: result.turnId,
+            phase: result.turnLifecycle.phase,
+            outcome: result.turnLifecycle.outcome ?? void 0,
+            activeTurnId: result.turnLifecycle.activeTurnId,
+            settling: result.turnLifecycle.settling,
+            completedCommand: result.turnLifecycle.completedCommand ?? void 0,
+            submitAvailability: result.submitAvailability
+          }
+        }) ?? conversationStatusFromStatusValue(
+          projectCoreSessionStatus(result.session.status)
         );
         if (submittedStatus && submittedStatus !== "ready") {
           patchConversation(agentSessionId, {
@@ -9977,7 +10373,10 @@ function useAgentGUINodeController({
         if (!queuedPromptId) {
           setDraftBySessionId((current) => {
             const currentDraft = current[agentSessionId];
-            if (currentDraft?.prompt.trim() !== submittedPromptText || currentDraft.images.length > 0) {
+            if (!shouldClearSubmittedDraft({
+              currentDraft,
+              submittedContent: normalizedContent
+            })) {
               return current;
             }
             return {
@@ -10016,7 +10415,7 @@ function useAgentGUINodeController({
             return { ...current, [agentSessionId]: null };
           });
         }
-        const submittedTurnId = normalizeConfigOptionValue(recordValue2(result)?.turnId) ?? "";
+        const submittedTurnId = result.turnId.trim();
         if (submittedTurnId) {
           pendingTurnIdBySessionIdRef.current = {
             ...pendingTurnIdBySessionIdRef.current,
@@ -10027,12 +10426,24 @@ function useAgentGUINodeController({
               workspaceId,
               agentSessionId,
               turnId: submittedTurnId,
+              clientSubmitId: submitTrace.clientSubmitId,
               userId: currentUserId?.trim() || "user",
               prompt: submittedPromptText,
               content: normalizedContent,
               occurredAtUnixMs: Date.now()
             })
           ]);
+          reportAgentSubmitTraceDiagnostic({
+            event: "optimistic_user_message_recorded",
+            runtime: agentActivityRuntime,
+            trace: submitTrace,
+            workspaceId
+          });
+          scheduleAgentSubmitTracePaint({
+            runtime: agentActivityRuntime,
+            trace: submitTrace,
+            workspaceId
+          });
         }
         void refreshMessagesFromSnapshot(agentSessionId);
         if (!getAgentSessionView(sessionViewRef(agentSessionId))?.controlState) {
@@ -10042,6 +10453,18 @@ function useAgentGUINodeController({
           void syncConversationListProjection(agentSessionId);
         }
       }).catch((error) => {
+        const nextTraces = { ...submitTraceBySessionIdRef.current };
+        delete nextTraces[agentSessionId];
+        submitTraceBySessionIdRef.current = nextTraces;
+        reportAgentSubmitTraceDiagnostic({
+          event: "submit.failed",
+          runtime: agentActivityRuntime,
+          trace: submitTrace,
+          workspaceId,
+          fields: {
+            errorCode: getAgentGUIErrorCode(error)
+          }
+        });
         const currentSessionState = getAgentSessionView(sessionViewRef(agentSessionId))?.controlState ?? null;
         const currentConversationSummary = resolveConversationSummaryById(
           conversations,
@@ -11775,7 +12198,8 @@ function useAgentGUINodeController({
   ]);
   const activeActivityDisplayStatus = activeConversationId ? agentActivityDisplayStatuses.get(activeConversationId) ?? null : null;
   const activeHasPendingSubmittedTurn = activeConversationId ? Boolean(pendingTurnIdBySessionIdRef.current[activeConversationId]) : false;
-  const activeConversationBusy = agentActivityDisplayStatusBusy(activeActivityDisplayStatus) || activeHasPendingSubmittedTurn;
+  const activeSubmitBlocked = activeSessionState?.submitAvailability?.state === "blocked";
+  const activeConversationBusy = agentActivityDisplayStatusBusy(activeActivityDisplayStatus) || activeHasPendingSubmittedTurn || activeSubmitBlocked;
   const activeSessionResumable = activeRuntimeSession?.resumable ?? activeConversation?.resumable ?? activeSessionState?.resumable;
   const normalizedActiveConversationId = activeConversationId ?? "";
   const activeConversationActivationState = activeConversationId ? activation.stateFor(activeConversationId) : null;
@@ -11845,6 +12269,10 @@ function useAgentGUINodeController({
     const hasOptionsSource = providerComposerOptions !== null;
     const hasACPSettings = hasOptionsSource && (!composerSupport.model || activeSessionModelSelection !== null) && (!composerSupport.reasoning || activeSessionReasoningSelection !== null);
     const isSettingsLoading = !hasACPSettings;
+    const isModelOptionsLoading = isAppServerStartupLoading(
+      activeSessionRuntimeContext,
+      "models"
+    );
     const selectedModelValue = draftModel;
     const selectedReasoningEffortValue = draftReasoningEffort;
     const selectedSpeedValue = draftSpeed;
@@ -11871,6 +12299,7 @@ function useAgentGUINodeController({
       supportsPlanMode: composerSupport.plan,
       planExclusiveWithPermissionMode: data.provider === "claude-code",
       isSettingsLoading,
+      isModelOptionsLoading,
       modelUnavailable: activeConversationId !== null && sessionSettings === null && composerSupport.model && draftModel === null,
       reasoningUnavailable: activeConversationId !== null && sessionSettings === null && composerSupport.reasoning && draftReasoningEffort === null,
       speedUnavailable: activeConversationId !== null && sessionSettings === null && composerSupport.speed && draftSpeed === null,
@@ -11893,6 +12322,7 @@ function useAgentGUINodeController({
     activeSessionModelSelection,
     activeSessionReasoningSelection,
     activeSessionSpeedSelection,
+    activeSessionRuntimeContext,
     data.provider,
     draftSettings.permissionModeId,
     draftSettings.planMode,
@@ -15247,7 +15677,7 @@ function AgentModelReasoningDropdown({
         "w-auto",
         AgentGUINode_styles_default.composerMenuTrigger,
         menuDisabled && "cursor-not-allowed text-[var(--agent-gui-text-tertiary)] opacity-60 hover:text-[var(--agent-gui-text-tertiary)]",
-        composerSettings.isSettingsLoading && "animate-pulse"
+        (composerSettings.isSettingsLoading || composerSettings.isModelOptionsLoading) && "animate-pulse"
       ),
       "aria-label": `${labels.modelLabel} / ${labels.reasoningLabel}`,
       "data-agent-model-reasoning-trigger": "true",
@@ -17172,7 +17602,6 @@ function AgentComposer({
   const [paletteDraftPrompt, setPaletteDraftPrompt] = useState10(draftPrompt);
   const [fileMentionSuggestion, setFileMentionSuggestion] = useState10(null);
   const [isSelectedProjectMissing, setIsSelectedProjectMissing] = useState10(false);
-  const [submittedImagePreview, setSubmittedImagePreview] = useState10([]);
   const [isSlashStatusPanelOpen, setIsSlashStatusPanelOpen] = useState10(false);
   const slashStatusAgentSessionId = slashStatus?.agentSessionId ?? null;
   const previousSlashStatusAgentSessionIdRef = useRef12(
@@ -17196,7 +17625,6 @@ function AgentComposer({
   const draftPromptRef = useRef12(draftPrompt);
   const draftImagesRef = useRef12(draftImages);
   const draftFilesRef = useRef12(draftFiles);
-  const submittedImagePreviewObservedBusyRef = useRef12(false);
   const promptTipRef = useRef12(null);
   const mentionControllerRef = useRef12(
     null
@@ -17584,19 +18012,30 @@ function AgentComposer({
   );
   const submitCurrentPrompt = useStableEventCallback(() => {
     const canSubmitWhileSending = canQueueWhileBusy && isSendingTurn;
-    const hasUploadingImages = draftImages.some((image) => image.uploading);
-    const hasFailedImages = draftImages.some((image) => image.uploadError);
-    const hasUploadingFiles = draftFiles.some((file) => file.uploading);
-    const hasFailedFiles = draftFiles.some((file) => file.uploadError);
+    const currentDraftImages = draftImagesRef.current;
+    const currentDraftFiles = draftFilesRef.current;
+    const hasUploadingImages = currentDraftImages.some(
+      (image) => image.uploading
+    );
+    const hasFailedImages = currentDraftImages.some(
+      (image) => image.uploadError
+    );
+    const hasUploadingFiles = currentDraftFiles.some((file) => file.uploading);
+    const hasFailedFiles = currentDraftFiles.some((file) => file.uploadError);
     if (isSelectedProjectMissing || submitDisabled || hasUploadingImages || hasFailedImages || hasUploadingFiles || hasFailedFiles || disabled && !canQueueWhileBusy || isSendingTurn && !canSubmitWhileSending) {
       return;
     }
     const nextPrompt = draftPromptRef.current;
-    const nextDraftContent = { ...draftContent, prompt: nextPrompt };
+    const nextDraftContent = {
+      ...draftContent,
+      prompt: nextPrompt,
+      images: currentDraftImages,
+      files: currentDraftFiles
+    };
     if (!agentComposerDraftHasContent(nextDraftContent)) {
       return;
     }
-    if (draftImages.length > 0 && !promptImagesSupported) {
+    if (currentDraftImages.length > 0 && !promptImagesSupported) {
       onPromptImagesUnsupported?.();
       return;
     }
@@ -17625,14 +18064,9 @@ function AgentComposer({
       skills: availableSkills
     });
     onSubmit(submitContent);
-    if (draftImages.length > 0 && !canQueueWhileBusy) {
-      setSubmittedImagePreview(draftImages);
-      submittedImagePreviewObservedBusyRef.current = false;
-    } else {
-      setSubmittedImagePreview([]);
-      submittedImagePreviewObservedBusyRef.current = false;
-    }
     draftPromptRef.current = "";
+    draftImagesRef.current = [];
+    draftFilesRef.current = [];
     setPaletteDraftPrompt("");
     onDraftContentChange(emptyAgentComposerDraft());
   });
@@ -17698,7 +18132,7 @@ function AgentComposer({
   );
   const selectFileMention = useCallback9(
     (entry) => {
-      if (mentionControllerRef.current?.selectAgentGeneratedMentionItem(entry)) {
+      if (entry.kind === "file" && entry.mentionNavigation === "agent-generated-folder-back" && mentionControllerRef.current?.selectAgentGeneratedMentionItem(entry)) {
         return;
       }
       fileMentionSuggestion?.command(entry);
@@ -17771,6 +18205,22 @@ function AgentComposer({
     },
     [createFileMentionPaletteAdapter]
   );
+  const navigateFileMentionHierarchy = useCallback9(
+    (delta) => {
+      if (delta === -1) {
+        return mentionControllerRef.current?.exitAgentGeneratedBrowse() ?? false;
+      }
+      const item = createFileMentionPaletteAdapter().selectedItem;
+      if (!item || item.kind !== "file") {
+        return false;
+      }
+      if (item.mentionNavigation !== "agent-generated-folder") {
+        return false;
+      }
+      return mentionControllerRef.current?.selectAgentGeneratedMentionItem(item) ?? false;
+    },
+    [createFileMentionPaletteAdapter]
+  );
   const handleFileMentionKeyDown = useCallback9(
     (event) => {
       if (!showFileMentionPalette) {
@@ -17782,7 +18232,8 @@ function AgentComposer({
           createFileMentionPaletteAdapter().commitHighlighted();
         },
         cycleFilter: cycleFileMentionFilter,
-        moveSelection: moveFileMentionSelection
+        moveSelection: moveFileMentionSelection,
+        navigateHierarchy: navigateFileMentionHierarchy
       })(event);
     },
     [
@@ -17790,6 +18241,7 @@ function AgentComposer({
       createFileMentionPaletteAdapter,
       cycleFileMentionFilter,
       moveFileMentionSelection,
+      navigateFileMentionHierarchy,
       showFileMentionPalette
     ]
   );
@@ -17921,8 +18373,6 @@ function AgentComposer({
       draftPromptRef.current = nextDraft;
       setPaletteDraftPrompt(nextDraft);
       setIsPaletteOpen(true);
-      setSubmittedImagePreview([]);
-      submittedImagePreviewObservedBusyRef.current = false;
       onDraftContentChange({ ...draftContent, prompt: nextDraft });
     }
   );
@@ -17935,8 +18385,6 @@ function AgentComposer({
         onPromptImagesUnsupported?.();
         return;
       }
-      setSubmittedImagePreview([]);
-      submittedImagePreviewObservedBusyRef.current = false;
       const currentDraftImages = draftImagesRef.current;
       const remainingSlots = Math.max(
         0,
@@ -18095,7 +18543,6 @@ function AgentComposer({
               name: uploadedFile?.name ?? file.name,
               mimeType: uploadedFile?.mimeType ?? file.mimeType,
               path: uploadedPath,
-              hostPath: uploadedFile?.hostPath ?? file.hostPath,
               assetId: uploadedFile?.assetId,
               sizeBytes: uploadedFile?.sizeBytes,
               uploading: false
@@ -18420,24 +18867,7 @@ function AgentComposer({
   const visibleActivePrompt = activePrompt && dismissedPromptRequestId !== activePromptRequestId ? activePrompt : null;
   const disabledReasonText = disabledReason?.trim() ?? "";
   const effectivePlaceholder = disabledReasonText || placeholder;
-  const showingSubmittedImagePreview = draftImages.length === 0 && submittedImagePreview.length > 0;
-  const visibleDraftImages = draftImages.length > 0 ? draftImages : submittedImagePreview;
   const visibleDraftFiles = draftFiles;
-  useEffect11(() => {
-    if (submittedImagePreview.length === 0) {
-      submittedImagePreviewObservedBusyRef.current = false;
-      return;
-    }
-    const busy = isSubmittingPrompt || isSendingTurn;
-    if (busy) {
-      submittedImagePreviewObservedBusyRef.current = true;
-      return;
-    }
-    if (submittedImagePreviewObservedBusyRef.current) {
-      submittedImagePreviewObservedBusyRef.current = false;
-      setSubmittedImagePreview([]);
-    }
-  }, [isSendingTurn, isSubmittingPrompt, submittedImagePreview.length]);
   useEffect11(() => {
     if (previousSelectedProjectPathRef.current === selectedProjectPath) {
       return;
@@ -18604,13 +19034,12 @@ function AgentComposer({
                     modal: false,
                     children: [
                       /* @__PURE__ */ jsx26(PopoverAnchor, { asChild: true, children: /* @__PURE__ */ jsxs13("div", { ref: promptInputAreaRef, className: "min-w-0 self-start", children: [
-                        visibleDraftImages.length > 0 ? /* @__PURE__ */ jsx26(
+                        draftImages.length > 0 ? /* @__PURE__ */ jsx26(
                           "div",
                           {
                             className: "mb-2 grid max-w-[320px] grid-cols-[repeat(auto-fill,minmax(56px,1fr))] gap-2",
                             "data-testid": "agent-gui-composer-image-drafts",
-                            "data-submitted-preview": showingSubmittedImagePreview ? "true" : void 0,
-                            children: visibleDraftImages.map((image) => /* @__PURE__ */ jsxs13(
+                            children: draftImages.map((image) => /* @__PURE__ */ jsxs13(
                               "div",
                               {
                                 className: cn(
@@ -18648,7 +19077,7 @@ function AgentComposer({
                                       )
                                     }
                                   ) : null,
-                                  showingSubmittedImagePreview ? null : /* @__PURE__ */ jsx26(
+                                  /* @__PURE__ */ jsx26(
                                     "button",
                                     {
                                       type: "button",
@@ -18766,6 +19195,7 @@ function AgentComposer({
                                 onSelectCategory: (filter) => mentionControllerRef.current?.setFilter(filter),
                                 onSelectFilter: (filter) => mentionControllerRef.current?.setFilter(filter),
                                 onExpandGroup: (groupId) => mentionControllerRef.current?.expandGroup(groupId),
+                                onNavigateHierarchy: navigateFileMentionHierarchy,
                                 onOpenReferences: onRequestWorkspaceReferences ? handleOpenReferencesForEntity : void 0
                               }
                             )
@@ -19579,6 +20009,9 @@ function numberValue(value) {
   }
   return null;
 }
+function isAppServerStartupLoading2(rawState, key) {
+  return objectRecord(rawState?.runtimeContext?.appServerStartup)?.[key] === "loading";
+}
 function resolveSlashStatus({
   rawState,
   limits,
@@ -19594,7 +20027,7 @@ function resolveSlashStatus({
     agentSessionId: rawState?.agentSessionId ?? null,
     baseUrl: stringValue2(providerConfig?.baseUrl) || null,
     limits,
-    limitsLoading,
+    limitsLoading: limitsLoading || isAppServerStartupLoading2(rawState, "rateLimits"),
     contextWindow: contextWindow ? {
       usedTokens: numberValue(contextWindow.usedTokens) ?? numberValue(contextWindow.used_tokens),
       totalTokens: numberValue(contextWindow.totalTokens) ?? numberValue(contextWindow.total_tokens)
@@ -19728,12 +20161,13 @@ function AgentGUINodeView({
   );
   const hostLocalFileLabel = uiLanguage === "zh-CN" ? "\u672C\u5730\u6587\u4EF6(\u5BBF\u4E3B\u673A)" : "Local files (Host)";
   const hostLocalFileSelectLabel = uiLanguage === "zh-CN" ? "\u4ECE\u7535\u8111\u9009\u62E9\u2026" : "Choose from computer\u2026";
+  const hostLocalFileSourceId = "host-local-file";
   const hostLocalFileActionPath = "host-local-file://select";
   const referenceSourceAggregatorWithHostLocalFile = useMemo10(() => {
     if (!referenceSourceAggregator) {
       return null;
     }
-    const sourceId = "host-local-file";
+    const sourceId = hostLocalFileSourceId;
     const actionNode = {
       ref: { sourceId, nodeId: "select-files" },
       kind: "file",
@@ -19834,7 +20268,16 @@ function AgentGUINodeView({
         return referenceSourceAggregator.getLoadedSource(currentSourceId);
       }
     };
-  }, [hostLocalFileLabel, hostLocalFileSelectLabel, referenceSourceAggregator]);
+  }, [
+    hostLocalFileLabel,
+    hostLocalFileSelectLabel,
+    hostLocalFileSourceId,
+    referenceSourceAggregator
+  ]);
+  const isWorkspaceReferencePickerNodeSelectable = useCallback10(
+    (node) => node.ref.sourceId !== hostLocalFileSourceId || node.kind === "file",
+    [hostLocalFileSourceId]
+  );
   const requestWorkspaceReferences = useCallback10(
     async (entity) => {
       if (previewMode) {
@@ -19890,7 +20333,13 @@ function AgentGUINodeView({
       const wantsHostFiles = refs.some(
         (ref) => ref.path === hostLocalFileActionPath
       );
-      if (!wantsHostFiles) {
+      const hostSourceRefs = refs.filter(
+        (ref) => ref.sourceId === hostLocalFileSourceId && ref.path !== hostLocalFileActionPath
+      );
+      const hostSourceFileRefs = hostSourceRefs.filter(
+        (ref) => ref.kind === "file"
+      );
+      if (!wantsHostFiles && hostSourceRefs.length === 0) {
         settleReferencePicker(
           { files: refs, mentionItems: [], hostAttachments: [] },
           refs
@@ -19898,25 +20347,53 @@ function AgentGUINodeView({
         return;
       }
       const workspaceRefs = refs.filter(
-        (ref) => ref.path !== hostLocalFileActionPath
+        (ref) => ref.path !== hostLocalFileActionPath && ref.sourceId !== hostLocalFileSourceId
       );
-      const selected = await agentHostApi.workspace.selectFiles({
+      const selected = wantsHostFiles ? await agentHostApi.workspace.selectFiles({
         allowDirectories: false
-      });
-      const hostAttachments = selected.map((file) => ({
+      }) : [];
+      const selectedHostAttachments = selected.map((file) => ({
         hostPath: file.path,
         name: file.name || file.path.split("/").pop() || file.path,
         mimeType: null
       }));
+      const browsedHostAttachments = hostSourceFileRefs.map((file) => ({
+        hostPath: file.path,
+        name: file.displayName || file.path.split("/").pop() || file.path,
+        mimeType: null
+      }));
       settleReferencePicker(
-        { files: workspaceRefs, mentionItems: [], hostAttachments },
+        {
+          files: workspaceRefs,
+          mentionItems: [],
+          hostAttachments: [
+            ...selectedHostAttachments,
+            ...browsedHostAttachments
+          ]
+        },
         workspaceRefs
       );
     },
-    [agentHostApi.workspace, settleReferencePicker]
+    [
+      agentHostApi.workspace,
+      hostLocalFileActionPath,
+      hostLocalFileSourceId,
+      settleReferencePicker
+    ]
   );
   const confirmWorkspaceReferenceBundles = useCallback10(
     (result) => {
+      const hostSourceRefs = result.files.filter(
+        (ref) => ref.sourceId === hostLocalFileSourceId && ref.kind === "file"
+      );
+      const workspaceRefs = result.files.filter(
+        (ref) => ref.sourceId !== hostLocalFileSourceId
+      );
+      const hostAttachments = hostSourceRefs.map((file) => ({
+        hostPath: file.path,
+        name: file.displayName || file.path.split("/").pop() || file.path,
+        mimeType: null
+      }));
       const mentionItems = result.bundles.filter((bundle) => bundle.handle != null).map((bundle) => {
         const handle = bundle.handle;
         const bundleIconUrl = bundle.iconUrl ?? void 0;
@@ -19944,11 +20421,11 @@ function AgentGUINodeView({
         };
       });
       settleReferencePicker(
-        { files: result.files, mentionItems, hostAttachments: [] },
-        result.files
+        { files: workspaceRefs, mentionItems, hostAttachments },
+        workspaceRefs
       );
     },
-    [settleReferencePicker, viewModel.workspaceId]
+    [hostLocalFileSourceId, settleReferencePicker]
   );
   const openclawGateway = useMemo10(
     () => viewModel.openclawGateway ?? (viewModel.data.provider === "openclaw" ? { status: "starting", error: null } : null),
@@ -20296,6 +20773,7 @@ function AgentGUINodeView({
         aggregator: referenceSourceAggregatorWithHostLocalFile,
         copy: workspaceFileReferenceCopy ?? fallbackWorkspaceFileReferenceCopy,
         initialTarget: workspaceReferencePickerTarget,
+        isNodeSelectable: isWorkspaceReferencePickerNodeSelectable,
         open: workspaceReferencePickerOpen,
         workspaceId: viewModel.workspaceId,
         onClose: closeWorkspaceReferencePicker,