fix: break provider thinking import cycle

This commit is contained in:
Peter Steinberger
2026-04-21 19:19:03 +01:00
parent b2b43085bc
commit 61564147f3
2 changed files with 11 additions and 4 deletions

View File

@@ -64,6 +64,13 @@ function setMinimaxEnv(params: { apiKey?: string; oauthToken?: string } = {}) {
}
}
function currentMinimaxTestEnv(): NodeJS.ProcessEnv {
return {
MINIMAX_API_KEY: process.env.MINIMAX_API_KEY,
MINIMAX_OAUTH_TOKEN: process.env.MINIMAX_OAUTH_TOKEN,
};
}
async function ensureMinimaxApiKey(params: {
config?: Parameters<typeof ensureApiKeyFromEnvOrPrompt>[0]["config"];
env?: Parameters<typeof ensureApiKeyFromEnvOrPrompt>[0]["env"];
@@ -76,7 +83,7 @@ async function ensureMinimaxApiKey(params: {
}) {
return await ensureMinimaxApiKeyInternal({
config: params.config,
env: params.env,
env: params.env ?? currentMinimaxTestEnv(),
prompter: createPrompter({
confirm: params.confirm,
note: params.note,
@@ -119,7 +126,7 @@ async function ensureMinimaxApiKeyWithEnvRefPrompter(params: {
}) {
return await ensureMinimaxApiKeyInternal({
config: params.config,
env: params.env,
env: params.env ?? currentMinimaxTestEnv(),
prompter: createPrompter({ select: params.select, text: params.text, note: params.note }),
secretInputMode: "ref", // pragma: allowlist secret
setCredential: params.setCredential,
@@ -179,6 +186,7 @@ async function ensureWithOptionEnvOrPrompt(params: {
token: params.token,
tokenProvider: params.tokenProvider,
config: {},
env: currentMinimaxTestEnv(),
expectedProviders: params.expectedProviders,
provider: params.provider,
envLabel: params.envLabel,

View File

@@ -1,5 +1,4 @@
import { normalizeProviderId } from "../agents/provider-id.js";
import { resolveProviderRuntimePlugin } from "./provider-hook-runtime.js";
import type {
ProviderDefaultThinkingPolicyContext,
ProviderThinkingProfile,
@@ -50,7 +49,7 @@ function resolveActiveThinkingProvider(providerId: string): ThinkingProviderPlug
if (activeProvider) {
return activeProvider;
}
return resolveProviderRuntimePlugin({ provider: providerId });
return undefined;
}
type ThinkingHookParams<TContext> = {