More results available...
)}
-
+ />))}
+ {value.hasNextPage &&
+
-
{ commandService.executeCommand('vscode.open', params.uri, { preview: true }) }}>
- {getBasename(params.uri.fsPath)}
+ componentParams.children =
+ { commandService.executeCommand('vscode.open', params.uri, { preview: true }) }}
+ />
+
+
-
-
+
return
},
resultWrapper: ({ toolMessage }) => {
const accessor = useAccessor()
const commandService = accessor.get('ICommandService')
- const title = toolNameToTitle[toolMessage.name]
+ const title = toolNameToTitle[toolMessage.name].past
const desc1 = toolNameToDesc(toolMessage.name, toolMessage.result.params)
const icon = null
@@ -1409,12 +1423,12 @@ const toolNameToComponent: { [T in ToolName]: {
if (toolMessage.result.type === 'success') {
const { params } = toolMessage.result
- componentParams.children =
+ componentParams.children =
componentParams.onClick = () => { commandService.executeCommand('vscode.open', params.uri, { preview: true }) }
}
else if (toolMessage.result.type === 'rejected') {
const { params } = toolMessage.result
- componentParams.children =
+ componentParams.children =
componentParams.onClick = () => { commandService.executeCommand('vscode.open', params.uri, { preview: true }) }
}
else if (toolMessage.result.type === 'error') {
@@ -1431,7 +1445,7 @@ const toolNameToComponent: { [T in ToolName]: {
const accessor = useAccessor()
const commandService = accessor.get('ICommandService')
const terminalToolsService = accessor.get('ITerminalToolService')
- const title = toolNameToTitle[toolRequest.name]
+ const title = toolNameToTitle[toolRequest.name].proposed
const desc1 = toolNameToDesc(toolRequest.name, toolRequest.params)
const icon = null
@@ -1451,7 +1465,7 @@ const toolNameToComponent: { [T in ToolName]: {
const accessor = useAccessor()
const commandService = accessor.get('ICommandService')
const terminalToolsService = accessor.get('ITerminalToolService')
- const title = toolNameToTitle[toolMessage.name]
+ const title = toolNameToTitle[toolMessage.name].past
const desc1 = toolNameToDesc(toolMessage.name, toolMessage.result.params)
const icon = null
@@ -1529,7 +1543,8 @@ const ChatBubble = ({ chatMessage, isLoading, messageIdx, isLast }: ChatBubblePr
}
else if (role === 'tool_request') {
const ToolRequestWrapper = toolNameToComponent[chatMessage.name].requestWrapper as React.FC<{ toolRequest: any }> // ts isnt smart enough...
- if (!isLast) return null
+ // if (!isLast) return null
+ if (!ToolRequestWrapper) return null
return <>
diff --git a/src/vs/workbench/contrib/void/browser/toolsService.ts b/src/vs/workbench/contrib/void/browser/toolsService.ts
index d740a26d..c6c8a7f8 100644
--- a/src/vs/workbench/contrib/void/browser/toolsService.ts
+++ b/src/vs/workbench/contrib/void/browser/toolsService.ts
@@ -75,7 +75,7 @@ const directoryResultToString = (params: ToolCallParams['list_dir'], result: Too
let output = '';
const entries = result.children;
- if (!result.hasPrevPage) {
+ if (!result.hasPrevPage) { // is first page
output += `${params.rootURI}\n`;
}
@@ -351,7 +351,7 @@ export class ToolsService implements IToolsService {
},
list_dir: (params, result) => {
const dirTreeStr = directoryResultToString(params, result)
- return dirTreeStr + nextPageStr(result.hasNextPage)
+ return dirTreeStr // + nextPageStr(result.hasNextPage) // already handles num results remaining
},
pathname_search: (params, result) => {
return result.uris.map(uri => uri.fsPath).join('\n') + nextPageStr(result.hasNextPage)
diff --git a/src/vs/workbench/contrib/void/common/prompt/prompts.ts b/src/vs/workbench/contrib/void/common/prompt/prompts.ts
index 806e8468..067fc649 100644
--- a/src/vs/workbench/contrib/void/common/prompt/prompts.ts
+++ b/src/vs/workbench/contrib/void/common/prompt/prompts.ts
@@ -14,8 +14,9 @@ import { CodeSelection, FileSelection, StagingSelectionItem } from '../chatThrea
export const tripleTick = ['```', '```']
export const editToolDesc_toolDescription = `\
-A high level description of the change you'd like to make in the file. This description will be handed to a dumber, faster model that will quickly apply the change. \
-Typically the best description you can give here is a single code block of the form:\n${tripleTick[0]}\n// ... existing code ...\n{{change 1}}\n// ... existing code ...\n{{change2}}\n// ... existing code ...\n{{change 3}}\n...\n${tripleTick[1]}. \
+A high level description of the change you'd like to make in the file. This description will be handed to a dumber, faster model that will quickly apply the change.\
+The model does not have ANY context except the file content and this description, so make sure to include all necessary information to make the change here.\
+Typically the best description you can give is a code block of the form:\n${tripleTick[0]}\n// ... existing code ...\n{{change 1}}\n// ... existing code ...\n{{change2}}\n// ... existing code ...\n{{change 3}}\n...\n${tripleTick[1]}. \
Do NOT output the whole file here if possible, and try to write as LITTLE code as needed to describe the change.`
@@ -29,22 +30,23 @@ The user's system information is as follows:
- ${os}
- Open workspace(s): ${workspaces.join(', ') || 'NO WORKSPACE OPEN'}
${(mode === 'agent' || mode === 'gather') && runningTerminalIds.length !== 0 ? `\
-- Running terminal IDs: ${runningTerminalIds.join(', ')}
+- Existing terminal IDs: ${runningTerminalIds.join(', ')}
`: '\n'}
${mode === 'agent' || mode === 'gather' /* tool use */ ? `\
You will be given tools you can call.
-- Only use tools if they help you accomplish the user's goal. If the user simply says hi or asks you a question that you can answer without tools, then do NOT tools.
-- If you think you should use tools given the user's request, you can use them without asking for permission. Feel free to use tools to gather context, understand the codebase, ${mode === 'agent' ? 'edit files, ' : ''}etc.
-- NEVER refer to a tool by name when speaking with the user. For example, do NOT say to the user "I'm going to use \`list_dir\`". Instead, say "I'm going to list all files in ___ directory", etc. Do not refer to "pages" of results, just say you're getting more results.
-- Some tools only work if the user has a workspace open. ${mode === 'gather' ? '' : `
-- NEVER modify a file outside one of the the user's workspaces without confirmation from the user.`}
+- Only use tools if they help you accomplish the user's goal. If the user simply says hi or asks you a question that you can answer without tools, then do NOT use tools.
+- If you think you should use tools, you do not need to ask for permission. Feel free to call tools whenever you'd like. You can use them to understand the codebase, ${mode === 'agent' ? 'run terminal commands, edit files, ' : 'gather relevant files and information, '}etc.
+- NEVER refer to a tool by name when speaking with the user (NEVER say something like "I'm going to use \`tool_name\`"). Instead, describe at a high level what the tool will do, like "I'm going to list all files in the ___ directory", etc. Also do not refer to "pages" of results, just say you're getting more results.
+- Some tools only work if the user has a workspace open.${mode === 'agent' ? `
+- NEVER modify a file outside the user's workspace(s) without permission from the user.` : ''}
\
`: `\
You're allowed to ask for more context. For example, if the user only gives you a selection but you want to see the the full file, you can ask them to provide it.\
`}
${mode === 'agent' /* code blocks */ ? `\
-If you have a change to make, you should almost always use a tool to edit the file. Even if you don't (e.g. if the user asks you not to), you should still NEVER re-write the entire file for the user. Instead, you should write comments like "// ... existing code" to indicate how to change the existing code. \
+- Prioritize editing files and running commands over simply making suggestions.
+- Prioritize taking as many steps as you need to complete your request over stopping early.\
`: `\
If you think it's appropriate to suggest an edit to a file, then you must describe your suggestion in CODE BLOCK(S) (wrapped in triple backticks).
- The first line of the code block must be the FULL PATH of the file you want to change. If the path does not already exist, it will be created.
@@ -53,8 +55,8 @@ If you think it's appropriate to suggest an edit to a file, then you must descri
- Do NOT re-write the entire file in the code block(s). Instead, write comments like "// ... existing code" to indicate how to change the existing code.`}
Misc:
-- Always wrap any code you produce in triple backticks.
-\
+- Do not make things up.
+- Always wrap any code you produce in triple backticks, and specify a language if possible. For example, ${tripleTick[0]}typescript\n...\n${tripleTick[1]}.\
`