opencami 1.3.2 → 1.5.0

package/dist/server/assets/{_sessionKey-DVNrEYFh.js → _sessionKey-tRze5NLR.js}

@@ -3,12 +3,12 @@ import { Link, useNavigate } from "@tanstack/react-router";
 import * as React from "react";
 import React__default, { memo, useDeferredValue, useState, useMemo, useCallback, Suspense, lazy, useRef, useEffect, useId, useLayoutEffect, createContext, useContext } from "react";
 import { useQueryClient, useMutation, useQuery } from "@tanstack/react-query";
-import { T as TooltipProvider, a as TooltipRoot, b as TooltipTrigger, c as TooltipContent, s as setChatUiState, d as chatUiQueryKey, g as getChatUiState } from "./tooltip-gbV6rEVv.js";
+import { T as TooltipProvider, a as TooltipRoot, b as TooltipTrigger, c as TooltipContent, s as setChatUiState, d as chatUiQueryKey, g as getChatUiState } from "./tooltip-DgsSPocE.js";
 import { HugeiconsIcon } from "@hugeicons/react";
-import { Tick01Icon, Cancel01Icon, MoreHorizontalIcon, Pen01Icon, Upload01Icon, Delete01Icon, BotIcon, Clock01Icon, Chat01Icon, ArrowRight01Icon, SidebarLeft01Icon, PencilEdit02Icon, Folder01Icon, AiBrain01Icon, Search01Icon, Settings01Icon, Menu01Icon, Tick02Icon, Copy01Icon, Loading02Icon, StopIcon, VolumeHighIcon, ArrowDown01Icon, Loading03Icon, ArtificialIntelligence02Icon, CommandIcon, Attachment01Icon, File01Icon, Mic02Icon, ArrowUp02Icon } from "@hugeicons/core-free-icons";
+import { Tick01Icon, Cancel01Icon, MoreHorizontalIcon, Pen01Icon, Upload01Icon, Delete01Icon, BotIcon, Clock01Icon, Chat01Icon, ArrowRight01Icon, SidebarLeft01Icon, PencilEdit02Icon, Folder01Icon, PackageOpenIcon, AiBrain01Icon, SmartPhone01Icon, Search01Icon, Settings01Icon, Menu01Icon, Tick02Icon, Copy01Icon, Loading02Icon, StopIcon, VolumeHighIcon, ArrowDown01Icon, Loading03Icon, ArtificialIntelligence02Icon, CommandIcon, Attachment01Icon, File01Icon, Mic02Icon, ArrowUp02Icon } from "@hugeicons/core-free-icons";
 import { motion, AnimatePresence } from "motion/react";
-import { D as DialogRoot, a as DialogContent, b as DialogTitle, c as DialogDescription, d as DialogClose, M as MenuRoot, e as MenuTrigger, f as MenuContent, g as MenuItem, u as useFileExplorerState } from "./use-file-explorer-state-DMHdtb7D.js";
-import { B as Button, c as cn, b as buttonVariants } from "./button-DtQ3rV1m.js";
+import { D as DialogRoot, a as DialogContent, b as DialogTitle, c as DialogDescription, d as DialogClose, M as MenuRoot, e as MenuTrigger, f as MenuContent, g as MenuItem, u as useFileExplorerState } from "./use-file-explorer-state-Il1LlBAe.js";
+import { B as Button, c as cn, b as buttonVariants } from "./button-CwY2OHFj.js";
 import { AlertDialog } from "@base-ui/react/alert-dialog";
 import { Collapsible as Collapsible$1 } from "@base-ui/react/collapsible";
 import { ScrollArea } from "@base-ui/react/scroll-area";
@@ -17,11 +17,11 @@ import { marked } from "marked";
 import ReactMarkdown from "react-markdown";
 import remarkBreaks from "remark-breaks";
 import remarkGfm from "remark-gfm";
-import { r as resolveLanguage, u as useChatSettingsStore, C as CodeBlock, a as useChatSettings$1 } from "./index-CmbNTqa2.js";
+import { r as resolveLanguage, C as CodeBlock, u as useChatSettings$1 } from "./index-CNIATlJ9.js";
 import { create } from "zustand";
 import { persist } from "zustand/middleware";
 import { createPortal } from "react-dom";
-import { a as Route } from "./router-OoQe2c20.js";
+import { a as Route } from "./router-rn7pJO_D.js";
 function deriveFriendlyIdFromKey(key) {
   if (!key) return "main";
   const trimmed = key.trim();
@@ -758,7 +758,7 @@ function SessionItemComponent({
         "group inline-flex items-center justify-between",
         "w-full text-left pl-1.5 pr-0.5 min-h-8 py-1 rounded-lg transition-colors duration-0",
         "select-none",
-        active ? "bg-primary-200 text-primary-950" : "bg-transparent text-primary-950 [&:hover:not(:has(button:hover))]:bg-primary-200"
+        active ? "bg-[var(--opencami-accent-light)] text-[var(--opencami-accent)]" : "bg-transparent text-primary-950 [&:hover:not(:has(button:hover))]:bg-primary-200"
       ),
       children: [
         /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-2 flex-1 min-w-0", children: [
@@ -784,7 +784,7 @@ function SessionItemComponent({
                   className: "text-primary-500/70 shrink-0"
                 }
               ),
-              /* @__PURE__ */ jsxs("div", { className: "text-sm font-[450] line-clamp-1 min-w-0", children: [
+              /* @__PURE__ */ jsxs("div", { className: "min-w-0 truncate text-sm font-[450]", title: label, children: [
                 isPinned ? /* @__PURE__ */ jsx("span", { className: "mr-1 text-xs text-primary-700", "aria-hidden": "true", children: "📌" }) : null,
                 label
               ] }),
@@ -1114,13 +1114,28 @@ const SidebarSessions = memo(function SidebarSessions2({
       `Delete ${selectedSessions.length} sessions? This will archive them.`
     );
     if (!confirmed) return;
-    const errors = await runWithConcurrency(
-      selectedSessions.map((session) => session.key),
+    const failedSessionLabels = [];
+    await runWithConcurrency(
+      selectedSessions,
       10,
-      deleteSessionRequest
+      async (session) => {
+        try {
+          await deleteSessionRequest(session.key);
+        } catch (err) {
+          failedSessionLabels.push(
+            session.label || session.title || session.derivedTitle || session.friendlyId
+          );
+          throw err;
+        }
+      }
     );
-    if (errors.length > 0) {
-      console.error("[sidebar] Bulk delete failed for some sessions", errors);
+    if (failedSessionLabels.length > 0) {
+      console.error("[sidebar] Bulk delete failed for some sessions", failedSessionLabels);
+      window.alert(
+        `Could not delete ${failedSessionLabels.length} session${failedSessionLabels.length !== 1 ? "s" : ""}:
+
+${failedSessionLabels.join("\n")}`
+      );
     }
     setSelectionMode(false);
     setSelectedSessionKeys(/* @__PURE__ */ new Set());
@@ -1649,10 +1664,10 @@ function useRenameSession() {
   return { renameSession, renaming, error };
 }
 const SettingsDialog = lazy(
-  () => import("./settings-dialog-BsJsnMiu.js").then((m) => ({ default: m.SettingsDialog }))
+  () => import("./settings-dialog-BBM7jCjE.js").then((m) => ({ default: m.SettingsDialog }))
 );
 const SessionExportDialog = lazy(
-  () => import("./session-export-dialog-DRVbC8Q-.js").then((m) => ({
+  () => import("./session-export-dialog-CwclV0Aj.js").then((m) => ({
     default: m.SessionExportDialog
   }))
 );
@@ -1762,7 +1777,7 @@ function ChatSidebarComponent({
     motion.aside,
     {
       initial: false,
-      animate: { width: isCollapsed ? 48 : 300 },
+      animate: { width: isCollapsed ? 48 : "var(--opencami-sidebar-width)" },
       transition,
       className: asideProps.className,
       children: [
@@ -1893,6 +1908,48 @@ function ChatSidebarComponent({
                   ) }),
                   isCollapsed && /* @__PURE__ */ jsx(TooltipContent, { side: "right", children: "Files" })
                 ] }) }),
+                (() => {
+                  try {
+                    return localStorage.getItem("opencami-skills-browser") === "true";
+                  } catch {
+                    return false;
+                  }
+                })() && /* @__PURE__ */ jsx(TooltipProvider, { children: /* @__PURE__ */ jsxs(TooltipRoot, { children: [
+                  /* @__PURE__ */ jsx(TooltipTrigger, { asChild: true, children: /* @__PURE__ */ jsxs(
+                    Link,
+                    {
+                      to: "/skills",
+                      className: cn(
+                        buttonVariants({ variant: "ghost", size: "sm" }),
+                        "w-full pl-1.5 justify-start"
+                      ),
+                      onClick: onSelectSession,
+                      children: [
+                        /* @__PURE__ */ jsx(
+                          HugeiconsIcon,
+                          {
+                            icon: PackageOpenIcon,
+                            size: 20,
+                            strokeWidth: 1.5,
+                            className: "min-w-5"
+                          }
+                        ),
+                        /* @__PURE__ */ jsx(AnimatePresence, { initial: false, mode: "wait", children: !isCollapsed && /* @__PURE__ */ jsx(
+                          motion.span,
+                          {
+                            initial: { opacity: 0 },
+                            animate: { opacity: 1 },
+                            exit: { opacity: 0 },
+                            transition,
+                            className: "overflow-hidden whitespace-nowrap",
+                            children: "Skills"
+                          }
+                        ) })
+                      ]
+                    }
+                  ) }),
+                  isCollapsed && /* @__PURE__ */ jsx(TooltipContent, { side: "right", children: "Skills" })
+                ] }) }),
                 (() => {
                   try {
                     return localStorage.getItem("opencami-agent-manager") === "true";
@@ -1934,6 +1991,48 @@ function ChatSidebarComponent({
                     }
                   ) }),
                   isCollapsed && /* @__PURE__ */ jsx(TooltipContent, { side: "right", children: "Agents" })
+                ] }) }),
+                (() => {
+                  try {
+                    return localStorage.getItem("opencami-cron-manager") === "true";
+                  } catch {
+                    return false;
+                  }
+                })() && /* @__PURE__ */ jsx(TooltipProvider, { children: /* @__PURE__ */ jsxs(TooltipRoot, { children: [
+                  /* @__PURE__ */ jsx(TooltipTrigger, { asChild: true, children: /* @__PURE__ */ jsxs(
+                    Link,
+                    {
+                      to: "/bots",
+                      className: cn(
+                        buttonVariants({ variant: "ghost", size: "sm" }),
+                        "w-full pl-1.5 justify-start"
+                      ),
+                      onClick: onSelectSession,
+                      children: [
+                        /* @__PURE__ */ jsx(
+                          HugeiconsIcon,
+                          {
+                            icon: SmartPhone01Icon,
+                            size: 20,
+                            strokeWidth: 1.5,
+                            className: "min-w-5"
+                          }
+                        ),
+                        /* @__PURE__ */ jsx(AnimatePresence, { initial: false, mode: "wait", children: !isCollapsed && /* @__PURE__ */ jsx(
+                          motion.span,
+                          {
+                            initial: { opacity: 0 },
+                            animate: { opacity: 1 },
+                            exit: { opacity: 0 },
+                            transition,
+                            className: "overflow-hidden whitespace-nowrap",
+                            children: "Cron Jobs"
+                          }
+                        ) })
+                      ]
+                    }
+                  ) }),
+                  isCollapsed && /* @__PURE__ */ jsx(TooltipContent, { side: "right", children: "Cron Jobs" })
                 ] }) })
               ]
             }
@@ -2281,7 +2380,8 @@ function ChatHeaderComponent({
     "div",
     {
       ref: wrapperRef,
-      className: "border-b border-primary-200 px-4 h-12 flex items-center bg-surface",
+      "data-tauri-drag-region": true,
+      className: "border-b border-primary-200 px-4 h-12 flex min-w-0 items-center overflow-x-hidden bg-surface tauri-drag-header",
       children: [
         showSidebarButton ? /* @__PURE__ */ jsx(
           Button,
@@ -2290,11 +2390,12 @@ function ChatHeaderComponent({
             variant: "ghost",
             onClick: onOpenSidebar,
             className: "mr-2 text-primary-800 hover:bg-primary-100",
+            style: { WebkitAppRegion: "no-drag" },
             "aria-label": "Open sidebar",
             children: /* @__PURE__ */ jsx(HugeiconsIcon, { icon: Menu01Icon, size: 18, strokeWidth: 1.6 })
           }
         ) : null,
-        /* @__PURE__ */ jsx("div", { className: "text-sm font-medium truncate flex-1 min-w-0", children: activeTitle }),
+        /* @__PURE__ */ jsx("div", { className: "flex-1 min-w-0 overflow-hidden", children: /* @__PURE__ */ jsx("div", { className: "truncate text-sm font-medium", children: activeTitle }) }),
         /* @__PURE__ */ jsx(
           MemoizedContextMeter,
           {
@@ -2523,6 +2624,108 @@ function MessageActionsBar({
     }
   );
 }
+const KNOWN_FILE_EXTENSIONS = [
+  "md",
+  "txt",
+  "json",
+  "yaml",
+  "yml",
+  "toml",
+  "py",
+  "js",
+  "ts",
+  "tsx",
+  "jsx",
+  "css",
+  "scss",
+  "html",
+  "xml",
+  "sh",
+  "bash",
+  "go",
+  "rs",
+  "rb",
+  "php",
+  "java",
+  "kt",
+  "swift",
+  "c",
+  "cpp",
+  "h",
+  "hpp",
+  "sql",
+  "graphql",
+  "dockerfile",
+  "env",
+  "conf",
+  "cfg",
+  "ini",
+  "log",
+  "csv"
+];
+const EXTENSION_PATTERN = KNOWN_FILE_EXTENSIONS.join("|");
+const ABSOLUTE_OR_HOME_PATH_PATTERN = "(?:~\\/[A-Za-z0-9._\\-\\/]*[A-Za-z0-9._\\-\\/]|\\/(?:[\\w.\\-]+\\/)*[\\w.\\-]+\\/?)";
+const RELATIVE_PATH_PATTERN = "(?:[A-Za-z0-9._\\-]+(?:\\/[A-Za-z0-9._\\-]+)+\\/?)";
+const BARE_FILENAME_PATTERN = `(?:[A-Za-z0-9_-][A-Za-z0-9._-]*[A-Za-z0-9_-]\\.(?:${EXTENSION_PATTERN})|dockerfile)`;
+const FILE_PATH_REGEX = new RegExp(
+  `(^|[\\s"'(,;:])(${ABSOLUTE_OR_HOME_PATH_PATTERN}|${RELATIVE_PATH_PATTERN}|${BARE_FILENAME_PATTERN})(?=$|[\\s"'),;:!?])`,
+  "gi"
+);
+function trimTrailingPunctuation(path) {
+  if (!path) return { path: path ?? "", trailing: "" };
+  const match = path.match(/^(.*?)([),.;:!?]+)?$/);
+  if (!match) return { path, trailing: "" };
+  return { path: match[1] || path, trailing: match[2] || "" };
+}
+function isLikelyFilePath(text) {
+  if (!text) return false;
+  FILE_PATH_REGEX.lastIndex = 0;
+  const match = FILE_PATH_REGEX.exec(text);
+  if (!match) return false;
+  const prefix = match[1] || "";
+  const value = match[2] || "";
+  const matchStart = match.index + prefix.length;
+  const matchEnd = matchStart + value.length;
+  return matchStart === 0 && matchEnd === text.length;
+}
+function splitTextByFilePaths(text) {
+  if (!text) return [{ type: "text", value: text }];
+  const segments = [];
+  let lastIndex = 0;
+  FILE_PATH_REGEX.lastIndex = 0;
+  let match;
+  while ((match = FILE_PATH_REGEX.exec(text)) !== null) {
+    const prefix = match[1] || "";
+    const rawPath = match[2] || "";
+    const fullMatch = match[0];
+    const start = match.index;
+    const prefixStart = start;
+    const pathStart = start + prefix.length;
+    if (prefixStart > lastIndex) {
+      segments.push({ type: "text", value: text.slice(lastIndex, prefixStart) });
+    }
+    if (prefix) {
+      segments.push({ type: "text", value: prefix });
+    }
+    const { path, trailing } = trimTrailingPunctuation(rawPath);
+    if (path.length > 1) {
+      segments.push({ type: "path", value: path });
+      if (trailing) {
+        segments.push({ type: "text", value: trailing });
+      }
+    } else {
+      segments.push({ type: "text", value: fullMatch });
+    }
+    lastIndex = pathStart + rawPath.length;
+  }
+  if (lastIndex < text.length) {
+    segments.push({ type: "text", value: text.slice(lastIndex) });
+  }
+  return segments.length > 0 ? segments : [{ type: "text", value: text }];
+}
+function filePathToMarkdownHref(path) {
+  return `openclaw-file://${encodeURIComponent(path)}`;
+}
 function markdownHrefToFilePath(href) {
   if (!href?.startsWith("openclaw-file://")) return null;
   try {
@@ -2531,6 +2734,39 @@ function markdownHrefToFilePath(href) {
     return null;
   }
 }
+function remarkFilePathLinks() {
+  return (tree) => {
+    function visit(node, parent) {
+      if (!node) return;
+      if (node.type === "text" && parent && parent.type !== "link" && parent.type !== "inlineCode" && parent.type !== "code") {
+        const segments = splitTextByFilePaths(String(node.value || ""));
+        const hasPaths = segments.some((segment) => segment.type === "path");
+        if (!hasPaths) return;
+        const replacement = segments.map((segment) => {
+          if (segment.type === "text") {
+            return { type: "text", value: segment.value };
+          }
+          return {
+            type: "link",
+            url: filePathToMarkdownHref(segment.value),
+            children: [{ type: "text", value: segment.value }]
+          };
+        });
+        const index = parent.children.indexOf(node);
+        if (index >= 0) {
+          parent.children.splice(index, 1, ...replacement);
+        }
+        return;
+      }
+      if (Array.isArray(node.children)) {
+        for (const child of [...node.children]) {
+          visit(child, node);
+        }
+      }
+    }
+    visit(tree, null);
+  };
+}
 const EXTENSION_LANGUAGE_MAP = {
   py: "python",
   ts: "typescript",
@@ -2574,27 +2810,67 @@ function languageFromFilePath(path) {
   return resolveLanguage(mapped);
 }
 const INLINE_PREVIEW_MAX_BYTES = 100 * 1024;
+function normalizeClickedPath(path) {
+  if (!path) return "/";
+  return path.includes("/") ? path : `/${path}`;
+}
+function toWorkspacePath(path) {
+  let p = normalizeClickedPath(path);
+  const prefixes = ["/root/clawd/", "/root/"];
+  for (const prefix of prefixes) {
+    if (p.startsWith(prefix)) {
+      p = "/" + p.slice(prefix.length);
+      break;
+    }
+  }
+  return p.startsWith("/") ? p : `/${p}`;
+}
+function hasExtension(path) {
+  const trimmed = path.replace(/\/+$/, "");
+  const name = trimmed.split("/").pop() || "";
+  if (!name || name.startsWith(".")) return false;
+  return name.includes(".");
+}
+function isDirectoryPathHeuristic(path) {
+  if (!path) return false;
+  return path.endsWith("/") || !hasExtension(path);
+}
+function isDirectoryError(code, message) {
+  const normalizedCode = String(code || "").toUpperCase();
+  const normalizedMessage = String(message || "").toLowerCase();
+  return normalizedCode.includes("DIRECTORY") || normalizedMessage.includes("is a directory") || normalizedMessage.includes("directory");
+}
 function parseMarkdownIntoBlocks(markdown) {
   const tokens = marked.lexer(markdown);
   return tokens.map((token) => token.raw);
 }
 function extractLanguage(className) {
   if (!className) return "text";
-  const match = className.match(/language-(\w+)/);
+  const match = className.match(/language-([\w-]+)/);
   return match ? match[1] : "text";
 }
+function extractFilenameFromMeta(meta) {
+  const value = meta?.trim();
+  if (!value) return void 0;
+  const firstToken = value.split(/\s+/)[0];
+  return firstToken || void 0;
+}
 const BASE_COMPONENTS = {
-  code: function CodeComponent({ className, children }) {
+  code: function CodeComponent({ className, children, node }) {
     const isInline = !className?.includes("language-");
     if (isInline) {
       return /* @__PURE__ */ jsx("code", { className: "rounded bg-primary-100 px-1.5 py-1 text-sm font-mono text-primary-900 border border-primary-200", children });
     }
     const language = extractLanguage(className);
+    const filename = extractFilenameFromMeta(
+      node?.data?.meta
+    );
     return /* @__PURE__ */ jsx(
       CodeBlock,
       {
         content: String(children ?? ""),
         language,
+        filename,
         className: "w-full"
       }
     );
@@ -2654,19 +2930,18 @@ const BASE_COMPONENTS = {
     return /* @__PURE__ */ jsx("td", { className: "px-3 py-2 text-primary-950", children });
   }
 };
-function createDefaultComponents(onOpenFilePreview, inlineFilePreviewEnabled) {
-  const FILE_PATH_RE = /^(?:~\/[\w.\-\/]+|\/(?:[\w.\-]+\/)+[\w.\-]+)$/;
+function createDefaultComponents(onOpenFilePreview) {
   return {
     ...BASE_COMPONENTS,
     a: function AComponent({ children, href }) {
       const filePath = markdownHrefToFilePath(href);
-      if (inlineFilePreviewEnabled && filePath) {
+      if (filePath) {
         return /* @__PURE__ */ jsx(
           "button",
           {
             type: "button",
             onClick: () => onOpenFilePreview(filePath),
-            className: "font-mono text-primary-900 underline decoration-primary-300 underline-offset-4 hover:decoration-primary-600 cursor-pointer",
+            className: "font-mono text-[var(--opencami-accent)] underline decoration-[var(--opencami-accent-light)] underline-offset-4 hover:opacity-90 cursor-pointer",
             children
           }
         );
@@ -2675,17 +2950,34 @@ function createDefaultComponents(onOpenFilePreview, inlineFilePreviewEnabled) {
         "a",
         {
           href,
-          className: "text-primary-950 underline decoration-primary-300 underline-offset-4 transition-colors hover:text-primary-950 hover:decoration-primary-500",
+          onClick: (event) => {
+            if (href?.startsWith("openclaw-file://")) event.preventDefault();
+          },
+          className: "text-[var(--opencami-accent)] underline decoration-[var(--opencami-accent-light)] underline-offset-4 transition-opacity hover:opacity-90",
           target: "_blank",
           rel: "noopener noreferrer",
           children
         }
       );
     },
-    code: function InlineCodeComponent({ children, className }) {
-      if (className) return /* @__PURE__ */ jsx("code", { className, children });
+    code: function InlineCodeComponent({ children, className, node }) {
+      if (className?.includes("language-")) {
+        const language = extractLanguage(className);
+        const filename = extractFilenameFromMeta(
+          node?.data?.meta
+        );
+        return /* @__PURE__ */ jsx(
+          CodeBlock,
+          {
+            content: String(children ?? ""),
+            language,
+            filename,
+            className: "w-full"
+          }
+        );
+      }
       const text = typeof children === "string" ? children : Array.isArray(children) ? children.filter((c) => typeof c === "string").join("") : String(children ?? "");
-      if (inlineFilePreviewEnabled && text && FILE_PATH_RE.test(text)) {
+      if (text && isLikelyFilePath(text)) {
         return /* @__PURE__ */ jsx(
           "button",
           {
@@ -2708,7 +3000,7 @@ const MemoizedMarkdownBlock = memo(
     return /* @__PURE__ */ jsx(
       ReactMarkdown,
       {
-        remarkPlugins: [remarkGfm, remarkBreaks],
+        remarkPlugins: [remarkGfm, remarkBreaks, remarkFilePathLinks],
         components,
         children: content
       }
@@ -2735,15 +3027,24 @@ function MarkdownComponent({
   const blockId = id ?? generatedId;
   const blocks = useMemo(() => parseMarkdownIntoBlocks(children), [children]);
   const [filePreview, setFilePreview] = useState({ status: "idle" });
-  const inlineFilePreviewEnabled = useChatSettingsStore(
-    (state) => state.settings.inlineFilePreview
-  );
+  const navigate = useNavigate();
+  const openDirectoryInExplorer = useCallback((path) => {
+    const workspacePath = toWorkspacePath(path);
+    useFileExplorerState.getState().navigateTo(workspacePath);
+    setFilePreview({ status: "idle" });
+    navigate({ to: "/files" });
+  }, [navigate]);
+  const onOpenFilePreview = useCallback((path) => {
+    const resolvedPath = normalizeClickedPath(path);
+    if (isDirectoryPathHeuristic(resolvedPath)) {
+      openDirectoryInExplorer(resolvedPath);
+      return;
+    }
+    setFilePreview({ status: "loading", path: resolvedPath });
+  }, [openDirectoryInExplorer]);
   const defaultComponents = useMemo(
-    () => createDefaultComponents(
-      (path) => setFilePreview({ status: "loading", path }),
-      inlineFilePreviewEnabled
-    ),
-    [inlineFilePreviewEnabled]
+    () => createDefaultComponents(onOpenFilePreview),
+    [onOpenFilePreview]
   );
   const mergedComponents = useMemo(
     () => ({ ...defaultComponents, ...components || {} }),
@@ -2758,6 +3059,10 @@ function MarkdownComponent({
     }).then(async (response) => {
       const payload = await response.json().catch(() => ({}));
       if (!response.ok) {
+        if (isDirectoryError(payload.code, payload.message)) {
+          openDirectoryInExplorer(path);
+          return;
+        }
         const error = fileErrorMessageFromResponse(response.status, payload.code);
         setFilePreview({ status: "error", path, message: error });
         return;
@@ -2779,17 +3084,33 @@ function MarkdownComponent({
       setFilePreview({ status: "error", path, message: "Failed to load file preview" });
     });
     return () => controller.abort();
-  }, [filePreview]);
+  }, [filePreview, openDirectoryInExplorer]);
   const previewOpen = filePreview.status !== "idle";
   return /* @__PURE__ */ jsxs(Fragment, { children: [
-    /* @__PURE__ */ jsx("div", { className: cn("flex flex-col gap-2", className), children: blocks.map((block, index) => /* @__PURE__ */ jsx(
-      MemoizedMarkdownBlock,
+    /* @__PURE__ */ jsx(
+      "div",
       {
-        content: block,
-        components: mergedComponents
-      },
-      `${blockId}-block-${index}`
-    )) }),
+        className: cn("flex min-w-0 max-w-full flex-col gap-2 overflow-x-hidden", className),
+        onClickCapture: (event) => {
+          const target = event.target;
+          const anchor = target?.closest?.('a[href^="openclaw-file://"]');
+          if (!anchor) return;
+          const filePath = markdownHrefToFilePath(anchor.getAttribute("href") ?? void 0);
+          if (!filePath) return;
+          event.preventDefault();
+          event.stopPropagation();
+          onOpenFilePreview(filePath);
+        },
+        children: blocks.map((block, index) => /* @__PURE__ */ jsx(
+          MemoizedMarkdownBlock,
+          {
+            content: block,
+            components: mergedComponents
+          },
+          `${blockId}-block-${index}`
+        ))
+      }
+    ),
     /* @__PURE__ */ jsx(
       DialogRoot,
       {
@@ -2809,21 +3130,28 @@ function MarkdownComponent({
                 {
                   to: "/files",
                   onClick: () => {
-                    let p = filePreview.status !== "idle" ? filePreview.path : "";
+                    const p = filePreview.status !== "idle" ? toWorkspacePath(filePreview.path) : "";
                     if (p) {
-                      const prefixes = ["/root/clawd/", "/root/"];
-                      for (const prefix of prefixes) {
-                        if (p.startsWith(prefix)) {
-                          p = "/" + p.slice(prefix.length);
-                          break;
-                        }
-                      }
                       const dir = p.includes("/") ? p.slice(0, p.lastIndexOf("/")) || "/" : "/";
                       useFileExplorerState.getState().navigateTo(dir);
                     }
                     setFilePreview({ status: "idle" });
                   },
-                  children: "Open in File Explorer"
+                  children: "Open in Explorer"
+                }
+              ) }),
+              filePreview.status !== "idle" && /* @__PURE__ */ jsx(Button, { variant: "ghost", size: "sm", asChild: true, children: /* @__PURE__ */ jsx(
+                Link,
+                {
+                  to: "/files",
+                  onClick: () => {
+                    const p = filePreview.status !== "idle" ? toWorkspacePath(filePreview.path) : "";
+                    if (p) {
+                      useFileExplorerState.getState().openInEditor(p);
+                    }
+                    setFilePreview({ status: "idle" });
+                  },
+                  children: "Open in Editor"
                 }
               ) }),
               /* @__PURE__ */ jsx(DialogClose, { children: "Close" })
@@ -2858,7 +3186,7 @@ function MessageContent({
   ...props
 }) {
   const classNames = cn(
-    "rounded-[12px] break-words whitespace-normal min-w-0",
+    "rounded-[12px] break-words whitespace-normal min-w-0 max-w-full overflow-x-hidden",
     className
   );
   return markdown ? /* @__PURE__ */ jsx(Markdown, { className: classNames, ...props, children }) : /* @__PURE__ */ jsx("div", { className: classNames, ...props, children });
@@ -3183,7 +3511,9 @@ function MessageItemComponent({
   aggregatedSearchSources,
   wrapperRef,
   wrapperClassName,
-  wrapperScrollMarginTop
+  wrapperScrollMarginTop,
+  messageDomId,
+  highlighted = false
 }) {
   const { settings } = useChatSettings$1();
   const role = message.role || "assistant";
@@ -3199,18 +3529,21 @@ function MessageItemComponent({
     "div",
     {
       ref: wrapperRef,
+      id: messageDomId,
+      "data-message-id": messageDomId,
       style: {
         contentVisibility: "auto",
         containIntrinsicSize: "auto 120px",
         ...typeof wrapperScrollMarginTop === "number" ? { scrollMarginTop: `${wrapperScrollMarginTop}px` } : void 0
       },
       className: cn(
-        "group flex flex-col gap-1",
+        "opencami-message-item group mx-auto flex w-full max-w-[var(--opencami-chat-width)] flex-col gap-1 py-[var(--opencami-msg-padding-y)]",
         wrapperClassName,
+        highlighted && "opencami-message-highlight",
         isUser ? "items-end" : "items-start"
       ),
       children: [
-        thinking && settings.showReasoningBlocks && /* @__PURE__ */ jsx("div", { className: "w-full max-w-[900px]", children: /* @__PURE__ */ jsx(Thinking, { content: thinking }) }),
+        thinking && settings.showReasoningBlocks && /* @__PURE__ */ jsx("div", { className: "w-full max-w-[var(--opencami-chat-width)]", children: /* @__PURE__ */ jsx(Thinking, { content: thinking }) }),
         images.length > 0 && /* @__PURE__ */ jsx("div", { className: cn(
           "flex flex-wrap gap-2 mb-2",
           isUser ? "justify-end" : "justify-start"
@@ -3225,19 +3558,19 @@ function MessageItemComponent({
           },
           idx
         )) }),
-        /* @__PURE__ */ jsx(Message, { className: cn(isUser ? "flex-row-reverse" : ""), children: /* @__PURE__ */ jsx(
+        /* @__PURE__ */ jsx(Message, { className: cn("min-w-0 max-w-full", isUser ? "flex-row-reverse" : ""), children: /* @__PURE__ */ jsx(
           MessageContent,
           {
             markdown: !isUser,
             className: cn(
-              "text-primary-900 opencami-text-size",
-              !isUser ? "bg-transparent w-full" : "bg-primary-100 px-4 py-2.5 max-w-[85%]",
+              "text-primary-900 opencami-text-size min-w-0 max-w-full",
+              isUser ? "opencami-message-user bg-primary-100 px-4 py-[var(--opencami-user-bubble-py)] max-w-[85%]" : "opencami-message-assistant bg-transparent w-full",
               !isUser && isStreaming && "stream-fade-in"
             ),
             children: text
           }
         ) }),
-        hasToolCalls && settings.showToolMessages && /* @__PURE__ */ jsx("div", { className: "w-full max-w-[900px] mt-2 flex flex-col gap-3", children: toolCalls.map((toolCall) => {
+        hasToolCalls && settings.showToolMessages && /* @__PURE__ */ jsx("div", { className: "mt-2 flex w-full min-w-0 max-w-[var(--opencami-chat-width)] flex-col gap-3 overflow-x-hidden", children: toolCalls.map((toolCall) => {
           const resultMessage = toolCall.id ? toolResultsByCallId?.get(toolCall.id) : void 0;
           const toolPart = mapToolCallToToolPart(toolCall, resultMessage);
           return /* @__PURE__ */ jsx(
@@ -3249,7 +3582,7 @@ function MessageItemComponent({
             toolCall.id || toolCall.name
           );
         }) }),
-        searchSources.length > 0 && /* @__PURE__ */ jsx("div", { className: "w-full max-w-[900px]", children: /* @__PURE__ */ jsx(SearchSourcesBadge, { sources: searchSources }) }),
+        searchSources.length > 0 && /* @__PURE__ */ jsx("div", { className: "w-full max-w-[var(--opencami-chat-width)]", children: /* @__PURE__ */ jsx(SearchSourcesBadge, { sources: searchSources }) }),
         !hasToolCalls && /* @__PURE__ */ jsx(
           MessageActionsBar,
           {
@@ -3275,6 +3608,8 @@ function areMessagesEqual(prevProps, nextProps) {
   if (prevProps.wrapperScrollMarginTop !== nextProps.wrapperScrollMarginTop) {
     return false;
   }
+  if (prevProps.messageDomId !== nextProps.messageDomId) return false;
+  if (prevProps.highlighted !== nextProps.highlighted) return false;
   if ((prevProps.message.role || "assistant") !== (nextProps.message.role || "assistant")) {
     return false;
   }
@@ -3854,12 +4189,12 @@ function ChatContainerShell({
         /* @__PURE__ */ jsx(
           ScrollAreaViewport,
           {
-            className: "relative will-change-transform",
+            className: "relative will-change-transform overflow-x-hidden",
             ref: viewportRef,
             ...viewportProps
           }
         ),
-        /* @__PURE__ */ jsx("div", { className: "relative mx-auto w-full max-w-full px-5 sm:max-w-[768px] sm:min-w-[400px] ", children: /* @__PURE__ */ jsx("div", { className: "pointer-events-none absolute bottom-10 right-10 z-50", children: /* @__PURE__ */ jsx(ScrollButton, { scrollRef }) }) }),
+        /* @__PURE__ */ jsx("div", { className: "relative mx-auto w-full min-w-0 max-w-full px-5 sm:max-w-[768px]", children: /* @__PURE__ */ jsx("div", { className: "pointer-events-none absolute bottom-10 right-10 z-50", children: /* @__PURE__ */ jsx(ScrollButton, { scrollRef }) }) }),
         /* @__PURE__ */ jsx(ScrollAreaScrollbar, { orientation: "vertical", children: /* @__PURE__ */ jsx(ScrollAreaThumb, {}) }),
         /* @__PURE__ */ jsx(ScrollAreaCorner, {})
       ]
@@ -3897,7 +4232,7 @@ function ChatContainerPortal({
 }) {
   if (!viewportNode) return null;
   return createPortal(
-    /* @__PURE__ */ jsx("div", { className: "relative flex w-full flex-col", children }),
+    /* @__PURE__ */ jsx("div", { className: "relative flex w-full min-w-0 max-w-full flex-col overflow-x-hidden", children }),
     viewportNode
   );
 }
@@ -3946,9 +4281,9 @@ function ChatContainerContent({
   return /* @__PURE__ */ jsx(
     "div",
     {
-      className: cn("flex w-full flex-col min-h-full", className),
+      className: cn("flex w-full min-w-0 max-w-full flex-col min-h-full overflow-x-hidden", className),
       ...props,
-      children: /* @__PURE__ */ jsx("div", { className: "mx-auto w-full max-w-full px-2 md:px-5 sm:max-w-[768px] sm:min-w-[400px] flex flex-col flex-1 min-h-full", children: /* @__PURE__ */ jsx("div", { className: "flex flex-col space-y-3 md:space-y-6", children }) })
+      children: /* @__PURE__ */ jsx("div", { className: "mx-auto w-full min-w-0 max-w-full px-2 md:px-5 sm:max-w-[768px] flex flex-col flex-1 min-h-full overflow-x-hidden", children: /* @__PURE__ */ jsx("div", { className: "flex min-w-0 max-w-full flex-col space-y-3 md:space-y-6", children }) })
     }
   );
 }
@@ -4022,13 +4357,15 @@ function ChatMessageListComponent({
   pinGroupMinHeight,
   headerHeight,
   contentStyle,
-  onFollowUpClick
+  onFollowUpClick,
+  jumpToMessageId
 }) {
   const anchorRef = useRef(null);
   const lastUserRef = useRef(null);
   const programmaticScroll = useRef(false);
   const prevPinRef = useRef(pinToTop);
   const prevUserIndexRef = useRef(void 0);
+  const [highlightedMessageId, setHighlightedMessageId] = useState(null);
   const displayMessages = useMemo(() => {
     return messages.filter((msg) => msg.role !== "toolResult");
   }, [messages]);
@@ -4145,13 +4482,25 @@ function ChatMessageListComponent({
       }, 0);
     }
   }, [loading, displayMessages.length, sessionKey, pinToTop, lastUserIndex]);
+  useEffect(() => {
+    if (!jumpToMessageId || loading) return;
+    const target = document.getElementById(`message-${jumpToMessageId}`);
+    if (!target) return;
+    target.scrollIntoView({ behavior: "smooth", block: "center" });
+    setHighlightedMessageId(jumpToMessageId);
+    const timer = window.setTimeout(() => {
+      setHighlightedMessageId((prev) => prev === jumpToMessageId ? null : prev);
+    }, 1800);
+    return () => window.clearTimeout(timer);
+  }, [jumpToMessageId, loading, displayMessages]);
   return (
     // mt-2 is to fix the prompt-input cut off
     /* @__PURE__ */ jsx(MemoizedChatContainerRoot, { className: "flex-1 min-h-0 -mb-4", children: /* @__PURE__ */ jsxs(ChatContainerContent, { className: "pt-6", style: contentStyle, children: [
       notice && noticePosition === "start" ? notice : null,
       empty && !notice ? emptyState ?? /* @__PURE__ */ jsx("div", { "aria-hidden": true }) : hasGroup ? /* @__PURE__ */ jsxs(Fragment, { children: [
         displayMessages.slice(0, groupStartIndex).map((chatMessage, index) => {
-          const messageKey = index;
+          const messageId = typeof chatMessage.id === "string" ? chatMessage.id : void 0;
+          const messageKey = messageId || index;
           const forceActionsVisible = typeof lastAssistantIndex === "number" && index === lastAssistantIndex;
           const isLastAssistant = typeof lastAssistantIndex === "number" && index === lastAssistantIndex;
           const hasToolCalls = chatMessage.role === "assistant" && getToolCallsFromMessage(chatMessage).length > 0;
@@ -4163,7 +4512,9 @@ function ChatMessageListComponent({
               forceActionsVisible,
               isStreaming: isLastAssistant && isStreaming,
               isLastAssistant,
-              aggregatedSearchSources: isLastAssistant ? aggregatedSearchSources : void 0
+              aggregatedSearchSources: isLastAssistant ? aggregatedSearchSources : void 0,
+              messageDomId: messageId ? `message-${messageId}` : void 0,
+              highlighted: highlightedMessageId === messageId
             },
             messageKey
           );
@@ -4171,12 +4522,13 @@ function ChatMessageListComponent({
         /* @__PURE__ */ jsxs(
           "div",
           {
-            className: "flex flex-col space-y-3 md:space-y-6",
-            style: { minHeight: `${Math.max(0, pinGroupMinHeight - 24)}px` },
+            className: "flex flex-col gap-[var(--opencami-msg-gap)]",
+            style: { minHeight: `${Math.max(0, pinGroupMinHeight)}px` },
             children: [
               displayMessages.slice(groupStartIndex).map((chatMessage, index) => {
                 const realIndex = groupStartIndex + index;
-                const messageKey = realIndex;
+                const messageId = typeof chatMessage.id === "string" ? chatMessage.id : void 0;
+                const messageKey = messageId || realIndex;
                 const forceActionsVisible = typeof lastAssistantIndex === "number" && realIndex === lastAssistantIndex;
                 const isLastAssistant = typeof lastAssistantIndex === "number" && realIndex === lastAssistantIndex;
                 const wrapperRef = realIndex === lastUserIndex ? lastUserRef : void 0;
@@ -4194,7 +4546,9 @@ function ChatMessageListComponent({
                     aggregatedSearchSources: isLastAssistant ? aggregatedSearchSources : void 0,
                     wrapperRef,
                     wrapperClassName,
-                    wrapperScrollMarginTop
+                    wrapperScrollMarginTop,
+                    messageDomId: messageId ? `message-${messageId}` : void 0,
+                    highlighted: highlightedMessageId === messageId
                   },
                   messageKey
                 );
@@ -4213,7 +4567,8 @@ function ChatMessageListComponent({
         )
       ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
         displayMessages.map((chatMessage, index) => {
-          const messageKey = index;
+          const messageId = typeof chatMessage.id === "string" ? chatMessage.id : void 0;
+          const messageKey = messageId || index;
           const forceActionsVisible = typeof lastAssistantIndex === "number" && index === lastAssistantIndex;
           const isLastAssistant = typeof lastAssistantIndex === "number" && index === lastAssistantIndex;
           const hasToolCalls = chatMessage.role === "assistant" && getToolCallsFromMessage(chatMessage).length > 0;
@@ -4225,7 +4580,9 @@ function ChatMessageListComponent({
               forceActionsVisible,
               isStreaming: isLastAssistant && isStreaming,
               isLastAssistant,
-              aggregatedSearchSources: isLastAssistant ? aggregatedSearchSources : void 0
+              aggregatedSearchSources: isLastAssistant ? aggregatedSearchSources : void 0,
+              messageDomId: messageId ? `message-${messageId}` : void 0,
+              highlighted: highlightedMessageId === messageId
             },
             messageKey
           );
@@ -4250,7 +4607,7 @@ function ChatMessageListComponent({
   );
 }
 function areChatMessageListEqual(prev, next) {
-  return prev.messages === next.messages && prev.loading === next.loading && prev.empty === next.empty && prev.emptyState === next.emptyState && prev.notice === next.notice && prev.noticePosition === next.noticePosition && prev.waitingForResponse === next.waitingForResponse && prev.isStreaming === next.isStreaming && prev.sessionKey === next.sessionKey && prev.pinToTop === next.pinToTop && prev.pinGroupMinHeight === next.pinGroupMinHeight && prev.headerHeight === next.headerHeight && prev.contentStyle === next.contentStyle && prev.onFollowUpClick === next.onFollowUpClick;
+  return prev.messages === next.messages && prev.loading === next.loading && prev.empty === next.empty && prev.emptyState === next.emptyState && prev.notice === next.notice && prev.noticePosition === next.noticePosition && prev.waitingForResponse === next.waitingForResponse && prev.isStreaming === next.isStreaming && prev.sessionKey === next.sessionKey && prev.pinToTop === next.pinToTop && prev.pinGroupMinHeight === next.pinGroupMinHeight && prev.headerHeight === next.headerHeight && prev.contentStyle === next.contentStyle && prev.onFollowUpClick === next.onFollowUpClick && prev.jumpToMessageId === next.jumpToMessageId;
 }
 const MemoizedChatMessageList = memo(
   ChatMessageListComponent,
@@ -5584,7 +5941,7 @@ function ChatComposerComponent({
   return /* @__PURE__ */ jsxs(
     "div",
     {
-      className: "mx-auto w-full max-w-full px-2 md:px-5 sm:max-w-[768px] sm:min-w-[400px] relative pb-1 md:pb-3",
+      className: "mx-auto w-full max-w-[var(--opencami-chat-width)] px-2 md:px-5 relative pb-1 md:pb-3",
       ref: wrapperRef,
       onDragOver: handleDragOver,
       onDragLeave: handleDragLeave,
@@ -5687,7 +6044,7 @@ function MessageStatus({
   onAction,
   className
 }) {
-  return /* @__PURE__ */ jsx("div", { className: cn("w-full max-w-[900px]", className), children: /* @__PURE__ */ jsx(Message, { children: /* @__PURE__ */ jsxs("div", { className: "w-full rounded-xl border border-primary-200 bg-primary-50 p-4 text-primary-900", children: [
+  return /* @__PURE__ */ jsx("div", { className: cn("w-full max-w-[var(--opencami-chat-width)]", className), children: /* @__PURE__ */ jsx(Message, { children: /* @__PURE__ */ jsxs("div", { className: "w-full rounded-xl border border-primary-200 bg-primary-50 p-4 text-primary-900", children: [
     /* @__PURE__ */ jsx("div", { className: "text-balance font-medium", children: title }),
     /* @__PURE__ */ jsx("div", { className: "mt-2 text-pretty text-primary-700", children: description }),
     detail ? /* @__PURE__ */ jsx("div", { className: "mt-2 text-xs text-primary-600", children: detail }) : null,
@@ -6265,15 +6622,16 @@ function useSwipeGesture(options) {
   };
 }
 const KeyboardShortcutsDialog = lazy(
-  () => import("./keyboard-shortcuts-dialog-7OEtXUlW.js").then((m) => ({
+  () => import("./keyboard-shortcuts-dialog-CsNP85q8.js").then((m) => ({
     default: m.KeyboardShortcutsDialog
   }))
 );
 const SearchDialog = lazy(
-  () => import("./search-dialog-Bq0Pnxdb.js").then((m) => ({
+  () => import("./search-dialog-Bz4Cu0KW.js").then((m) => ({
     default: m.SearchDialog
   }))
 );
+const SEARCH_JUMP_TARGET_KEY = "opencami-search-jump-target";
 function ChatScreen({
   activeFriendlyId,
   isNewChat = false,
@@ -6296,6 +6654,7 @@ function ChatScreen({
   const [showShortcutsHelp, setShowShortcutsHelp] = useState(false);
   const [showSearchDialog, setShowSearchDialog] = useState(false);
   const [searchMode, setSearchMode] = useState("global");
+  const [searchJumpMessageId, setSearchJumpMessageId] = useState(null);
   const [isStreaming, setIsStreaming] = useState(false);
   const thinkingLevel = useThinkingLevelStore((state) => state.level);
   const inputRef = useRef(null);
@@ -6608,6 +6967,10 @@ function ChatScreen({
   useEffect(() => {
     const resetKey = isNewChat ? "new" : activeFriendlyId;
     if (!resetKey) return;
+    streamStop();
+    stopStream();
+    lastAssistantSignature.current = "";
+    setIsStreaming(false);
     if (pendingStartRef.current) {
       pendingStartRef.current = false;
       return;
@@ -6617,13 +6980,34 @@ function ChatScreen({
       setPinToTop(true);
       return;
     }
-    streamStop();
-    stopStream();
-    lastAssistantSignature.current = "";
     setWaitingForResponse(false);
     setPinToTop(false);
-    setIsStreaming(false);
   }, [activeFriendlyId, isNewChat, streamStop, stopStream]);
+  useEffect(() => {
+    if (typeof window === "undefined") return;
+    try {
+      const raw = sessionStorage.getItem(SEARCH_JUMP_TARGET_KEY);
+      if (!raw) {
+        setSearchJumpMessageId(null);
+        return;
+      }
+      const parsed = JSON.parse(raw);
+      const isStale = typeof parsed.at === "number" && Date.now() - parsed.at > 5 * 60 * 1e3;
+      if (isStale) {
+        sessionStorage.removeItem(SEARCH_JUMP_TARGET_KEY);
+        setSearchJumpMessageId(null);
+        return;
+      }
+      if (parsed.friendlyId === activeFriendlyId && typeof parsed.messageId === "string" && parsed.messageId.length > 0) {
+        setSearchJumpMessageId(parsed.messageId);
+        sessionStorage.removeItem(SEARCH_JUMP_TARGET_KEY);
+        return;
+      }
+      setSearchJumpMessageId(null);
+    } catch {
+      setSearchJumpMessageId(null);
+    }
+  }, [activeFriendlyId]);
   useLayoutEffect(() => {
     if (isNewChat) return;
     const pending = consumePendingSend(
@@ -6945,7 +7329,7 @@ function ChatScreen({
       {
         className: cn(
           "h-full overflow-hidden",
-          isMobile ? "relative" : "grid grid-cols-[auto_1fr]"
+          isMobile ? "relative" : "grid grid-cols-[auto_minmax(0,1fr)]"
         ),
         children: [
           hideUi ? null : isMobile ? /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -6964,7 +7348,7 @@ function ChatScreen({
               "div",
               {
                 className: cn(
-                  "fixed inset-y-0 left-0 z-50 w-[300px] transition-transform duration-150 safe-area-top",
+                  "fixed inset-y-0 left-0 z-50 w-[var(--opencami-sidebar-width)] transition-transform duration-150 safe-area-top",
                   isSidebarCollapsed ? "-translate-x-full" : "translate-x-0"
                 ),
                 ...sidebarCloseSwipeHandlers,
@@ -6975,7 +7359,7 @@ function ChatScreen({
           /* @__PURE__ */ jsxs(
             "main",
             {
-              className: "flex flex-col h-full min-h-0",
+              className: "flex flex-col h-full min-h-0 min-w-0 overflow-x-hidden",
               ref: mainRef,
               ...sidebarSwipeHandlers,
               children: [
@@ -7006,7 +7390,8 @@ function ChatScreen({
                       pinGroupMinHeight,
                       headerHeight,
                       contentStyle: stableContentStyle,
-                      onFollowUpClick: handleFollowUpClick
+                      onFollowUpClick: handleFollowUpClick,
+                      jumpToMessageId: searchJumpMessageId
                     }
                   ),
                   /* @__PURE__ */ jsx(
@@ -7044,9 +7429,25 @@ function ChatScreen({
         mode: searchMode,
         onJumpToMessage: (result) => {
           setShowSearchDialog(false);
-          if (result.friendlyId) {
-            navigate({ to: "/chat/$sessionKey", params: { sessionKey: result.friendlyId } });
+          if (!result.friendlyId) return;
+          if (result.messageId && result.friendlyId === activeFriendlyId) {
+            setSearchJumpMessageId(result.messageId);
+            return;
+          }
+          if (result.messageId && typeof window !== "undefined") {
+            try {
+              sessionStorage.setItem(
+                SEARCH_JUMP_TARGET_KEY,
+                JSON.stringify({
+                  friendlyId: result.friendlyId,
+                  messageId: result.messageId,
+                  at: Date.now()
+                })
+              );
+            } catch {
+            }
           }
+          navigate({ to: "/chat/$sessionKey", params: { sessionKey: result.friendlyId } });
         }
       }
     ) })