, point: { x: number; y: number }): void => {
+ if (event.defaultPrevented) return
+ event.preventDefault()
+ event.stopPropagation()
+ event.currentTarget.focus({ preventScroll: true })
+ open(point)
+ }
+ return {
+ onContextMenu: (event) => { show(event, menuPoint(event)) },
+ onKeyDown: (event) => {
+ if (event.repeat || event.nativeEvent.isComposing || event.ctrlKey || event.altKey || event.metaKey) return
+ if (event.key !== 'ContextMenu' && !(event.key === 'F10' && event.shiftKey)) return
+ show(event, menuPoint({ clientX: 0, clientY: 0, currentTarget: event.currentTarget }))
+ },
+ }
+}
diff --git a/packages/client/ui-primitives/src/user-text.tsx b/packages/client/ui-primitives/src/user-text.tsx
index 784dcec30e..f6e9e553da 100644
--- a/packages/client/ui-primitives/src/user-text.tsx
+++ b/packages/client/ui-primitives/src/user-text.tsx
@@ -1,6 +1,7 @@
/** Inline text and reference presentation; business rules supply resolved JSON data and actions. */
import type { ReactNode } from 'react'
import clsx from 'clsx'
+import { contextMenuTrigger } from './menu-point.ts'
import { ReferenceIconRegular, type ReferenceIconKind } from './ReferenceIcon.tsx'
import css from './user-text.module.css'
import markdownCss from './markdown/MarkdownText.module.css'
@@ -26,6 +27,8 @@ export interface ReferenceChipProps {
readonly filePath?: string
/** Base used to interpret a relative file destination. */
readonly fileBase?: 'workspace' | 'workingDirectory'
+ /** Explicit object-menu callback; absent for display-only references. */
+ readonly openContextMenu?: (point: { x: number; y: number }) => void
readonly label: string
readonly title: string
/** Absent for display-only references and previews. */
@@ -38,20 +41,33 @@ export interface ReferenceChipProps {
* @param props - resolved visual fields and optional action from the owning renderer.
* @returns an inline label, or a keyboard-accessible button when activation is supplied.
*/
-export function ReferenceChip({ appearance, label, title, onActivate, filePath, fileBase }: ReferenceChipProps): ReactNode {
+export function ReferenceChip({
+ appearance, label, title, onActivate, filePath, fileBase, openContextMenu,
+}: ReferenceChipProps): ReactNode {
const slash = appearance === 'skill' || appearance === 'command'
const contents = <>
{!slash && }
{label}
>
+ const menu = contextMenuTrigger(openContextMenu)
const className = clsx(css.refChip, slash && css.slashChip)
return onActivate === undefined
- ? {contents}
+ ? {contents}
:
@@ -227,10 +238,14 @@ export const ToolRow = memo(function ToolRow({
{
+ summaryLinkKeyDown(event)
+ urlMenu.onKeyDown?.(event)
+ }}
>
{summaryText}
@@ -255,7 +270,7 @@ export const ToolRow = memo(function ToolRow({
)}
>
- ), [summaryLinkKeyDown, linkHref, openFile, state, suffix, totals, summaryText, exitLabel])
+ ), [summaryLinkKeyDown, fileMenu, urlMenu, linkHref, openFile, state, suffix, totals, summaryText, exitLabel])
const expandedContent = useMemo(() => open ? (
{askQuestionBody !== null
diff --git a/packages/client/ui-tool/tests/tool-row.client.spec.tsx b/packages/client/ui-tool/tests/tool-row.client.spec.tsx
index 3020472796..6200ffef86 100644
--- a/packages/client/ui-tool/tests/tool-row.client.spec.tsx
+++ b/packages/client/ui-tool/tests/tool-row.client.spec.tsx
@@ -10,6 +10,7 @@ import { localizeAutoReviewDenial, normalizeAutoReviewReason } from '../src/clie
import {
classifyTool, formatToolBody, resultText, toolRowModel,
} from '../src/client/tool/models/tool-call-model.ts'
+import { MarkdownDelegateProvider } from '@deepseek-ai/dsh-client-ui-primitives'
import { ToolRow } from '../src/client/tool/components/ToolRow.tsx'
import { GenericToolCard, type GenericToolCardProps } from '../src/client/tool/toolviews/GenericToolCard.tsx'
import { zh } from '@deepseek-ai/dsh-client-ui-conversation/src/client/locales.ts'
@@ -330,6 +331,27 @@ describe('ToolRow', () => {
summary: 'List files', bodyRaw: '{"a":1}', state: 'ok' as const,
}
+ it('declares file and URL menus without losing line numbers or toggling the row', () => {
+ const open = vi.fn()
+ const view = render(
+ {}} />
+ )
+ const file = view.getByRole('button', { name: 'file.ts:42' })
+ file.getBoundingClientRect = () => new DOMRect(10, 20, 100, 20)
+ fireEvent.contextMenu(file, { clientX: 30, clientY: 40 })
+ fireEvent.keyDown(file, { key: 'F10', shiftKey: true })
+ expect(open.mock.calls).toEqual([
+ [{ kind: 'file', path: '/workspace/file.ts', line: 42 }, { x: 30, y: 40 }],
+ [{ kind: 'file', path: '/workspace/file.ts', line: 42 }, { x: 10, y: 40 }],
+ ])
+ expect(view.container.querySelector('[aria-expanded]')?.getAttribute('aria-expanded')).toBe('false')
+ view.rerender(
+
+ )
+ fireEvent.keyDown(view.getByRole('link'), { key: 'ContextMenu' })
+ expect(open).toHaveBeenLastCalledWith({ kind: 'url', url: 'https://example.com?q=1#part' }, { x: 0, y: 0 })
+ })
+
it('renders leading icon, title and summary while collapsed', () => {
const view = render()
expect(view.queryByTestId('tool-icon')).not.toBeNull()
diff --git a/packages/client/ui-workspace/src/client/rows/WorkspaceBrowser.tsx b/packages/client/ui-workspace/src/client/rows/WorkspaceBrowser.tsx
index 96e8fd41e3..6f8226c3c1 100644
--- a/packages/client/ui-workspace/src/client/rows/WorkspaceBrowser.tsx
+++ b/packages/client/ui-workspace/src/client/rows/WorkspaceBrowser.tsx
@@ -617,7 +617,8 @@ function SessionTree({
onOpen={open}
onRenameRequest={onSessionRenameRequest}
renderSlot={renderSlot}
- openSessionMenu={openSessionMenu} useMenuTarget={useMenuTarget}
+ openSessionMenu={openSessionMenu}
+ useMenuTarget={useMenuTarget}
onReveal={node.id === revealSessionId && group.key === revealGroup
? () => { onSessionRevealed(node.id) }
: undefined}
@@ -750,7 +751,8 @@ function FlatList({
onOpen={open}
onRenameRequest={onSessionRenameRequest}
renderSlot={renderSlot}
- openSessionMenu={openSessionMenu} useMenuTarget={useMenuTarget}
+ openSessionMenu={openSessionMenu}
+ useMenuTarget={useMenuTarget}
onReveal={node.id === revealSessionId
? () => { onSessionRevealed(node.id) }
: undefined}
@@ -1367,7 +1369,8 @@ export function WorkspaceBrowser({
open={guardedOpen}
onSessionRenameRequest={requestSessionRename}
renderSlot={renderSlot}
- openSessionMenu={openSessionMenu} useMenuTarget={useMenuTarget}
+ openSessionMenu={openSessionMenu}
+ useMenuTarget={useMenuTarget}
setSessionOrder={saveSessionOrder}
revealSessionId={revealSessionId}
onSessionRevealed={acknowledgeSessionReveal}
@@ -1386,7 +1389,9 @@ export function WorkspaceBrowser({
useSessionStatus={useSessionStatus}
onSessionRenameRequest={requestSessionRename}
renderSlot={renderSlot}
- openSessionMenu={openSessionMenu} openWorkspaceMenu={openWorkspaceMenu} useMenuTarget={useMenuTarget}
+ openSessionMenu={openSessionMenu}
+ openWorkspaceMenu={openWorkspaceMenu}
+ useMenuTarget={useMenuTarget}
workspaces={orderedWorkspaces}
ungroupedSessionIds={orderedUngroupedSessionIds}
workspaceReady={workspaceReady}
diff --git a/packages/extensions/cordis-client-runner/src/client/slot-catalog.ts b/packages/extensions/cordis-client-runner/src/client/slot-catalog.ts
index 8f8b119491..be1de71d4e 100644
--- a/packages/extensions/cordis-client-runner/src/client/slot-catalog.ts
+++ b/packages/extensions/cordis-client-runner/src/client/slot-catalog.ts
@@ -120,7 +120,7 @@ export const CLIENT_SLOT_API: readonly ClientSlotEntry[] = [
],
replaceRisk: 'shadows-shipped-ui',
example: 'return {\n inject: [\'slots\'],\n apply(ctx) {\n ctx.slots.inject(\'contextMenu.content\', () => ctx.slots.register(\n { name: \'contextMenu.content\', key: \'\' },\n () => React.createElement(\'div\', null, \'hello\'),\n ))\n },\n}',
- source: 'packages/client/ui-context-menu/src/client/index.ts:24',
+ source: 'packages/client/ui-context-menu/src/client/index.ts:25',
},
{
key: 'conversation.approval.detail',
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 98b8caadca..8f9eafcfa6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4474,18 +4474,36 @@ importers:
'@deepseek-ai/cordis':
specifier: workspace:~
version: link:../../../vendor/cordis
+ '@deepseek-ai/dsh-api-workspace-files':
+ specifier: workspace:*
+ version: link:../../api/workspace-files
'@deepseek-ai/dsh-brand':
specifier: workspace:*
version: link:../../util/brand
+ '@deepseek-ai/dsh-client-locale':
+ specifier: workspace:*
+ version: link:../locale
'@deepseek-ai/dsh-client-test-runtime':
specifier: workspace:*
version: link:../../test-support/client-runtime
+ '@deepseek-ai/dsh-client-ui-context-menu':
+ specifier: workspace:*
+ version: link:../ui-context-menu
'@deepseek-ai/dsh-client-ui-slots':
specifier: workspace:*
version: link:../ui-slots
+ '@deepseek-ai/dsh-session':
+ specifier: workspace:*
+ version: link:../../core/session
'@deepseek-ai/dsh-util-file-drag':
specifier: workspace:*
version: link:../../util/file-drag
+ '@deepseek-ai/dsh-util-workspace-path':
+ specifier: workspace:*
+ version: link:../../util/workspace-path
+ mime:
+ specifier: ^4.1.0
+ version: 4.1.1
packages/client/ui-file-drag:
devDependencies:
@@ -4918,9 +4936,6 @@ importers:
'@deepseek-ai/dsh-util-workspace-path':
specifier: workspace:*
version: link:../../util/workspace-path
- mime:
- specifier: ^4.1.0
- version: 4.1.1
react:
specifier: ^18.2.0
version: 18.3.1