fix(agents): avoid alias setup load for matching refs

vincentkoc · vincentkoc · commit b334e7ef29ba · 2026-05-31T16:48:27.000+02:00
diff --git a/src/agents/model-runtime-aliases.test.ts b/src/agents/model-runtime-aliases.test.ts
@@ -3,6 +3,7 @@ import type { OpenClawConfig } from "../config/types.openclaw.js";
 import { testing as cliBackendsTesting } from "./cli-backends.js";
 import { createModelPickerVisibleProviderPredicate } from "./model-picker-visibility.js";
 import {
+  areRuntimeModelRefsEquivalent,
   isCliRuntimeProvider,
   resolveCliRuntimeExecutionProvider,
 } from "./model-runtime-aliases.js";
@@ -164,3 +165,24 @@ describe("resolveCliRuntimeExecutionProvider", () => {
     expect(isVisibleProvider("acme-cli")).toBe(true);
   });
 });
+
+describe("areRuntimeModelRefsEquivalent", () => {
+  afterEach(() => {
+    cliBackendsTesting.resetDepsForTest();
+  });
+
+  it("does not load setup runtime aliases for already-identical refs", () => {
+    cliBackendsTesting.setDepsForTest({
+      resolvePluginSetupRegistry: () => {
+        throw new Error("setup registry should not load for identical refs");
+      },
+      resolveRuntimeCliBackends: () => [],
+    });
+
+    expect(
+      areRuntimeModelRefsEquivalent("anthropic/claude", "anthropic/claude", {
+        config: {},
+      }),
+    ).toBe(true);
+  });
+});
diff --git a/src/agents/model-runtime-aliases.ts b/src/agents/model-runtime-aliases.ts
@@ -81,11 +81,26 @@ function normalizeRuntimeModelRefForComparison(
   return model ? `${canonicalProvider}/${model}` : canonicalProvider;
 }
 
+function normalizeRuntimeModelRefWithoutAlias(raw: string): string {
+  const trimmed = raw.trim();
+  const slash = trimmed.indexOf("/");
+  if (slash <= 0 || slash >= trimmed.length - 1) {
+    return normalizeProviderId(trimmed);
+  }
+  const provider = trimmed.slice(0, slash).trim();
+  const model = trimmed.slice(slash + 1).trim();
+  const normalizedProvider = normalizeProviderId(provider);
+  return model ? `${normalizedProvider}/${model}` : normalizedProvider;
+}
+
 export function areRuntimeModelRefsEquivalent(
   left: string,
   right: string,
   options: RuntimeAliasComparisonOptions = {},
 ): boolean {
+  if (normalizeRuntimeModelRefWithoutAlias(left) === normalizeRuntimeModelRefWithoutAlias(right)) {
+    return true;
+  }
   return (
     normalizeRuntimeModelRefForComparison(left, options) ===
     normalizeRuntimeModelRefForComparison(right, options)
diff --git a/src/auto-reply/reply/agent-runner.runreplyagent.e2e.test.ts b/src/auto-reply/reply/agent-runner.runreplyagent.e2e.test.ts
@@ -270,6 +270,16 @@ describe("runReplyAgent heartbeat followup guard", () => {
       runOverrides: { sessionId: "stale-session" },
       sessionStore,
     });
+    state.runEmbeddedAgentMock.mockResolvedValueOnce({
+      payloads: [{ text: "final" }],
+      meta: {
+        agentMeta: {
+          provider: "anthropic",
+          model: "claude",
+          usage: { input: 1, output: 1 },
+        },
+      },
+    });
 
     const pending = run();
     await new Promise<void>((resolve) => setTimeout(resolve, 0));
