@@ -1784,6 +1966,32 @@ function StructuredToolInput({
}
}
+ // Read / write file tools: always try the file card (even when JSON is
+ // truncated / unparsable) so path link + context menu still work.
+ if (isFilePathToolName(name) && name !== "edit" && name !== "apply_patch") {
+ if (parsed) {
+ return (
+
+ )
+ }
+ const recoveredPath = extractToolFilePath(toolName, input, output)
+ if (recoveredPath) {
+ return (
+
+ )
+ }
+ }
+
if (!parsed) {
return (
@@ -1835,13 +2043,7 @@ function StructuredToolInput({
}
if (name === "bash" || name === "exec_command")
return
- if (
- name === "read" ||
- name === "read file" ||
- name === "write" ||
- name === "notebookedit"
- )
- return
+ // read/write already handled above (with rawInput recovery)
if (name === "glob" || name === "grep")
return
if (name === "webfetch" || name === "websearch")
@@ -2103,6 +2305,8 @@ const ToolCallPart = memo(function ToolCallPart({
part: Extract
}) {
const t = useTranslations("Folder.chat.contentParts")
+ const { activeFolder: folder } = useActiveFolder()
+ const { openFilePreview } = useWorkspaceActions()
const [manualOpen, setManualOpen] = useState(false)
const normalizedToolName = useMemo(
() => normalizeToolName(part.toolName),
@@ -2125,28 +2329,65 @@ const ToolCallPart = memo(function ToolCallPart({
: null,
[isCommandTool, part.output, part.errorText]
)
- const title = useMemo(() => {
- const rawTitle =
+ // Keep the English-derived title for path extraction; localization is
+ // display-only and must not feed extractToolFilePath (zh "读取 x" breaks
+ // English-only fallbacks and previously left the tooltip as "Read x").
+ const rawToolTitle = useMemo(
+ () =>
deriveToolTitle(
normalizedToolName,
part.input,
part.output ?? part.errorText ?? null
) ??
sanitizeLiveTitle(part.displayTitle) ??
- null
- return localizeDerivedToolTitle(rawTitle, ((key, values) =>
- t(key as never, values as never)) as (
- key: string,
- values?: Record
- ) => string)
- }, [
- normalizedToolName,
- part.input,
- part.output,
- part.errorText,
- part.displayTitle,
- t,
- ])
+ null,
+ [
+ normalizedToolName,
+ part.input,
+ part.output,
+ part.errorText,
+ part.displayTitle,
+ ]
+ )
+ const title = useMemo(
+ () =>
+ localizeDerivedToolTitle(rawToolTitle, ((key, values) =>
+ t(key as never, values as never)) as (
+ key: string,
+ values?: Record
+ ) => string),
+ [rawToolTitle, t]
+ )
+ // Path for tool-row context menu + full-path tooltip on the collapsed header.
+ const toolFilePath = useMemo(
+ () =>
+ extractToolFilePath(
+ normalizedToolName,
+ part.input,
+ part.output ?? part.errorText ?? null,
+ rawToolTitle ?? part.displayTitle ?? null
+ ),
+ [
+ normalizedToolName,
+ part.input,
+ part.output,
+ part.errorText,
+ rawToolTitle,
+ part.displayTitle,
+ ]
+ )
+ const titleTooltip = useMemo(() => {
+ if (!toolFilePath) return undefined
+ // Prefer absolute native path so Read rows match Edit's hover behavior.
+ const abs = toNativeAbsoluteFilePath(toolFilePath, folder?.path)
+ if (abs) return abs
+ return toFolderRelativePath(toolFilePath, folder?.path) || toolFilePath
+ }, [toolFilePath, folder?.path])
+
+ const openToolFileInCodeg = useCallback(() => {
+ if (!toolFilePath) return
+ void openFilePreview(normalizeSlashPath(toolFilePath))
+ }, [openFilePreview, toolFilePath])
const lineChangeStats = useMemo(() => {
if (toolNameLower !== "edit" && toolNameLower !== "apply_patch") {
return null
@@ -2470,16 +2711,38 @@ const ToolCallPart = memo(function ToolCallPart({
const open = (isRunning && (isCommandTool || hasLiveOutput)) || manualOpen
+ const toolHeader = (
+
+ )
+
return (
-
+ {toolFilePath ? (
+ // Outer native `title` div: browsers only show the element under the
+ // cursor's own title attribute (not ancestors). Put the absolute path
+ // on BOTH this div and the context-menu trigger + CollapsibleTrigger.
+
+
+ {toolHeader}
+
+
+ ) : (
+ toolHeader
+ )}
{part.input && (!isCommandTool || !shouldRenderCommandTerminal) && (
+
void
+ /**
+ * Native HTML tooltip for the trigger surface (e.g. absolute path on a
+ * tool-row wrapper). Applied on the trigger element that receives hover.
+ */
+ title?: string
+ /**
+ * Merge trigger props onto `children` (must be a single element that accepts
+ * a ref). Use for tool headers (`CollapsibleTrigger`) so the whole row owns
+ * the right-click without an extra wrapping span.
+ */
+ asChild?: boolean
+ className?: string
children: ReactNode
}
@@ -82,6 +94,9 @@ export function FilePathContextMenu({
folderPath,
externalOpenDisabled = false,
onOpenInCodeg,
+ title,
+ asChild = false,
+ className,
children,
}: FilePathContextMenuProps) {
const t = useTranslations("Folder.chat.filePathMenu")
@@ -101,7 +116,6 @@ export function FilePathContextMenu({
const explorerLabel = t(systemExplorerLabelKey())
const canOpenExternally =
localDesktop && !!absolutePath && !externalOpenDisabled
- // Composer attach expects a resolvable filesystem path (absolute preferred).
const attachPath = absolutePath ?? relativePath
const canAddToChat = Boolean(activeSessionTabId && attachPath)
@@ -148,10 +162,6 @@ export function FilePathContextMenu({
[absolutePath, runExternal]
)
- /**
- * Insert an inline `@file` reference badge into the active conversation
- * composer — same event path as the file-tree "Add to session" action.
- */
const handleAddToChat = useCallback(() => {
if (!activeSessionTabId || !attachPath) {
toast.error(t("noActiveConversation"))
@@ -164,27 +174,30 @@ export function FilePathContextMenu({
toast.success(t("addToChatDone", { label: fileName }))
}, [activeSessionTabId, attachPath, fileName, t])
- // ConversationDetailPanel wraps the whole chat surface in its own
- // ContextMenu (copy selection / export / …). Nested Radix context menus
- // both listen on bubble — without stopPropagation the outer menu steals
- // the right-click and this file menu never appears. Stop the event on the
- // trigger so only this menu opens (same pattern as chat-input).
- const stopOuterContextMenu = useCallback((event: ReactMouseEvent) => {
+ // Own the gesture before it reaches ConversationDetailPanel's ContextMenu.
+ // Always stamp `data-file-path-menu` so the panel can `preventDefault` its
+ // own open via composeEventHandlers when the event still bubbles.
+ const claimContextMenu = useCallback((event: ReactMouseEvent) => {
event.stopPropagation()
}, [])
- const stopOuterRightPointer = useCallback((event: ReactPointerEvent) => {
- // Parent panel also intercepts right-button pointerdown when text is
- // selected; keep the event local so nested file rows stay responsive.
+ const claimRightPointer = useCallback((event: ReactPointerEvent) => {
if (event.button === 2) event.stopPropagation()
}, [])
+ // Prefer an explicit title, otherwise the resolved absolute path so hover on
+ // the wrapper (not only the inner button) still shows the full path.
+ const triggerTitle = title ?? absolutePath ?? relativePath
+
return (
{children}
From ff8fb7267df2fee7931926817b5b3e7479e0bcbd Mon Sep 17 00:00:00 2001
From: "2859521944@qq.com" <2859521944@qq.com>
Date: Thu, 23 Jul 2026 08:50:49 +0800
Subject: [PATCH 3/8] fix(chat):auto-dismiss-file-path-menu-toasts
Use-short-duration-for-copy-and-add-to-chat-success-toasts
---
src/components/shared/file-path-context-menu.tsx | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/components/shared/file-path-context-menu.tsx b/src/components/shared/file-path-context-menu.tsx
index 142b4f936..5b2555a98 100644
--- a/src/components/shared/file-path-context-menu.tsx
+++ b/src/components/shared/file-path-context-menu.tsx
@@ -61,6 +61,11 @@ import { cn } from "@/lib/utils"
/** Attribute the conversation-panel ContextMenu looks for to yield ownership. */
export const FILE_PATH_MENU_ATTR = "data-file-path-menu"
+/** Short-lived feedback for copy / add-to-chat (workspace Toaster defaults to 15s). */
+const TOAST_SUCCESS_MS = 2500
+/** Slightly longer for failures so the user can read the reason. */
+const TOAST_ERROR_MS = 5000
+
export interface FilePathContextMenuProps {
/** Agent-reported path (absolute or workspace-relative). */
filePath: string
@@ -123,9 +128,9 @@ export function FilePathContextMenu({
async (text: string, successKey: "pathCopied" | "fileNameCopied") => {
const ok = await copyPathText(text)
if (ok) {
- toast.success(t(successKey))
+ toast.success(t(successKey), { duration: TOAST_SUCCESS_MS })
} else {
- toast.error(t("copyFailed"))
+ toast.error(t("copyFailed"), { duration: TOAST_ERROR_MS })
}
},
[t]
@@ -138,6 +143,7 @@ export function FilePathContextMenu({
} catch (error) {
toast.error(t("openFailed"), {
description: toErrorMessage(error),
+ duration: TOAST_ERROR_MS,
})
}
},
@@ -164,14 +170,16 @@ export function FilePathContextMenu({
const handleAddToChat = useCallback(() => {
if (!activeSessionTabId || !attachPath) {
- toast.error(t("noActiveConversation"))
+ toast.error(t("noActiveConversation"), { duration: TOAST_ERROR_MS })
return
}
emitAttachFileToSession({
tabId: activeSessionTabId,
path: attachPath,
})
- toast.success(t("addToChatDone", { label: fileName }))
+ toast.success(t("addToChatDone", { label: fileName }), {
+ duration: TOAST_SUCCESS_MS,
+ })
}, [activeSessionTabId, attachPath, fileName, t])
// Own the gesture before it reaches ConversationDetailPanel's ContextMenu.
From 35c58283964179cfaf7c785a3242618bc0b8361e Mon Sep 17 00:00:00 2001
From: "2859521944@qq.com" <2859521944@qq.com>
Date: Thu, 23 Jul 2026 22:53:41 +0800
Subject: [PATCH 4/8] fix(chat): gate file-path menu and harden open-with /
touch
- Only wrap Read/Edit/Write tool rows when isFilePathToolName matches
- Tighten pathFromToolTitle; disable title shortPath fallback for open/tooltip
- Multi-file edit returns no single path
- macOS openWith uses Visual Studio Code / Cursor app names
- Stop touch/pen long-press from opening the panel context menu
- Catch openFilePreview rejections on tool-row open
- Unit tests for WebFetch/Glob/multi-file false positives
---
.../conversation-detail-panel.tsx | 8 +-
.../message/content-parts-renderer.tsx | 92 ++++++-------------
.../shared/file-path-context-menu.tsx | 6 +-
src/lib/file-path-actions.test.ts | 17 +++-
src/lib/file-path-actions.ts | 24 ++++-
src/lib/tool-file-path-guard.test.ts | 39 ++++++++
src/lib/tool-file-path-guard.ts | 52 +++++++++++
7 files changed, 160 insertions(+), 78 deletions(-)
create mode 100644 src/lib/tool-file-path-guard.test.ts
create mode 100644 src/lib/tool-file-path-guard.ts
diff --git a/src/components/conversations/conversation-detail-panel.tsx b/src/components/conversations/conversation-detail-panel.tsx
index cd9f3bea3..ce01da430 100644
--- a/src/components/conversations/conversation-detail-panel.tsx
+++ b/src/components/conversations/conversation-detail-panel.tsx
@@ -1804,15 +1804,15 @@ export function ConversationDetailPanel() {
const handleContextMenuTriggerPointerDown = useCallback(
(event: ReactPointerEvent) => {
- if (event.button !== 2) return
- // File-path menus (message nav / reply artifacts) own right-clicks on
- // their rows — don't let selection-preservation logic interfere.
+ // File-path menus own right-click *and* touch/pen long-press.
if (
event.target instanceof Element &&
- event.target.closest("[data-file-path-menu]")
+ event.target.closest("[data-file-path-menu]") &&
+ (event.button === 2 || event.pointerType !== "mouse")
) {
return
}
+ if (event.button !== 2) return
const selection = window.getSelection()
if (selection && !selection.isCollapsed) {
event.preventDefault()
diff --git a/src/components/message/content-parts-renderer.tsx b/src/components/message/content-parts-renderer.tsx
index d360def0b..d7e8ef9b6 100644
--- a/src/components/message/content-parts-renderer.tsx
+++ b/src/components/message/content-parts-renderer.tsx
@@ -8,6 +8,12 @@ import {
toFolderRelativePath,
toNativeAbsoluteFilePath,
} from "@/lib/file-path-display"
+import {
+ isFilePathToolName,
+ pathFromToolTitle,
+} from "@/lib/tool-file-path-guard"
+import { toast } from "sonner"
+import { toErrorMessage } from "@/lib/app-error"
import {
classifyToolKind,
TOOL_KIND_ORDER,
@@ -234,26 +240,7 @@ function shortPath(p: string): string {
* Strip a tool-title prefix (English or localized) to recover the file path
* segment, e.g. "Read AGENTS.md" / "读取 AGENTS.md" → "AGENTS.md".
*/
-function pathFromToolTitle(title: string | null | undefined): string | null {
- if (!title) return null
- const trimmed = title.trim()
- // English prefixes from deriveToolTitle
- const en = trimmed.match(/^(?:Read|Edit|Write|NotebookEdit)\s+(.+)$/i)
- if (en?.[1]?.trim()) return en[1].trim()
- // Common localized prefixes (zh-CN / zh-TW / ja / ko …)
- const localized = trimmed.match(
- /^(?:读取|讀取|编辑|編輯|写入|寫入|読み取り|읽기)\s+(.+)$/u
- )
- if (localized?.[1]?.trim()) return localized[1].trim()
- // i18n templates sometimes put the path only: still a plausible file path
- if (/[/\\]/.test(trimmed) || /\.[A-Za-z0-9]{1,12}$/.test(trimmed)) {
- // Avoid matching pure status words
- if (!/^(Read|Edit|Write|Command|TodoWrite)$/i.test(trimmed)) {
- return trimmed
- }
- }
- return null
-}
+// pathFromToolTitle: @/lib/tool-file-path-guard (strict; unit-tested)
/**
* Pull the primary file path out of a tool input/output envelope (same fields
@@ -282,7 +269,8 @@ function extractToolFilePath(
toolName: string,
input: string | null,
output?: string | null,
- displayTitle?: string | null
+ displayTitle?: string | null,
+ opts?: { allowTitleFallback?: boolean }
): string | null {
const titleSource = input ?? output ?? null
const parsedInput = input ? tryParseJson(input) : null
@@ -301,6 +289,8 @@ function extractToolFilePath(
name === "editfile")
) {
const files = parseApplyPatchFilesFromUnknownInput(titleSource, parsed)
+ // Multi-file edits: no single path for menu / open / abs tooltip
+ if (files.length > 1) return null
if (files.length === 1) {
const file = files[0]
const path =
@@ -312,6 +302,8 @@ function extractToolFilePath(
const fromDiff = extractPathFromDiffText(titleSource)
if (fromDiff) return fromDiff
}
+
+ if (opts?.allowTitleFallback === false) return null
return pathFromToolTitle(displayTitle)
}
@@ -960,26 +952,7 @@ function getToolIcon(
// ── title derivation ──────────────────────────────────────────────────
-/** True for tools that primarily target a single file path. */
-function isFilePathToolName(toolName: string): boolean {
- const name = toolName.toLowerCase()
- return (
- name === "read" ||
- name === "read file" ||
- name === "read_file" ||
- name === "read_text_file" ||
- name === "readfile" ||
- name === "view" ||
- name === "write" ||
- name === "write_file" ||
- name === "writefile" ||
- name === "notebookedit" ||
- name === "edit" ||
- name === "edit_file" ||
- name === "editfile" ||
- name === "apply_patch"
- )
-}
+// isFilePathToolName: @/lib/tool-file-path-guard
/**
* Shared field lookup used by both title derivation and path tooltips / menus.
@@ -2358,27 +2331,20 @@ const ToolCallPart = memo(function ToolCallPart({
) => string),
[rawToolTitle, t]
)
- // Path for tool-row context menu + full-path tooltip on the collapsed header.
- const toolFilePath = useMemo(
- () =>
- extractToolFilePath(
- normalizedToolName,
- part.input,
- part.output ?? part.errorText ?? null,
- rawToolTitle ?? part.displayTitle ?? null
- ),
- [
+ // Payload-only + isFilePathToolName: never hang menus on WebFetch/Glob/Grep,
+ // never re-absolutize shortPath titles to the wrong file.
+ const toolFilePath = useMemo(() => {
+ if (!isFilePathToolName(normalizedToolName)) return null
+ return extractToolFilePath(
normalizedToolName,
part.input,
- part.output,
- part.errorText,
- rawToolTitle,
- part.displayTitle,
- ]
- )
+ part.output ?? part.errorText ?? null,
+ null,
+ { allowTitleFallback: false }
+ )
+ }, [normalizedToolName, part.input, part.output, part.errorText])
const titleTooltip = useMemo(() => {
if (!toolFilePath) return undefined
- // Prefer absolute native path so Read rows match Edit's hover behavior.
const abs = toNativeAbsoluteFilePath(toolFilePath, folder?.path)
if (abs) return abs
return toFolderRelativePath(toolFilePath, folder?.path) || toolFilePath
@@ -2386,7 +2352,9 @@ const ToolCallPart = memo(function ToolCallPart({
const openToolFileInCodeg = useCallback(() => {
if (!toolFilePath) return
- void openFilePreview(normalizeSlashPath(toolFilePath))
+ void openFilePreview(normalizeSlashPath(toolFilePath)).catch((error) => {
+ toast.error(toErrorMessage(error))
+ })
}, [openFilePreview, toolFilePath])
const lineChangeStats = useMemo(() => {
if (toolNameLower !== "edit" && toolNameLower !== "apply_patch") {
@@ -2725,10 +2693,8 @@ const ToolCallPart = memo(function ToolCallPart({
return (
- {toolFilePath ? (
- // Outer native `title` div: browsers only show the element under the
- // cursor's own title attribute (not ancestors). Put the absolute path
- // on BOTH this div and the context-menu trigger + CollapsibleTrigger.
+ {toolFilePath && isFilePathToolName(normalizedToolName) ? (
+ // Gated by isFilePathToolName so WebFetch/Glob/Grep never get a file menu.
{
- if (event.button === 2) event.stopPropagation()
+ if (event.button === 2 || event.pointerType !== "mouse") {
+ event.stopPropagation()
+ }
}, [])
// Prefer an explicit title, otherwise the resolved absolute path so hover on
diff --git a/src/lib/file-path-actions.test.ts b/src/lib/file-path-actions.test.ts
index debd36cf2..fca03040f 100644
--- a/src/lib/file-path-actions.test.ts
+++ b/src/lib/file-path-actions.test.ts
@@ -1,6 +1,6 @@
import { describe, it, expect } from "vitest"
import {
- EXTERNAL_EDITOR_OPEN_WITH,
+ getExternalEditorOpenWith,
resolveFilePathTargets,
systemExplorerLabelKey,
} from "./file-path-actions"
@@ -35,9 +35,16 @@ describe("systemExplorerLabelKey", () => {
})
})
-describe("EXTERNAL_EDITOR_OPEN_WITH", () => {
- it("maps editors to CLI names the opener plugin understands", () => {
- expect(EXTERNAL_EDITOR_OPEN_WITH.vscode).toBe("code")
- expect(EXTERNAL_EDITOR_OPEN_WITH.cursor).toBe("cursor")
+describe("getExternalEditorOpenWith", () => {
+ it("uses full app names on macOS for open -a", () => {
+ expect(getExternalEditorOpenWith("vscode", "macos")).toBe(
+ "Visual Studio Code"
+ )
+ expect(getExternalEditorOpenWith("cursor", "macos")).toBe("Cursor")
+ })
+
+ it("uses CLI shims on Windows and Linux", () => {
+ expect(getExternalEditorOpenWith("vscode", "windows")).toBe("code")
+ expect(getExternalEditorOpenWith("cursor", "linux")).toBe("cursor")
})
})
diff --git a/src/lib/file-path-actions.ts b/src/lib/file-path-actions.ts
index 7b09542e7..6f8f9f335 100644
--- a/src/lib/file-path-actions.ts
+++ b/src/lib/file-path-actions.ts
@@ -9,11 +9,28 @@ import {
toNativeAbsoluteFilePath,
} from "@/lib/file-path-display"
import { isLocalDesktop, openPath, revealItemInDir } from "@/lib/platform"
+import { detectPlatform, type PlatformType } from "@/hooks/use-platform"
import { copyTextFromMenu } from "@/lib/utils"
export type ExternalEditorId = "vscode" | "cursor"
-/** CLI / opener names passed to `openPath(path, openWith)`. */
+/**
+ * Resolve the `openWith` argument for Tauri opener.
+ *
+ * macOS `open -a` matches application names (short CLI shims like `code`
+ * fail). Windows/Linux keep CLI shims when those are on PATH.
+ */
+export function getExternalEditorOpenWith(
+ editor: ExternalEditorId,
+ platform: PlatformType = detectPlatform()
+): string {
+ if (platform === "macos") {
+ return editor === "vscode" ? "Visual Studio Code" : "Cursor"
+ }
+ return editor === "vscode" ? "code" : "cursor"
+}
+
+/** CLI shim defaults (non-macOS). Prefer {@link getExternalEditorOpenWith}. */
export const EXTERNAL_EDITOR_OPEN_WITH: Record = {
vscode: "code",
cursor: "cursor",
@@ -37,8 +54,6 @@ export function resolveFilePathTargets(
}
export async function copyPathText(text: string): Promise {
- // Defer until the context menu closes so the execCommand fallback works in
- // non-secure web contexts (same pattern as the file-tree copy action).
return copyTextFromMenu(text)
}
@@ -59,10 +74,9 @@ export async function openFileWithExternalEditor(
editor: ExternalEditorId
): Promise {
if (!isLocalDesktop()) return
- await openPath(absolutePath, EXTERNAL_EDITOR_OPEN_WITH[editor])
+ await openPath(absolutePath, getExternalEditorOpenWith(editor))
}
-/** Platform-aware label key suffix for the system file manager entry. */
export function systemExplorerLabelKey(
platformHint?: string
): "openInFinder" | "openInExplorer" | "openInFileManager" {
diff --git a/src/lib/tool-file-path-guard.test.ts b/src/lib/tool-file-path-guard.test.ts
new file mode 100644
index 000000000..76cde65a6
--- /dev/null
+++ b/src/lib/tool-file-path-guard.test.ts
@@ -0,0 +1,39 @@
+import { describe, expect, it } from "vitest"
+import { isFilePathToolName, pathFromToolTitle } from "./tool-file-path-guard"
+
+describe("isFilePathToolName", () => {
+ it("accepts read/edit/write family names", () => {
+ expect(isFilePathToolName("read")).toBe(true)
+ expect(isFilePathToolName("Read File")).toBe(true)
+ expect(isFilePathToolName("edit")).toBe(true)
+ expect(isFilePathToolName("apply_patch")).toBe(true)
+ expect(isFilePathToolName("write")).toBe(true)
+ })
+
+ it("rejects non-file tools", () => {
+ expect(isFilePathToolName("webfetch")).toBe(false)
+ expect(isFilePathToolName("WebFetch")).toBe(false)
+ expect(isFilePathToolName("glob")).toBe(false)
+ expect(isFilePathToolName("grep")).toBe(false)
+ expect(isFilePathToolName("todowrite")).toBe(false)
+ expect(isFilePathToolName("bash")).toBe(false)
+ })
+})
+
+describe("pathFromToolTitle", () => {
+ it("extracts path after Read/Edit prefixes", () => {
+ expect(pathFromToolTitle("Read AGENTS.md")).toBe("AGENTS.md")
+ expect(pathFromToolTitle("Edit src/a.ts")).toBe("src/a.ts")
+ expect(pathFromToolTitle("读取 nested/foo.ts")).toBe("nested/foo.ts")
+ })
+
+ it("rejects WebFetch / Glob / multi-file / URL / glob-like titles", () => {
+ expect(pathFromToolTitle("WebFetch https://example.com/a")).toBeNull()
+ expect(pathFromToolTitle("Glob foo/bar.ts")).toBeNull()
+ expect(pathFromToolTitle("Grep foo/bar")).toBeNull()
+ expect(pathFromToolTitle("Edit (3 files)")).toBeNull()
+ expect(pathFromToolTitle("Todos (2/5)")).toBeNull()
+ expect(pathFromToolTitle("Read https://x.test/a")).toBeNull()
+ expect(pathFromToolTitle("Read foo/*.md")).toBeNull()
+ })
+})
diff --git a/src/lib/tool-file-path-guard.ts b/src/lib/tool-file-path-guard.ts
new file mode 100644
index 000000000..83aa18caf
--- /dev/null
+++ b/src/lib/tool-file-path-guard.ts
@@ -0,0 +1,52 @@
+/**
+ * Pure guards for deciding when a tool row should get a filesystem path menu.
+ * Kept free of React so unit tests can lock false-positive regressions
+ * (WebFetch / Glob / multi-file Edit titles).
+ */
+
+/** True for tools that primarily target a single file path. */
+export function isFilePathToolName(toolName: string): boolean {
+ const name = toolName.toLowerCase()
+ return (
+ name === "read" ||
+ name === "read file" ||
+ name === "read_file" ||
+ name === "read_text_file" ||
+ name === "readfile" ||
+ name === "view" ||
+ name === "write" ||
+ name === "write_file" ||
+ name === "writefile" ||
+ name === "notebookedit" ||
+ name === "edit" ||
+ name === "edit_file" ||
+ name === "editfile" ||
+ name === "apply_patch"
+ )
+}
+
+/**
+ * Strip a tool-title prefix to recover a file path segment.
+ * Intentionally strict — never treat URLs, globs, or aggregate titles as paths.
+ */
+export function pathFromToolTitle(
+ title: string | null | undefined
+): string | null {
+ if (!title) return null
+ const trimmed = title.trim()
+ const en = trimmed.match(/^(?:Read|Edit|Write|NotebookEdit)\s+(.+)$/i)
+ const localized = trimmed.match(
+ /^(?:读取|讀取|编辑|編輯|写入|寫入|読み取り|읽기)\s+(.+)$/u
+ )
+ const target = (en?.[1] ?? localized?.[1])?.trim()
+ if (!target) return null
+
+ if (/^\(\d+\s+files?\)$/i.test(target)) return null
+ if (/[()]/.test(target)) return null
+ if (/^https?:\/\//i.test(target)) return null
+ if (/[*?[\]{}]/.test(target)) return null
+ // Spaces usually mean prose (allow Windows drive paths with spaces only)
+ if (/\s/.test(target) && !/^[A-Za-z]:[\\/]/.test(target)) return null
+
+ return target
+}
From bd98d98bdb3fc0f35e971dfdbf29f44b53b2d158 Mon Sep 17 00:00:00 2001
From: "2859521944@qq.com" <2859521944@qq.com>
Date: Thu, 23 Jul 2026 23:15:55 +0800
Subject: [PATCH 5/8] fix(desktop): allow opener paths outside HOME on all
platforms
Expand opener open-path and reveal scopes beyond $HOME so workspace
files on Windows drives (E:/dev/...), macOS /Volumes, and Linux paths
outside home can open with VS Code/Cursor. Normalize separators for
glob matching. openWith stays platform-specific.
---
src-tauri/capabilities/default.json | 50 +++++++++++++++++++++++++++++
src/lib/file-path-actions.ts | 8 +++--
src/lib/platform.ts | 17 +++++++---
3 files changed, 67 insertions(+), 8 deletions(-)
diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json
index e2758ba5f..867982a35 100644
--- a/src-tauri/capabilities/default.json
+++ b/src-tauri/capabilities/default.json
@@ -40,6 +40,56 @@
"allow": [
{
"path": "$HOME/**"
+ },
+ {
+ "path": "$DOCUMENT/**"
+ },
+ {
+ "path": "$DESKTOP/**"
+ },
+ {
+ "path": "$DOWNLOAD/**"
+ },
+ {
+ "path": "$PUBLIC/**"
+ },
+ {
+ "path": "$TEMP/**"
+ },
+ {
+ "path": "/**"
+ },
+ {
+ "path": "**"
+ }
+ ]
+ },
+ {
+ "identifier": "opener:allow-reveal-item-in-dir",
+ "allow": [
+ {
+ "path": "$HOME/**"
+ },
+ {
+ "path": "$DOCUMENT/**"
+ },
+ {
+ "path": "$DESKTOP/**"
+ },
+ {
+ "path": "$DOWNLOAD/**"
+ },
+ {
+ "path": "$PUBLIC/**"
+ },
+ {
+ "path": "$TEMP/**"
+ },
+ {
+ "path": "/**"
+ },
+ {
+ "path": "**"
}
]
},
diff --git a/src/lib/file-path-actions.ts b/src/lib/file-path-actions.ts
index 6f8f9f335..0bf94b62f 100644
--- a/src/lib/file-path-actions.ts
+++ b/src/lib/file-path-actions.ts
@@ -15,10 +15,11 @@ import { copyTextFromMenu } from "@/lib/utils"
export type ExternalEditorId = "vscode" | "cursor"
/**
- * Resolve the `openWith` argument for Tauri opener.
+ * Resolve the `openWith` argument for Tauri opener across platforms.
*
- * macOS `open -a` matches application names (short CLI shims like `code`
- * fail). Windows/Linux keep CLI shims when those are on PATH.
+ * - **macOS**: full application names for `open -a` (`code`/`Code` fail)
+ * - **Windows**: CLI shims on PATH (`code.cmd` / `cursor.cmd` via `code`/`cursor`)
+ * - **Linux**: same CLI shims, or desktop-file basenames when available
*/
export function getExternalEditorOpenWith(
editor: ExternalEditorId,
@@ -27,6 +28,7 @@ export function getExternalEditorOpenWith(
if (platform === "macos") {
return editor === "vscode" ? "Visual Studio Code" : "Cursor"
}
+ // Windows + Linux + unknown: CLI entry points (must be on PATH)
return editor === "vscode" ? "code" : "cursor"
}
diff --git a/src/lib/platform.ts b/src/lib/platform.ts
index 3911a649c..f4954a43f 100644
--- a/src/lib/platform.ts
+++ b/src/lib/platform.ts
@@ -84,15 +84,21 @@ export async function openUrl(url: string): Promise {
* Open a path with the system default app, or a specific app when `openWith`
* is set (desktop local only). No-op in web / remote-desktop modes.
*
- * `openWith` is the program name passed to the OS opener (e.g. `"code"`,
- * `"cursor"`, `"vlc"`). When omitted, the default handler for the path type
- * is used.
+ * `openWith` is platform-specific:
+ * - macOS: application name for `open -a` (e.g. `"Visual Studio Code"`)
+ * - Windows/Linux: CLI/app id on PATH (e.g. `"code"`, `"cursor"`)
+ *
+ * Paths must be allowed by `opener:allow-open-path` in capabilities
+ * (home, documents, and recursive `/**` / `**` for workspaces outside $HOME
+ * such as `E:\\dev\\…` on Windows or `/Volumes/…` on macOS).
*/
export async function openPath(path: string, openWith?: string): Promise {
if (isDesktop() && getActiveRemoteConnectionId() === null) {
const { openPath: tauriOpenPath } =
await import("@tauri-apps/plugin-opener")
- await tauriOpenPath(path, openWith)
+ // Normalize separators so scope globs match Windows drive paths too.
+ const normalized = path.replace(/\\/g, "/")
+ await tauriOpenPath(normalized, openWith)
}
}
@@ -104,7 +110,8 @@ export async function revealItemInDir(path: string): Promise {
if (isDesktop() && getActiveRemoteConnectionId() === null) {
const { revealItemInDir: tauriReveal } =
await import("@tauri-apps/plugin-opener")
- await tauriReveal(path)
+ const normalized = path.replace(/\\/g, "/")
+ await tauriReveal(normalized)
}
}
From b8466a445cfe8b8d8194d2c53628071fde8d12bd Mon Sep 17 00:00:00 2001
From: "2859521944@qq.com" <2859521944@qq.com>
Date: Thu, 23 Jul 2026 23:35:54 +0800
Subject: [PATCH 6/8] fix(desktop): allow openPath with external apps on all
platforms
opener scope entries default to Application::Default which only matches
openPath without `with`. Opening with "code"/"cursor"/app names requires
explicit "app": true (or a specific app name) on each allow entry.
Also keep broad path globs ($HOME, user dirs, /**, **) so workspaces
outside the home directory work on Windows drives, macOS volumes, and
Linux paths.
---
src-tauri/capabilities/default.json | 72 ++++++++++-------------------
1 file changed, 24 insertions(+), 48 deletions(-)
diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json
index 867982a35..0cea42301 100644
--- a/src-tauri/capabilities/default.json
+++ b/src-tauri/capabilities/default.json
@@ -38,59 +38,35 @@
{
"identifier": "opener:allow-open-path",
"allow": [
- {
- "path": "$HOME/**"
- },
- {
- "path": "$DOCUMENT/**"
- },
- {
- "path": "$DESKTOP/**"
- },
- {
- "path": "$DOWNLOAD/**"
- },
- {
- "path": "$PUBLIC/**"
- },
- {
- "path": "$TEMP/**"
- },
- {
- "path": "/**"
- },
- {
- "path": "**"
- }
+ { "path": "$HOME/**" },
+ { "path": "$HOME/**", "app": true },
+ { "path": "$DOCUMENT/**" },
+ { "path": "$DOCUMENT/**", "app": true },
+ { "path": "$DESKTOP/**" },
+ { "path": "$DESKTOP/**", "app": true },
+ { "path": "$DOWNLOAD/**" },
+ { "path": "$DOWNLOAD/**", "app": true },
+ { "path": "$PUBLIC/**" },
+ { "path": "$PUBLIC/**", "app": true },
+ { "path": "$TEMP/**" },
+ { "path": "$TEMP/**", "app": true },
+ { "path": "/**" },
+ { "path": "/**", "app": true },
+ { "path": "**" },
+ { "path": "**", "app": true }
]
},
{
"identifier": "opener:allow-reveal-item-in-dir",
"allow": [
- {
- "path": "$HOME/**"
- },
- {
- "path": "$DOCUMENT/**"
- },
- {
- "path": "$DESKTOP/**"
- },
- {
- "path": "$DOWNLOAD/**"
- },
- {
- "path": "$PUBLIC/**"
- },
- {
- "path": "$TEMP/**"
- },
- {
- "path": "/**"
- },
- {
- "path": "**"
- }
+ { "path": "$HOME/**" },
+ { "path": "$DOCUMENT/**" },
+ { "path": "$DESKTOP/**" },
+ { "path": "$DOWNLOAD/**" },
+ { "path": "$PUBLIC/**" },
+ { "path": "$TEMP/**" },
+ { "path": "/**" },
+ { "path": "**" }
]
},
"dialog:default",
From 56e34e94501f440628a1510f5a8693da2422f117 Mon Sep 17 00:00:00 2001
From: "2859521944@qq.com" <2859521944@qq.com>
Date: Fri, 24 Jul 2026 00:01:45 +0800
Subject: [PATCH 7/8] fix(desktop): open files with Cursor.exe instead of
install dir
On Windows, open::with(path, "cursor") can ShellExecute-resolve to the
Cursor install directory. Prefer %LOCALAPPDATA%\\Programs\\...\\Cursor.exe
(and Code.exe for VS Code), then .cmd shims, then bare PATH names.
---
.../conversation-detail-panel.tsx | 28 +----
.../message/content-parts-renderer.tsx | 21 ++--
.../shared/file-path-context-menu.tsx | 30 ++---
src/lib/file-path-actions.test.ts | 33 ++++++
src/lib/file-path-actions.ts | 103 ++++++++++++++++--
5 files changed, 159 insertions(+), 56 deletions(-)
diff --git a/src/components/conversations/conversation-detail-panel.tsx b/src/components/conversations/conversation-detail-panel.tsx
index ce01da430..8b3eae2a2 100644
--- a/src/components/conversations/conversation-detail-panel.tsx
+++ b/src/components/conversations/conversation-detail-panel.tsx
@@ -7,7 +7,6 @@ import {
useMemo,
useRef,
useState,
- type MouseEvent as ReactMouseEvent,
type PointerEvent as ReactPointerEvent,
} from "react"
import {
@@ -1802,9 +1801,11 @@ export function ConversationDetailPanel() {
: null
}, [])
+ // File-path menus claim right-click / long-press via stopPropagation on the
+ // trigger. Here we only skip selection-preservation so we do not
+ // preventDefault those gestures before the nested menu can open.
const handleContextMenuTriggerPointerDown = useCallback(
(event: ReactPointerEvent) => {
- // File-path menus own right-click *and* touch/pen long-press.
if (
event.target instanceof Element &&
event.target.closest("[data-file-path-menu]") &&
@@ -1821,28 +1822,6 @@ export function ConversationDetailPanel() {
[]
)
- /**
- * Nested file-path ContextMenus sit inside this panel menu. Radix runs the
- * trigger's user `onContextMenu` first and skips its own open when
- * `defaultPrevented` — so yield ownership when the event originated under
- * `[data-file-path-menu]` (message navigator + reply artifact rows).
- */
- const handlePanelContextMenu = useCallback(
- (event: ReactMouseEvent) => {
- if (
- event.target instanceof Element &&
- event.target.closest("[data-file-path-menu]")
- ) {
- // Radix runs this user handler before opening the panel menu; when
- // defaultPrevented it skips open. Also stop bubble so nothing else
- // competes with the nested file-path menu.
- event.preventDefault()
- event.stopPropagation()
- }
- },
- []
- )
-
useEffect(() => {
const handler = () => {
if (!isContextMenuOpenRef.current) return
@@ -2095,7 +2074,6 @@ export function ConversationDetailPanel() {
{/* Stable wrapper across canTile flip — otherwise sibling tabs remount and a live streaming response is torn down. */}
diff --git a/src/components/message/content-parts-renderer.tsx b/src/components/message/content-parts-renderer.tsx
index d7e8ef9b6..5adf860b5 100644
--- a/src/components/message/content-parts-renderer.tsx
+++ b/src/components/message/content-parts-renderer.tsx
@@ -2695,17 +2695,18 @@ const ToolCallPart = memo(function ToolCallPart({
{toolFilePath && isFilePathToolName(normalizedToolName) ? (
// Gated by isFilePathToolName so WebFetch/Glob/Grep never get a file menu.
-
-
+ // Default asChild slots onto the div (no illegal span>div wrapper).
+
+
{toolHeader}
-
-
+