From 9a8814cc50b31af3f323a5ce768f11d9171c633c Mon Sep 17 00:00:00 2001
From: Andrew Pareles <andrewpareles@gmail.com>
Date: Mon, 17 Mar 2025 04:00:18 -0700
Subject: [PATCH] jump to file for edit request

---
 .../src/markdown/ApplyBlockHoverButtons.tsx   | 33 ++++++++++++-------
 .../react/src/sidebar-tsx/SidebarChat.tsx     |  6 ++--
 .../llmMessage/preprocessLLMMessages.ts       |  1 -
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx b/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx
index 4c3adb20..fe2d48bb 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx
@@ -102,6 +102,23 @@ const CopyButton = ({ codeStr }: { codeStr: string }) => {
 const applyingURIOfApplyBoxIdRef: { current: { [applyBoxId: string]: URI | undefined } } = { current: {} }
 
 
+
+
+export const JumpToFileButton = ({ uri }: { uri: URI | 'current' }) => {
+	const accessor = useAccessor()
+	const commandService = accessor.get('ICommandService')
+
+	const jumpToFileButton = uri !== 'current' && (
+		<IconShell1
+			Icon={FileSymlink}
+			onClick={() => { commandService.executeCommand('vscode.open', uri, { preview: true }) }}
+			title="Reject changes"
+		/>
+	)
+
+	return jumpToFileButton
+}
+
 export const useApplyButtonHTML = ({ codeStr, applyBoxId, uri }: { codeStr: string, applyBoxId: string, uri: URI | 'current' }) => {
 
 	const settingsState = useSettingsState()
@@ -110,7 +127,6 @@ export const useApplyButtonHTML = ({ codeStr, applyBoxId, uri }: { codeStr: stri
 	const accessor = useAccessor()
 	const editCodeService = accessor.get('IEditCodeService')
 	const metricsService = accessor.get('IMetricsService')
-	const commandService = accessor.get('ICommandService')
 
 	const [_, rerender] = useState(0)
 
@@ -220,27 +236,20 @@ export const useApplyButtonHTML = ({ codeStr, applyBoxId, uri }: { codeStr: stri
 		/>
 	)
 
-	const jumpToFileHTML = uri !== 'current' && (
-		<IconShell1
-			Icon={FileSymlink}
-			onClick={() => { commandService.executeCommand('vscode.open', uri, { preview: true }) }}
-			title="Reject changes"
-		/>
-	)
 
 
 	let buttonsHTML = <></>
 
 	if (currStreamState === 'streaming') {
 		buttonsHTML = <>
-			{jumpToFileHTML}
+			<JumpToFileButton uri={uri} />
 			{stopButton}
 		</>
 	}
 
 	if (currStreamState === 'idle') {
 		buttonsHTML = <>
-			{jumpToFileHTML}
+			<JumpToFileButton uri={uri} />
 			{copyButton}
 			{playButton}
 		</>
@@ -248,7 +257,7 @@ export const useApplyButtonHTML = ({ codeStr, applyBoxId, uri }: { codeStr: stri
 
 	if (currStreamState === 'acceptRejectAll') {
 		buttonsHTML = <>
-			{jumpToFileHTML}
+			<JumpToFileButton uri={uri} />
 			{reapplyButton}
 			{rejectButton}
 			{acceptButton}
@@ -290,7 +299,7 @@ export const BlockCodeApplyWrapper = ({
 	children: React.ReactNode;
 	applyBoxId: string;
 	canApply: boolean;
-	language:string;
+	language: string;
 	uri: URI | 'current',
 }) => {
 
diff --git a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
index 2d370bd1..26ecd031 100644
--- a/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
+++ b/src/vs/workbench/contrib/void/browser/react/src/sidebar-tsx/SidebarChat.tsx
@@ -28,7 +28,7 @@ import { getModelSelectionState, getModelCapabilities } from '../../../../common
 import { AlertTriangle, Ban, ChevronRight, Dot, Pencil, X } from 'lucide-react';
 import { ChatMessage, StagingSelectionItem, ToolMessage, ToolRequestApproval } from '../../../../common/chatThreadServiceTypes.js';
 import { ResolveReason, ToolCallParams, ToolName, ToolNameWithApproval } from '../../../../common/toolsServiceTypes.js';
-import { useApplyButtonHTML } from '../markdown/ApplyBlockHoverButtons.js';
+import { JumpToFileButton, useApplyButtonHTML } from '../markdown/ApplyBlockHoverButtons.js';
 import { DiffZone } from '../../../editCodeService.js';
 import { ScrollType } from '../../../../../../../editor/common/editorCommon.js';
 
@@ -1546,6 +1546,8 @@ const toolNameToComponent: { [T in ToolName]: {
 				changeDescription={params.changeDescription}
 			/>
 
+			componentParams.desc2 = <JumpToFileButton uri={params.uri} />
+
 			return <ToolHeaderWrapper {...componentParams} />
 		},
 		resultWrapper: ({ toolMessage, messageIdx }) => {
@@ -1944,8 +1946,6 @@ export const SidebarChat = () => {
 		// send message to LLM
 		const userMessage = textAreaRef.current?.value ?? ''
 
-		// getModelCapabilities() // TODO!!! check if can go into agent mode
-
 		try {
 			await chatThreadsService.addUserMessageAndStreamResponse({ userMessage, threadId })
 		} catch (e) {
diff --git a/src/vs/workbench/contrib/void/electron-main/llmMessage/preprocessLLMMessages.ts b/src/vs/workbench/contrib/void/electron-main/llmMessage/preprocessLLMMessages.ts
index c9388f08..3ba8f383 100644
--- a/src/vs/workbench/contrib/void/electron-main/llmMessage/preprocessLLMMessages.ts
+++ b/src/vs/workbench/contrib/void/electron-main/llmMessage/preprocessLLMMessages.ts
@@ -397,7 +397,6 @@ export const prepareMessages = ({
 	const { messages: messages4 } = prepareMessages_tools({ messages: messages3, supportsTools })
 	const { messages: messages5 } = prepareMessages_noEmptyMessage({ messages: messages4 })
 
-	console.log('MESSAGES!!!', JSON.stringify(messages, null, 2))
 	return {
 		messages: messages5 as any,
 		separateSystemMessageStr