Skip to content

Commit 9fa685e

Browse files
vincentkocvincentkoc
committed
test(live): scope provider auth discovery
1 parent 678323d commit 9fa685e

3 files changed

Lines changed: 98 additions & 4 deletions

File tree

‎src/agents/models.profiles.live.test.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { getRuntimeConfig } from "../config/config.js";
55
import { parseLiveCsvFilter } from "../media-generation/live-test-helpers.js";
66
import { runTasksWithConcurrency } from "../utils/run-with-concurrency.js";
77
import { resolveOpenClawAgentDir } from "./agent-paths.js";
8+
import { externalCliDiscoveryForProviders } from "./auth-profiles/external-cli-discovery.js";
89
import {
910
collectAnthropicApiKeys,
1011
isAnthropicBillingError,
@@ -730,8 +731,13 @@ describeLive("live models (profile keys)", () => {
730731
logProgress(`[live-models] anthropic keys loaded: ${anthropicKeys.length}`);
731732
}
732733

734+
const providers = parseProviderFilter(process.env.OPENCLAW_LIVE_PROVIDERS);
733735
const agentDir = resolveOpenClawAgentDir();
734-
const authStorage = discoverAuthStorage(agentDir);
736+
const authStorage = discoverAuthStorage(agentDir, {
737+
config: cfg,
738+
env: process.env,
739+
...(providers ? { externalCli: externalCliDiscoveryForProviders({ cfg, providers }) } : {}),
740+
});
735741
logProgress("[live-models] loading model registry");
736742
const models = await withLiveStageTimeout(
737743
Promise.resolve().then(() => discoverModels(authStorage, agentDir).getAll()),
@@ -743,7 +749,6 @@ describeLive("live models (profile keys)", () => {
743749
const useExplicit = Boolean(rawModels) && !useModern;
744750
const filter = useExplicit ? parseModelFilter(rawModels) : null;
745751
const allowNotFoundSkip = useModern;
746-
const providers = parseProviderFilter(process.env.OPENCLAW_LIVE_PROVIDERS);
747752
const perModelTimeoutMs = toInt(process.env.OPENCLAW_LIVE_MODEL_TIMEOUT_MS, 30_000);
748753
const maxModels = resolveHighSignalLiveModelLimit({
749754
rawMaxModels: process.env.OPENCLAW_LIVE_MAX_MODELS,

‎src/agents/pi-auth-discovery.external-cli.test.ts‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
import { describe, expect, it, vi } from "vitest";
2+
import type { OpenClawConfig } from "../config/types.openclaw.js";
3+
4+
const storeMocks = vi.hoisted(() => ({
5+
ensureAuthProfileStore: vi.fn(() => ({ version: 1, profiles: {} })),
6+
loadAuthProfileStoreForRuntime: vi.fn(() => ({ version: 1, profiles: {} })),
7+
loadAuthProfileStoreForSecretsRuntime: vi.fn(() => ({ version: 1, profiles: {} })),
8+
}));
9+
10+
const credentialMocks = vi.hoisted(() => ({
11+
resolvePiCredentialMapFromStore: vi.fn(() => ({})),
12+
}));
13+
14+
const discoveryCoreMocks = vi.hoisted(() => ({
15+
addEnvBackedPiCredentials: vi.fn((credentials: unknown) => credentials),
16+
scrubLegacyStaticAuthJsonEntriesForDiscovery: vi.fn(),
17+
}));
18+
19+
vi.mock("./auth-profiles/store.js", () => storeMocks);
20+
21+
vi.mock("./pi-auth-credentials.js", () => credentialMocks);
22+
23+
vi.mock("./pi-auth-discovery-core.js", () => discoveryCoreMocks);
24+
25+
vi.mock("./synthetic-auth.runtime.js", () => ({
26+
resolveRuntimeSyntheticAuthProviderRefs: () => [],
27+
}));
28+
29+
vi.mock("../plugins/provider-runtime.js", () => ({
30+
resolveProviderSyntheticAuthWithPlugin: vi.fn(),
31+
}));
32+
33+
import { externalCliDiscoveryForProviders } from "./auth-profiles/external-cli-discovery.js";
34+
import { resolvePiCredentialsForDiscovery } from "./pi-auth-discovery.js";
35+
36+
describe("resolvePiCredentialsForDiscovery external CLI scoping", () => {
37+
it("threads scoped external CLI discovery into writable auth store loading", () => {
38+
const cfg = {} as OpenClawConfig;
39+
const externalCli = externalCliDiscoveryForProviders({
40+
cfg,
41+
providers: ["fireworks"],
42+
});
43+
44+
resolvePiCredentialsForDiscovery("/tmp/openclaw-agent", {
45+
config: cfg,
46+
env: {},
47+
externalCli,
48+
});
49+
50+
expect(storeMocks.ensureAuthProfileStore).toHaveBeenCalledWith("/tmp/openclaw-agent", {
51+
allowKeychainPrompt: false,
52+
config: cfg,
53+
externalCli,
54+
});
55+
expect(storeMocks.loadAuthProfileStoreForRuntime).not.toHaveBeenCalled();
56+
});
57+
58+
it("preserves scoped external CLI discovery for read-only auth store loading", () => {
59+
const cfg = {} as OpenClawConfig;
60+
const externalCli = externalCliDiscoveryForProviders({
61+
cfg,
62+
providers: ["fireworks"],
63+
});
64+
65+
resolvePiCredentialsForDiscovery("/tmp/openclaw-agent", {
66+
config: cfg,
67+
env: {},
68+
externalCli,
69+
readOnly: true,
70+
});
71+
72+
expect(storeMocks.loadAuthProfileStoreForRuntime).toHaveBeenCalledWith("/tmp/openclaw-agent", {
73+
allowKeychainPrompt: false,
74+
config: cfg,
75+
externalCli,
76+
readOnly: true,
77+
});
78+
});
79+
});

‎src/agents/pi-auth-discovery.ts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { resolveProviderSyntheticAuthWithPlugin } from "../plugins/provider-runtime.js";
22
import { resolveRuntimeSyntheticAuthProviderRefs } from "../plugins/synthetic-auth.runtime.js";
3+
import type { ExternalCliAuthDiscovery } from "./auth-profiles/external-cli-discovery.js";
34
import {
45
ensureAuthProfileStore,
6+
loadAuthProfileStoreForRuntime,
57
loadAuthProfileStoreForSecretsRuntime,
68
} from "./auth-profiles/store.js";
79
import { resolvePiCredentialMapFromStore, type PiCredentialMap } from "./pi-auth-credentials.js";
@@ -11,6 +13,7 @@ import {
1113
} from "./pi-auth-discovery-core.js";
1214

1315
export type DiscoverAuthStorageOptions = {
16+
externalCli?: ExternalCliAuthDiscovery;
1417
readOnly?: boolean;
1518
skipCredentials?: boolean;
1619
} & PiDiscoveryAuthLookupOptions;
@@ -19,10 +22,17 @@ export function resolvePiCredentialsForDiscovery(
1922
agentDir: string,
2023
options?: DiscoverAuthStorageOptions,
2124
): PiCredentialMap {
25+
const storeOptions = {
26+
allowKeychainPrompt: false,
27+
...(options?.config ? { config: options.config } : {}),
28+
...(options?.externalCli ? { externalCli: options.externalCli } : {}),
29+
};
2230
const store =
2331
options?.readOnly === true
24-
? loadAuthProfileStoreForSecretsRuntime(agentDir)
25-
: ensureAuthProfileStore(agentDir, { allowKeychainPrompt: false });
32+
? options.externalCli || options.config
33+
? loadAuthProfileStoreForRuntime(agentDir, { readOnly: true, ...storeOptions })
34+
: loadAuthProfileStoreForSecretsRuntime(agentDir)
35+
: ensureAuthProfileStore(agentDir, storeOptions);
2636
const credentials = addEnvBackedPiCredentials(resolvePiCredentialMapFromStore(store), {
2737
config: options?.config,
2838
workspaceDir: options?.workspaceDir,

0 commit comments

Comments
 (0)