Elgato_dark/void
1
0
Fork 0
mirror of https://github.com/voideditor/void synced 2026-05-23 09:28:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc

Browse source
This commit is contained in:
Andrew Pareles 2025-04-20 18:44:07 -07:00
parent 58b4d90b49
commit da9817bd99
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/vs/workbench/contrib/void/browser/chatThreadService.ts
View file

@ -542,6 +542,7 @@ class ChatThreadService extends Disposable implements IChatThreadService {
if (interrupted) { return { interrupted: true } } // the tool result is added where we interrupt, not here
}
catch (error) {
delete this._currentlyRunningToolInterruptor[threadId]
if (interrupted) { return { interrupted: true } } // the tool result is added where we interrupt, not here
@ -561,6 +562,7 @@ class ChatThreadService extends Disposable implements IChatThreadService {
// 5. add to history and keep going
this._updateLatestTool(threadId, { role: 'tool', type: 'success', params: toolParams, result: toolResult, name: toolName, content: toolResultStr, id: toolId, rawParams: opts.unvalidatedToolParams })
delete this._currentlyRunningToolInterruptor[threadId]
return {}
};
@ -1043,8 +1045,8 @@ We only need to do it for files that were edited since `from`, ie files between
if (!thread) return // should never happen
const llmCancelToken = this.streamState[threadId]?.streamingToken // currently streaming LLM on this thread
if (llmCancelToken === undefined && this.streamState[threadId]?.isRunning === 'LLM') {
// if about to call the other LLM, just wait for it by stopping right now
if (llmCancelToken === undefined && this.streamState[threadId]?.isRunning) {
// if about to call the other LLM, just wait for and stop now
return
}
// stop it (this simply resolves the promise to free up space)
@ -1421,13 +1423,13 @@ We only need to do it for files that were edited since `from`, ie files between
openNewThread() {
// if a thread with 0 messages already exists, switch to it
const { allThreads: currentThreads } = this.state
for (const threadId in currentThreads) {
if (currentThreads[threadId]!.messages.length === 0) {
// switch to the existing empty thread and exit
this.switchToThread(threadId)
return
}
}
for (const threadId in currentThreads) {
if (currentThreads[threadId]!.messages.length === 0) {
// switch to the existing empty thread and exit
this.switchToThread(threadId)
return
}
}
// otherwise, start a new thread
const newThread = newThreadObject()

6
src/vs/workbench/contrib/void/browser/react/src/void-settings-tsx/Settings.tsx
View file

@ -869,11 +869,13 @@ export const Settings = () => {
let dataStr: string
let downloadName: string
if (t === 'Chats') {
dataStr = JSON.stringify(voidSettingsService.state, null, 2)
// Export chat threads
dataStr = JSON.stringify(chatThreadsService.state, null, 2)
downloadName = 'void-chats.json'
}
else if (t === 'Settings') {
dataStr = JSON.stringify(chatThreadsService.state, null, 2)
// Export user settings
dataStr = JSON.stringify(voidSettingsService.state, null, 2)
downloadName = 'void-settings.json'
}
else {