{
+ if (event.key === 'Escape') setSelectionMenu(null)
+ }}
+ >
{usePlainLargePreview ? (
-
+
{renderLineNumberButton(lineNumber)}
{line || ' '}
@@ -440,6 +612,7 @@ function CodeSurface({
{renderLineNumberButton(lineNumber)}
@@ -475,13 +648,53 @@ function CodeSurface({
)}
+
+
{
+ if (event.key === 'Escape') setSelectionMenu(null)
+ }}
+ >
+
)
}
@@ -815,6 +1029,18 @@ export function WorkspacePanel({ sessionId }: WorkspacePanelProps) {
})
}
+ const addSelectionToChat = (path: string, selection: WorkspaceTextSelection) => {
+ addWorkspaceReference(sessionId, {
+ kind: 'code-selection',
+ path,
+ absolutePath: resolveWorkspaceAttachmentPath(status?.workDir, path),
+ name: path.split('/').pop() || path,
+ lineStart: selection.startLine,
+ lineEnd: selection.endLine,
+ quote: selection.text,
+ })
+ }
+
const handleSetActiveView = (view: 'changed' | 'all') => {
setActiveView(sessionId, view)
setIsViewMenuOpen(false)
@@ -996,12 +1222,16 @@ export function WorkspacePanel({ sessionId }: WorkspacePanelProps) {
path={activePreviewTab.path}
/>
) : state === 'ok' && isMarkdownPreview(activePreviewTab) ? (
-
+
addSelectionToChat(activePreviewTab.path, selection)}
+ />
) : state === 'ok' ? (
addLineCommentToChat(activePreviewTab.path, line, note, quote)}
+ onAddSelection={(selection) => addSelectionToChat(activePreviewTab.path, selection)}
/>
) : (
= {
'workspace.showAllLoadedLines': '显示全部已加载行',
'workspace.collapsePreview': '收起预览',
'workspace.addToChat': '添加到聊天',
+ 'workspace.addSelectionToChat': '添加至对话',
'workspace.copyPath': '复制路径',
'workspace.localComment': '本地评论',
'workspace.commentLine': '评论第 {line} 行',
@@ -808,6 +809,10 @@ export const zh: Record = {
'chat.placeholderMissing': '此会话指向的工作目录缺失。请新建会话或选择其他项目。',
'chat.addFiles': '添加文件或图片',
'chat.workspaceReferencesOnly': '已添加 {count} 个工作区引用',
+ 'chat.contextReferencesOnly': '已添加 {count} 个引用',
+ 'chat.addSelectionToChat': '添加至对话',
+ 'chat.userMessageReference': '用户消息',
+ 'chat.assistantMessageReference': 'AI 回复',
'chat.slashCommands': '斜杠命令',
'slash.mcp.title': '可用 MCP 工具',
'slash.mcp.subtitle': '展示当前聊天上下文里的全局 MCP 和当前项目 MCP。',
diff --git a/desktop/src/stores/chatStore.test.ts b/desktop/src/stores/chatStore.test.ts
index 7a0de26e..d2fb7da1 100644
--- a/desktop/src/stores/chatStore.test.ts
+++ b/desktop/src/stores/chatStore.test.ts
@@ -449,7 +449,7 @@ describe('chatStore history mapping', () => {
useChatStore.getState().sendMessage(
TEST_SESSION_ID,
- 'Notes for attached workspace files:\n- src/App.tsx:L4\n Comment: tighten this',
+ 'Referenced workspace context:\n@"src/App.tsx:L4":\nComment: tighten this\n```tsx\nconst value = 1\n```',
[{
type: 'file',
name: 'App.tsx',
@@ -477,7 +477,7 @@ describe('chatStore history mapping', () => {
{
type: 'user_text',
content: '改这里',
- modelContent: '@"/repo/src/App.tsx" Notes for attached workspace files:\n- src/App.tsx:L4\n Comment: tighten this',
+ modelContent: '@"/repo/src/App.tsx" Referenced workspace context:\n@"src/App.tsx:L4":\nComment: tighten this\n```tsx\nconst value = 1\n```',
attachments: [{
type: 'file',
name: 'App.tsx',
@@ -493,7 +493,7 @@ describe('chatStore history mapping', () => {
TEST_SESSION_ID,
{
type: 'user_message',
- content: 'Notes for attached workspace files:\n- src/App.tsx:L4\n Comment: tighten this',
+ content: 'Referenced workspace context:\n@"src/App.tsx:L4":\nComment: tighten this\n```tsx\nconst value = 1\n```',
attachments: [{
type: 'file',
name: 'App.tsx',
diff --git a/desktop/src/stores/workspaceChatContextStore.test.ts b/desktop/src/stores/workspaceChatContextStore.test.ts
index 6194d523..0edc0f9e 100644
--- a/desktop/src/stores/workspaceChatContextStore.test.ts
+++ b/desktop/src/stores/workspaceChatContextStore.test.ts
@@ -45,14 +45,54 @@ describe('workspaceChatContextStore', () => {
},
])
- expect(prompt).toContain('Notes for attached workspace files:')
- expect(prompt).toContain('- src/App.tsx:L12')
+ expect(prompt).toContain('Referenced workspace context:')
+ expect(prompt).toContain('@"src/App.tsx:L12":')
expect(prompt).toContain('Comment: Use a clearer name')
- expect(prompt).toContain('Selected code: const value = 1')
+ expect(prompt).toContain('```tsx\nconst value = 1\n```')
expect(prompt).not.toContain('Use the Read tool')
expect(prompt).not.toContain('Path: /repo/src/App.tsx')
})
+ it('formats selected code without requiring a comment', () => {
+ const prompt = formatWorkspaceReferencePrompt([
+ {
+ id: 'ref-1',
+ kind: 'code-selection',
+ path: 'src/App.tsx',
+ absolutePath: '/repo/src/App.tsx',
+ name: 'App.tsx',
+ lineStart: 10,
+ lineEnd: 12,
+ quote: 'const value = 1\nreturn value',
+ },
+ ])
+
+ expect(prompt).toContain('Referenced workspace context:')
+ expect(prompt).toContain('@"src/App.tsx:L10-L12":')
+ expect(prompt).toContain('```tsx\nconst value = 1\nreturn value\n```')
+ expect(prompt).not.toContain('Comment:')
+ })
+
+ it('formats selected chat messages as chat context instead of file context', () => {
+ const prompt = formatWorkspaceReferencePrompt([
+ {
+ id: 'chat-ref-1',
+ kind: 'chat-selection',
+ path: 'chat://assistant/assistant-1',
+ name: 'Assistant message',
+ messageId: 'assistant-1',
+ sourceRole: 'assistant',
+ quote: 'Use the workspace panel selection menu.',
+ },
+ ])
+
+ expect(prompt).toContain('Referenced chat context:')
+ expect(prompt).toContain('Assistant message:')
+ expect(prompt).toContain('```\nUse the workspace panel selection menu.\n```')
+ expect(prompt).not.toContain('@"chat://assistant/assistant-1"')
+ expect(prompt).not.toContain('Referenced workspace context:')
+ })
+
it('does not add prompt text for plain file attachments', () => {
const prompt = formatWorkspaceReferencePrompt([
{
diff --git a/desktop/src/stores/workspaceChatContextStore.ts b/desktop/src/stores/workspaceChatContextStore.ts
index ab889563..60e70bb4 100644
--- a/desktop/src/stores/workspaceChatContextStore.ts
+++ b/desktop/src/stores/workspaceChatContextStore.ts
@@ -1,6 +1,6 @@
import { create } from 'zustand'
-export type WorkspaceChatReferenceKind = 'file' | 'code-comment'
+export type WorkspaceChatReferenceKind = 'file' | 'code-comment' | 'code-selection' | 'chat-selection'
export type WorkspaceChatReference = {
id: string
@@ -13,6 +13,8 @@ export type WorkspaceChatReference = {
lineEnd?: number
note?: string
quote?: string
+ sourceRole?: 'user' | 'assistant'
+ messageId?: string
}
type WorkspaceChatContextStore = {
@@ -29,17 +31,29 @@ type WorkspaceChatContextStore = {
function makeReferenceId(reference: Omit) {
const linePart = reference.lineStart
? `${reference.lineStart}-${reference.lineEnd ?? reference.lineStart}`
- : 'file'
- const notePart = reference.note ? reference.note.slice(0, 48) : ''
+ : reference.messageId ?? 'file'
+ const notePart = (reference.note?.trim() || reference.quote?.trim() || '').slice(0, 48)
return `${reference.kind}:${reference.path}:${linePart}:${notePart}`
}
function getReferenceDedupKey(reference: WorkspaceChatReference) {
if (reference.kind === 'file') return `${reference.kind}:${reference.path}`
- return `${reference.kind}:${reference.path}:${reference.lineStart ?? ''}:${reference.lineEnd ?? ''}:${reference.note ?? ''}`
+ return [
+ reference.kind,
+ reference.path,
+ reference.messageId ?? '',
+ reference.sourceRole ?? '',
+ reference.lineStart ?? '',
+ reference.lineEnd ?? '',
+ reference.note?.trim() ?? '',
+ reference.quote?.trim() ?? '',
+ ].join(':')
}
export function formatWorkspaceReferenceLocation(reference: WorkspaceChatReference) {
+ if (reference.kind === 'chat-selection') {
+ return reference.sourceRole === 'assistant' ? 'Assistant message' : 'User message'
+ }
if (!reference.lineStart) return reference.path
const lineEnd = reference.lineEnd && reference.lineEnd !== reference.lineStart
? `-L${reference.lineEnd}`
@@ -47,27 +61,79 @@ export function formatWorkspaceReferenceLocation(reference: WorkspaceChatReferen
return `${reference.path}:L${reference.lineStart}${lineEnd}`
}
+function getFenceForQuote(quote: string) {
+ const runs = quote.match(/`+/g) ?? []
+ const longestRun = runs.reduce((max, run) => Math.max(max, run.length), 0)
+ return '`'.repeat(Math.max(3, longestRun + 1))
+}
+
+function getLanguageHint(reference: WorkspaceChatReference) {
+ if (reference.kind === 'chat-selection') return ''
+ const extension = reference.name.split('.').pop()?.toLowerCase()
+ if (!extension || extension === reference.name.toLowerCase()) return ''
+ const aliases: Record = {
+ js: 'javascript',
+ jsx: 'jsx',
+ ts: 'typescript',
+ tsx: 'tsx',
+ md: 'markdown',
+ py: 'python',
+ rb: 'ruby',
+ rs: 'rust',
+ sh: 'bash',
+ yml: 'yaml',
+ }
+ return aliases[extension] ?? extension
+}
+
export function formatWorkspaceReferencePrompt(references: WorkspaceChatReference[]) {
- const referencesWithContext = references.filter((reference) =>
+ const workspaceReferencesWithContext = references.filter((reference) =>
reference.kind === 'code-comment' ||
+ reference.kind === 'code-selection' ||
!!reference.lineStart ||
!!reference.note?.trim() ||
!!reference.quote?.trim(),
+ ).filter((reference) => reference.kind !== 'chat-selection')
+ const chatReferencesWithContext = references.filter((reference) =>
+ reference.kind === 'chat-selection' && !!reference.quote?.trim(),
)
- if (referencesWithContext.length === 0) return ''
+ if (workspaceReferencesWithContext.length === 0 && chatReferencesWithContext.length === 0) return ''
- const lines = [
- 'Notes for attached workspace files:',
- ...referencesWithContext.map((reference) => {
+ const workspaceLines = workspaceReferencesWithContext.length > 0
+ ? [
+ 'Referenced workspace context:',
+ ...workspaceReferencesWithContext.map((reference) => {
+ const location = formatWorkspaceReferenceLocation(reference)
+ const parts = [`@"${location}":`]
+ if (reference.note?.trim()) parts.push(`Comment: ${reference.note.trim()}`)
+ if (reference.quote?.trim()) {
+ const fence = getFenceForQuote(reference.quote)
+ const languageHint = getLanguageHint(reference)
+ parts.push(`${fence}${languageHint}`)
+ parts.push(reference.quote.trim())
+ parts.push(fence)
+ }
+ return parts.join('\n')
+ }),
+ ]
+ : []
+ const chatLines = chatReferencesWithContext.length > 0
+ ? [
+ 'Referenced chat context:',
+ ...chatReferencesWithContext.map((reference) => {
const location = formatWorkspaceReferenceLocation(reference)
- const parts = [`- ${location}`]
- if (reference.note?.trim()) parts.push(`Comment: ${reference.note.trim()}`)
- if (reference.quote?.trim()) parts.push(`Selected code: ${reference.quote.trim()}`)
- return parts.join('\n ')
- }),
- ]
+ const fence = getFenceForQuote(reference.quote ?? '')
+ return [
+ `${location}:`,
+ fence,
+ reference.quote?.trim() ?? '',
+ fence,
+ ].join('\n')
+ }),
+ ]
+ : []
- return lines.join('\n')
+ return [...workspaceLines, ...chatLines].join('\n')
}
export const useWorkspaceChatContextStore = create((set) => ({