@@ -152,7 +152,7 @@ async function resolveStatusHarnessId(params: {
152152}
153153}
154154155-function resolveStatusAuthProvider(params: {
155+function resolveStatusRuntimeProvider(params: {
156156provider: string;
157157effectiveHarness?: string;
158158}): string {
@@ -167,18 +167,6 @@ function resolveStatusAuthProvider(params: {
167167return params.provider;
168168}
169169170-function resolveStatusUsageProvider(params: {
171-provider: string;
172-effectiveHarness?: string;
173-}): string {
174-const harness = normalizeOptionalLowercaseString(params.effectiveHarness);
175-const provider = normalizeOptionalLowercaseString(params.provider);
176-if (harness === "codex" && provider === "openai") {
177-return "openai-codex";
178-}
179-return params.provider;
180-}
181-182170function formatAgentTaskCountsLine(agentId: string): string | undefined {
183171const snapshot = buildTaskStatusSnapshot(listTasksForAgentIdForStatus(agentId));
184172if (snapshot.totalCount === 0) {
@@ -241,13 +229,19 @@ export async function buildStatusText(params: BuildStatusTextParams): Promise<st
241229 sessionKey,
242230 sessionEntry,
243231}));
232+const selectedStatusProvider = resolveStatusRuntimeProvider({
233+ provider,
234+ effectiveHarness,
235+});
236+const activeProvider = modelRefs.active.provider || provider;
237+const activeStatusProvider = resolveStatusRuntimeProvider({
238+provider: activeProvider,
239+ effectiveHarness,
240+});
244241const selectedModelAuth = Object.hasOwn(params, "modelAuthOverride")
245242 ? params.modelAuthOverride
246243 : resolveModelAuthLabel({
247-provider: resolveStatusAuthProvider({
248- provider,
249- effectiveHarness,
250-}),
244+provider: selectedStatusProvider,
251245 cfg,
252246 sessionEntry,
253247agentDir: statusAgentDir,
@@ -258,29 +252,17 @@ export async function buildStatusText(params: BuildStatusTextParams): Promise<st
258252 ? params.activeModelAuthOverride
259253 : modelRefs.activeDiffers
260254 ? resolveModelAuthLabel({
261-provider: resolveStatusAuthProvider({
262-provider: modelRefs.active.provider,
263- effectiveHarness,
264-}),
255+provider: activeStatusProvider,
265256 cfg,
266257 sessionEntry,
267258agentDir: statusAgentDir,
268259workspaceDir: statusWorkspaceDir,
269260includeExternalProfiles: false,
270261})
271262 : selectedModelAuth;
272-const usageStatusProvider = resolveStatusUsageProvider({
273-provider: modelRefs.active.provider || provider,
274- effectiveHarness,
275-});
276263const usageAuthLabel = modelRefs.activeDiffers ? activeModelAuth : selectedModelAuth;
277-const currentUsageProvider = (() => {
278-try {
279-return resolveUsageProviderId(usageStatusProvider);
280-} catch {
281-return undefined;
282-}
283-})();
264+const currentUsageProvider =
265+resolveUsageProviderId(activeStatusProvider) ?? resolveUsageProviderId(activeProvider);
284266let usageLine: string | null = null;
285267if (
286268currentUsageProvider &&
@@ -376,13 +358,9 @@ export async function buildStatusText(params: BuildStatusTextParams): Promise<st
376358const explicitThinkingDefault =
377359(agentConfig?.thinkingDefault as ThinkLevel | undefined) ??
378360(agentDefaults.thinkingDefault as ThinkLevel | undefined);
379-const runtimeContextProvider = resolveStatusAuthProvider({
380-provider: modelRefs.active.provider || provider,
381- effectiveHarness,
382-});
383361const runtimeContextTokens = resolveStatusRuntimeContextTokens({
384362 cfg,
385-provider: runtimeContextProvider,
363+provider: activeStatusProvider,
386364model: modelRefs.active.model || model,
387365});
388366return buildStatusMessage({
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。