fix(models): respect auth order in picker label

clawsweeper[bot] · clawsweeper[bot] · commit 06ee95df6608 · 2026-05-18T16:12:19.000Z
diff --git a/src/auto-reply/reply/commands-models.test.ts b/src/auto-reply/reply/commands-models.test.ts
@@ -682,7 +682,25 @@ describe("handleModelsCommand", () => {
     const [[authLabelParams]] = modelAuthLabelMocks.resolveModelAuthLabel.mock
       .calls as unknown as Array<[{ provider?: string; acceptedProviderIds?: string[] }]>;
     expect(authLabelParams.provider).toBe("openai");
-    expect(authLabelParams.acceptedProviderIds).toEqual(["openai-codex", "openai"]);
+    expect(authLabelParams.acceptedProviderIds).toEqual(["openai-codex"]);
+  });
+
+  it("labels OpenAI model lists through the dispatch harness auth providers", async () => {
+    modelAuthLabelMocks.resolveModelAuthLabel.mockImplementation((params: unknown) => {
+      const acceptedProviderIds = (params as { acceptedProviderIds?: string[] })
+        .acceptedProviderIds;
+      return acceptedProviderIds?.length === 1 && acceptedProviderIds[0] === "openai-codex"
+        ? "oauth (codex-runtime)"
+        : "api-key (env: OPENAI_API_KEY)";
+    });
+
+    const result = await handleModelsCommand(buildParams("/models openai"), true);
+
+    expect(result?.reply?.text).toContain("Models (openai · 🔑 oauth (codex-runtime))");
+    const [[authLabelParams]] = modelAuthLabelMocks.resolveModelAuthLabel.mock
+      .calls as unknown as Array<[{ provider?: string; acceptedProviderIds?: string[] }]>;
+    expect(authLabelParams.provider).toBe("openai");
+    expect(authLabelParams.acceptedProviderIds).toEqual(["openai-codex"]);
   });
 
   it("uses spawned workspace for direct /models provider visibility", async () => {
diff --git a/src/auto-reply/reply/commands-models.ts b/src/auto-reply/reply/commands-models.ts
@@ -388,14 +388,21 @@ function parseModelsArgs(raw: string): ParsedModelsCommand {
 function resolveProviderLabel(params: {
   provider: string;
   cfg: OpenClawConfig;
+  agentId?: string;
   agentDir?: string;
   workspaceDir?: string;
   sessionEntry?: ModelsCommandSessionEntry;
 }): string {
+  const harnessPolicy = resolveAgentHarnessPolicy({
+    config: params.cfg,
+    provider: params.provider,
+    agentId: params.agentId,
+  });
   const authLabel = resolveModelAuthLabel({
     provider: params.provider,
     acceptedProviderIds: listOpenAIAuthProfileProvidersForAgentRuntime({
       provider: params.provider,
+      harnessRuntime: harnessPolicy.runtime,
       config: params.cfg,
     }),
     cfg: params.cfg,
@@ -413,13 +420,15 @@ export function formatModelsAvailableHeader(params: {
   provider: string;
   total: number;
   cfg: OpenClawConfig;
+  agentId?: string;
   agentDir?: string;
   workspaceDir?: string;
   sessionEntry?: ModelsCommandSessionEntry;
 }): string {
   const providerLabel = resolveProviderLabel({
     provider: params.provider,
     cfg: params.cfg,
+    agentId: params.agentId,
     agentDir: params.agentDir,
     workspaceDir: params.workspaceDir,
     sessionEntry: params.sessionEntry,
@@ -544,6 +553,7 @@ export async function resolveModelsCommandReply(params: {
     const emptyProviderLabel = resolveProviderLabel({
       provider,
       cfg: params.cfg,
+      agentId: params.agentId,
       agentDir: params.agentDir,
       workspaceDir: params.workspaceDir,
       sessionEntry: params.sessionEntry,
@@ -576,6 +586,7 @@ export async function resolveModelsCommandReply(params: {
         provider,
         total,
         cfg: params.cfg,
+        agentId: params.agentId,
         agentDir: params.agentDir,
         workspaceDir: params.workspaceDir,
         sessionEntry: params.sessionEntry,
@@ -605,6 +616,7 @@ export async function resolveModelsCommandReply(params: {
   const providerLabel = resolveProviderLabel({
     provider,
     cfg: params.cfg,
+    agentId: params.agentId,
     agentDir: params.agentDir,
     workspaceDir: params.workspaceDir,
     sessionEntry: params.sessionEntry,
