fix: harden agent prompt handling
This commit is contained in:
@@ -79,7 +79,7 @@ import {
|
||||
import { processRegistry } from "../../system/processRegistry";
|
||||
import { t } from "../../i18n";
|
||||
import type { DetailedSession } from "@shared/types/sessions";
|
||||
import { ACP_ABORT_TIMEOUT } from "@shared/constants";
|
||||
import { ACP_ABORT_TIMEOUT, ACP_PROMPT_TIMEOUT } from "@shared/constants";
|
||||
import { APP_DATA_DIR_NAME } from "../../constants";
|
||||
import { perfEmitter } from "../perf/perfEmitter";
|
||||
import { firstTokenTrace } from "../perf/firstTokenTrace";
|
||||
@@ -1520,8 +1520,20 @@ export class AcpEngine extends EventEmitter {
|
||||
const maxAttempts = this.engineName === "qimingcode" ? 2 : 1;
|
||||
let attempt = 1;
|
||||
while (true) {
|
||||
let promptTimeout: ReturnType<typeof setTimeout> | undefined;
|
||||
try {
|
||||
const res = await this.acpConnection!.prompt(promptParams);
|
||||
const res = await Promise.race([
|
||||
this.acpConnection!.prompt(promptParams),
|
||||
new Promise<never>((_, reject) => {
|
||||
promptTimeout = setTimeout(() => {
|
||||
reject(
|
||||
new Error(
|
||||
`ACP prompt timed out after ${ACP_PROMPT_TIMEOUT}ms`,
|
||||
),
|
||||
);
|
||||
}, ACP_PROMPT_TIMEOUT);
|
||||
}),
|
||||
]);
|
||||
log.info(
|
||||
`${this.logTag} 📥 ACP prompt resolved (${Date.now() - promptStartTime}ms, attempt=${attempt}):`,
|
||||
safeStringify(res),
|
||||
@@ -1529,9 +1541,20 @@ export class AcpEngine extends EventEmitter {
|
||||
return res;
|
||||
} catch (err) {
|
||||
const errMsg = this.toErrorMessage(err);
|
||||
if (errMsg.includes("ACP prompt timed out")) {
|
||||
log.error(
|
||||
`${this.logTag} 📥 ACP prompt timed out (${Date.now() - promptStartTime}ms, attempt=${attempt})`,
|
||||
{
|
||||
sessionId,
|
||||
acpSessionId: session.acpSessionId,
|
||||
requestId: _opts?.messageID,
|
||||
},
|
||||
);
|
||||
}
|
||||
const canRetry =
|
||||
attempt < maxAttempts &&
|
||||
!this.isPromptCancellation(err) &&
|
||||
!errMsg.includes("ACP prompt timed out") &&
|
||||
this.isMcpReconnectFailure(errMsg);
|
||||
|
||||
if (!canRetry) {
|
||||
@@ -1569,6 +1592,10 @@ export class AcpEngine extends EventEmitter {
|
||||
);
|
||||
await this.sleep(MCP_RETRY_DELAY_MS);
|
||||
attempt += 1;
|
||||
} finally {
|
||||
if (promptTimeout !== undefined) {
|
||||
clearTimeout(promptTimeout);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user