pacnpal/Roo-Code
1
0
Fork 0
mirror of https://github.com/pacnpal/Roo-Code.git synced 2025-12-20 20:31:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Terminal output and cooldown fixes

Browse Source
This commit is contained in:
Saoud Rizwan
2024-09-10 17:47:09 -04:00
parent 706ee8a0fe
commit 6d6150c608
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ClaudeDev.ts
View File

@@ -1790,7 +1790,7 @@ ${
await delay(500) // delay after saving file await delay(500) // delay after saving file
await pWaitFor(() => busyTerminals.every((t) => !this.terminalManager.isProcessHot(t.id)), { await pWaitFor(() => busyTerminals.every((t) => !this.terminalManager.isProcessHot(t.id)), {
interval: 100, interval: 100,
timeout: 7_000, timeout: 7_500,
}).catch(() => {}) }).catch(() => {})
// terminals are cool, let's retrieve their output // terminals are cool, let's retrieve their output
details += "\n\n# Active Terminals" details += "\n\n# Active Terminals"

9
src/integrations/TerminalManager.ts
View File

@@ -250,6 +250,9 @@ interface TerminalProcessEvents {
no_shell_integration: [] no_shell_integration: []
} }
// how long to wait after a process outputs anything before we consider it "cool" again
const PROCESS_HOT_TIMEOUT = 2_500
export class TerminalProcess extends EventEmitter<TerminalProcessEvents> { export class TerminalProcess extends EventEmitter<TerminalProcessEvents> {
waitForShellIntegration: boolean = true waitForShellIntegration: boolean = true
private isListening: boolean = true private isListening: boolean = true
@@ -278,7 +281,7 @@ export class TerminalProcess extends EventEmitter<TerminalProcessEvents> {
} }
this.hotTimer = setTimeout(() => { this.hotTimer = setTimeout(() => {
this.isHot = false this.isHot = false
}, 4_000) }, PROCESS_HOT_TIMEOUT)
if (isFirstChunk) { if (isFirstChunk) {
/* /*
The first chunk we get from this stream needs to be processed to be more human readable, ie remove vscode's custom escape sequences and identifiers, removing duplicate first char bug, etc. The first chunk we get from this stream needs to be processed to be more human readable, ie remove vscode's custom escape sequences and identifiers, removing duplicate first char bug, etc.
@@ -330,8 +333,8 @@ export class TerminalProcess extends EventEmitter<TerminalProcessEvents> {
data = lines.join("\n") data = lines.join("\n")
} }
// sometimes chunks have leading/trailing commas which we'll remove too // FIXME: right now it seems that data chunks returned to us from the shell integration stream contains random commas, which from what I can tell is not the expected behavior. There has to be a better solution here than just removing all commas.
data = data.replace(/^,+|,+$/g, "") data = data.replace(/,/g, "")
// For non-immediately returning commands we want to show loading spinner right away but this wouldnt happen until it emits a line break, so as soon as we get any output we emit "" to let webview know to show spinner // For non-immediately returning commands we want to show loading spinner right away but this wouldnt happen until it emits a line break, so as soon as we get any output we emit "" to let webview know to show spinner
if (!didEmitEmptyLine && !this.fullOutput && data) { if (!didEmitEmptyLine && !this.fullOutput && data) {