From 544b00e4e15f9be10f7bcad59098fa90701e8cc0 Mon Sep 17 00:00:00 2001 From: Vincent Koc Date: Thu, 18 Jun 2026 09:37:25 +0800 Subject: [PATCH] refactor(plugins): remove setup browser facade --- src/commands/auth-choice.apply.plugin-provider.test.ts | 7 +++++-- src/commands/auth-choice.test.ts | 7 +++++-- src/plugins/provider-auth-choice.ts | 3 ++- src/plugins/setup-browser.ts | 4 ---- 4 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 src/plugins/setup-browser.ts diff --git a/src/commands/auth-choice.apply.plugin-provider.test.ts b/src/commands/auth-choice.apply.plugin-provider.test.ts index ae37d83ad06a..258bf8b9c14c 100644 --- a/src/commands/auth-choice.apply.plugin-provider.test.ts +++ b/src/commands/auth-choice.apply.plugin-provider.test.ts @@ -69,11 +69,14 @@ vi.mock("../plugins/provider-auth-helpers.js", () => ({ const isRemoteEnvironment = vi.hoisted(() => vi.fn(() => false)); const openUrl = vi.hoisted(() => vi.fn(async () => {})); -vi.mock("../plugins/setup-browser.js", () => ({ - isRemoteEnvironment, +vi.mock("../infra/browser-open.js", () => ({ openUrl, })); +vi.mock("../infra/remote-env.js", () => ({ + isRemoteEnvironment, +})); + const createVpsAwareOAuthHandlers = vi.hoisted(() => vi.fn()); vi.mock("../plugins/provider-oauth-flow.js", () => ({ createVpsAwareOAuthHandlers, diff --git a/src/commands/auth-choice.test.ts b/src/commands/auth-choice.test.ts index b6d5a53726c1..175ce3b1fe5d 100644 --- a/src/commands/auth-choice.test.ts +++ b/src/commands/auth-choice.test.ts @@ -95,11 +95,14 @@ vi.mock("../agents/workspace.js", () => ({ resolveDefaultAgentWorkspaceDir: () => "/tmp/openclaw-workspace", })); -vi.mock("../plugins/setup-browser.js", () => ({ - isRemoteEnvironment: () => false, +vi.mock("../infra/browser-open.js", () => ({ openUrl: vi.fn(async () => {}), })); +vi.mock("../infra/remote-env.js", () => ({ + isRemoteEnvironment: () => false, +})); + vi.mock("../plugins/provider-oauth-flow.js", () => ({ createVpsAwareOAuthHandlers: vi.fn(), })); diff --git a/src/plugins/provider-auth-choice.ts b/src/plugins/provider-auth-choice.ts index d7f3c1a04187..78d501af876b 100644 --- a/src/plugins/provider-auth-choice.ts +++ b/src/plugins/provider-auth-choice.ts @@ -10,6 +10,8 @@ import { formatLiteralProviderPrefixedModelRef } from "../agents/model-ref-share import { resolveDefaultAgentWorkspaceDir } from "../agents/workspace.js"; import { normalizeAgentModelRefForConfig } from "../config/model-input.js"; import type { OpenClawConfig } from "../config/types.openclaw.js"; +import { openUrl } from "../infra/browser-open.js"; +import { isRemoteEnvironment } from "../infra/remote-env.js"; import type { RuntimeEnv } from "../runtime.js"; import { t } from "../wizard/i18n/index.js"; import type { WizardPrompter } from "../wizard/prompts.js"; @@ -27,7 +29,6 @@ import { import { applyAuthProfileConfig } from "./provider-auth-helpers.js"; import { resolveProviderInstallCatalogEntry } from "./provider-install-catalog.js"; import { createVpsAwareOAuthHandlers } from "./provider-oauth-flow.js"; -import { isRemoteEnvironment, openUrl } from "./setup-browser.js"; import type { ProviderAuthMethod, ProviderAuthOptionBag, ProviderPlugin } from "./types.js"; type UpsertAuthProfileParams = Parameters[0]; diff --git a/src/plugins/setup-browser.ts b/src/plugins/setup-browser.ts deleted file mode 100644 index 365eac8a4ec5..000000000000 --- a/src/plugins/setup-browser.ts +++ /dev/null @@ -1,4 +0,0 @@ -/** Opens URLs for plugin setup flows. */ -export { openUrl } from "../infra/browser-open.js"; -/** Detects whether plugin setup is running in a remote/VPS environment. */ -export { isRemoteEnvironment } from "../infra/remote-env.js";