fix: 等待 codex terminal 后续消息 (#234)
This commit is contained in:
@@ -470,6 +470,20 @@ async function runCodexStdioTurnWithSession(options: CodexStdioTurnOptions, sess
|
||||
let terminal: { status: TerminalStatus; failureKind: FailureKind | null; message: string | null } | null = null;
|
||||
let terminalResolve!: () => void;
|
||||
const terminalPromise = new Promise<void>((resolve) => { terminalResolve = resolve; });
|
||||
const terminalNotificationDrainMs = codexTerminalNotificationDrainMs(env);
|
||||
let terminalNotificationDrainTimeout: NodeJS.Timeout | null = null;
|
||||
const resolveTerminalAfterNotificationDrain = (): void => {
|
||||
if (terminalNotificationDrainTimeout) clearTimeout(terminalNotificationDrainTimeout);
|
||||
if (terminalNotificationDrainMs <= 0) {
|
||||
terminalResolve();
|
||||
return;
|
||||
}
|
||||
terminalNotificationDrainTimeout = setTimeout(() => {
|
||||
terminalNotificationDrainTimeout = null;
|
||||
terminalResolve();
|
||||
}, terminalNotificationDrainMs);
|
||||
terminalNotificationDrainTimeout.unref?.();
|
||||
};
|
||||
let client: CodexStdioClient | null = null;
|
||||
const requestTimeoutMs = Math.min(positiveTimeout(options.timeoutMs), requestTimeoutCapMs);
|
||||
let stopActiveTurn: (() => void) | undefined;
|
||||
@@ -676,7 +690,7 @@ async function runCodexStdioTurnWithSession(options: CodexStdioTurnOptions, sess
|
||||
if (normalized.terminalEvents) deferredTerminalEvents.push(...normalized.terminalEvents);
|
||||
if (normalized.terminal && !terminal) {
|
||||
terminal = normalized.terminal;
|
||||
terminalResolve();
|
||||
resolveTerminalAfterNotificationDrain();
|
||||
}
|
||||
});
|
||||
try {
|
||||
@@ -1487,6 +1501,12 @@ function codexMissingTerminalAfterToolTimeoutMs(env: NodeJS.ProcessEnv, turnTime
|
||||
return positiveTimeout(turnTimeoutMs);
|
||||
}
|
||||
|
||||
function codexTerminalNotificationDrainMs(env: NodeJS.ProcessEnv): number {
|
||||
const configured = Number(env.AGENTRUN_CODEX_TERMINAL_NOTIFICATION_DRAIN_MS);
|
||||
if (Number.isFinite(configured) && configured >= 0) return Math.floor(configured);
|
||||
return 250;
|
||||
}
|
||||
|
||||
function emitCodexNotificationOtel(options: CodexStdioTurnOptions, env: NodeJS.ProcessEnv, message: JsonRecord, state: JsonRecord): void {
|
||||
const attributes = { ...state, ...notificationOtelAttributes(message) };
|
||||
emitCodexOtelSpan("codex_stdio.notification", options, env, attributes);
|
||||
|
||||
Reference in New Issue
Block a user