fix: fail closed for cli-backed btw fallback

joshavant · joshavant · commit db723d20c879 · 2026-06-12T09:43:50.000-05:00
diff --git a/src/agents/btw.test.ts b/src/agents/btw.test.ts
@@ -77,6 +77,8 @@ vi.mock("./model-auth.js", () => ({
 }));
 
 vi.mock("./model-runtime-aliases.js", () => ({
+  isCliRuntimeAliasForProvider: ({ runtime, provider }: { runtime?: string; provider?: string }) =>
+    runtime === "claude-cli" && provider === "anthropic",
   resolveCliRuntimeExecutionProvider: ({
     provider,
     cfg,
@@ -642,6 +644,29 @@ describe("runBtwSideQuestion", () => {
     expect(streamSimpleMock).toHaveBeenCalledTimes(1);
   });
 
+  it("fails closed instead of using direct provider auth for CLI-runtime alias models", async () => {
+    await expect(
+      runSideQuestion({
+        cfg: {
+          agents: {
+            defaults: {
+              models: {
+                "anthropic/claude-opus-4-7": { agentRuntime: { id: "claude-cli" } },
+              },
+            },
+          },
+        } as never,
+        model: "claude-opus-4-7",
+        sessionKey: DEFAULT_SESSION_KEY,
+      }),
+    ).rejects.toThrow(
+      "/btw is not yet supported for claude-cli-backed models. The selected model is routed through claude-cli; OpenClaw will not fall back to direct anthropic auth because that would use a different backend than the active session.",
+    );
+    expect(getApiKeyForModelMock).not.toHaveBeenCalled();
+    expect(streamSimpleMock).not.toHaveBeenCalled();
+    expect(registerProviderStreamForModelMock).not.toHaveBeenCalled();
+  });
+
   it("does not let an auto-selected stale Anthropic profile suppress Claude CLI auth for BTW", async () => {
     const claudeAuthStore = {
       version: 1 as const,
diff --git a/src/agents/btw.ts b/src/agents/btw.ts
@@ -27,7 +27,6 @@ import { EmbeddedBlockChunker, type BlockReplyChunking } from "./embedded-agent-
 import { resolveModelWithRegistry } from "./embedded-agent-runner/model.js";
 import { getActiveEmbeddedRunSnapshot } from "./embedded-agent-runner/runs.js";
 import { resolveEmbeddedAgentStreamFn } from "./embedded-agent-runner/stream-resolution.js";
-import { applyPreparedRuntimeAuthToModel } from "./provider-request-config.js";
 import { resolveAvailableAgentHarnessPolicy, selectAgentHarness } from "./harness/selection.js";
 import {
   resolveImageSanitizationLimits,
@@ -39,8 +38,10 @@ import {
   getApiKeyForModel,
   requireApiKey,
 } from "./model-auth.js";
+import { isCliRuntimeAliasForProvider } from "./model-runtime-aliases.js";
 import { ensureOpenClawModelsJson } from "./models-config.js";
 import { listOpenAIAuthProfileProvidersForAgentRuntime } from "./openai-routing.js";
+import { applyPreparedRuntimeAuthToModel } from "./provider-request-config.js";
 import { registerProviderStreamForModel } from "./provider-stream.js";
 import { stripToolResultDetails } from "./session-transcript-repair.js";
 import { sanitizeImageBlocks } from "./tool-images.js";
@@ -379,6 +380,26 @@ export async function runBtwSideQuestion(
   if (harness.id === "codex") {
     throw new Error(`Selected agent harness "${harness.id}" does not support /btw side questions.`);
   }
+  const fallbackPolicy = resolveAvailableAgentHarnessPolicy({
+    provider: params.provider,
+    modelId: params.model,
+    config: params.cfg,
+    agentId: sessionAgentId,
+    sessionKey: params.sessionKey,
+  });
+  const fallbackRuntime = fallbackPolicy.runtime.trim();
+  if (
+    isCliRuntimeAliasForProvider({
+      runtime: fallbackRuntime,
+      provider: params.provider,
+      cfg: params.cfg,
+    })
+  ) {
+    throw new Error(
+      `/btw is not yet supported for ${fallbackRuntime}-backed models. ` +
+        `The selected model is routed through ${fallbackRuntime}; OpenClaw will not fall back to direct ${params.provider} auth because that would use a different backend than the active session.`,
+    );
+  }
 
   const activeRunSnapshot = getActiveEmbeddedRunSnapshot(sessionId);
   const imageLimits = resolveImageSanitizationLimits(params.cfg);
