Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

Merge remote-tracking branch 'origin/main' into fix/utility-reasoning-effort

fmfsaisaia5d29e77d4d0
diff --cc apps/desktop/src/main/utility-model/oneShotCandidates.ts
index d627de7f5a,e9e417e24c..2657f88e1d
--- a/apps/desktop/src/main/utility-model/oneShotCandidates.ts
+++ b/apps/desktop/src/main/utility-model/oneShotCandidates.ts
@@@ -36,21 -34,7 +36,22 @@@ import { ensureManagedOllamaReadyForSes
import { parseAuxiliaryModelRef, type ParsedAuxiliaryModelRef } from '../../shared/auxiliaryModelChain.js';
import { getUtilityModelChainProfiles } from './UtilityModelSelection.js';
import { getEffectiveAuxiliaryModelChain } from './resolveAuxiliaryModelChain.js';
+ import { requestUtilityTextWithinTimeout } from './utilityTextTimeout.js';
+import {
+ MAX_REASONING_REQUESTS,
+ buildUtilityRequestPlan,
+ compatHasReasoningOff,
+ compatMarksNoReasoning,
+ nextUtilityRequestStep,
+ rememberUtilityStep,
+ rememberedUtilityStepIndex,
+ utilityReasoningDeclaration,
+ utilityReasoningMemoryKey,
+ utilityRequestStepKey,
+ type UtilityReasoningDeclaration,
+ type UtilityReasoningMode,
+ type UtilityRequestStep,
+} from './utilityReasoningPlan.js';
import { getUtilityModelProfile, isUtilityModelProviderKind } from '../../shared/utilityModelProfiles.js';
import type { UtilityModelProfile, UtilityModelTransport } from '../../shared/utilityModelProfiles.js';
import type {
@@@ -1898,15 -1858,19 +1999,21 @@@ async function requestProviderHttpText(
}
throw new UtilityTextExecutionError({ reason: 'empty_response' });
}
+ // A valid response cannot outlive the route or authorization that sent it.
+ // Recheck credentials and routing after the complete response, including retries.
+ if (
+ (input.credentialStillCurrent && !(await input.credentialStillCurrent()))
+ || (input.routeStillCurrent && !input.routeStillCurrent())
+ ) throw new UtilityTextExecutionError({ reason: 'request_failed' });
return text;
} catch (error) {
- if (error instanceof UtilityTextExecutionError) throw error;
- if (error instanceof Error && error.name === 'AbortError') {
- throw new UtilityTextExecutionError({ reason: 'timeout' });
- }
- throw new UtilityTextExecutionError({ reason: 'request_failed' });
+ const failure = error instanceof UtilityTextExecutionError
+ ? error
+ : new UtilityTextExecutionError({
+ reason: error instanceof Error && error.name === 'AbortError' ? 'timeout' : 'request_failed',
+ });
+ failure.wire ??= currentWire;
+ throw failure;
} finally {
clearTimeout(timeout);
input.signal?.removeEventListener('abort', abortFromParent);