Skip to content

Commit 92d1f04

Browse files
vincentkocvincentkoc
committed
refactor(agents): drop duplicate internal aliases
1 parent 611ad1a commit 92d1f04

12 files changed

Lines changed: 23 additions & 37 deletions

‎src/agents/auth-profiles.external-cli-sync.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const mocks = vi.hoisted(() => ({
1515
readMiniMaxCliCredentialsCached: vi.fn<(options?: unknown) => OAuthCredential | null>(() => null),
1616
}));
1717

18-
let readManagedExternalCliCredential: typeof import("./auth-profiles/external-cli-sync.js").readManagedExternalCliCredential;
18+
let readExternalCliBootstrapCredential: typeof import("./auth-profiles/external-cli-sync.js").readExternalCliBootstrapCredential;
1919
let resolveExternalCliAuthProfiles: typeof import("./auth-profiles/external-cli-sync.js").resolveExternalCliAuthProfiles;
2020
let hasUsableOAuthCredential: typeof import("./auth-profiles/external-cli-sync.js").hasUsableOAuthCredential;
2121
let isSafeToUseExternalCliCredential: typeof import("./auth-profiles/external-cli-sync.js").isSafeToUseExternalCliCredential;
@@ -121,7 +121,7 @@ describe("external cli oauth resolution", () => {
121121
({
122122
hasUsableOAuthCredential,
123123
isSafeToUseExternalCliCredential,
124-
readManagedExternalCliCredential,
124+
readExternalCliBootstrapCredential,
125125
resolveExternalCliAuthProfiles,
126126
shouldBootstrapFromExternalCliCredential,
127127
shouldReplaceStoredOAuthCredential,
@@ -299,7 +299,7 @@ describe("external cli oauth resolution", () => {
299299
}),
300300
);
301301

302-
const credential = readManagedExternalCliCredential({
302+
const credential = readExternalCliBootstrapCredential({
303303
profileId: OPENAI_CODEX_DEFAULT_PROFILE_ID,
304304
credential: makeOAuthCredential({ provider: "openai" }),
305305
});
@@ -365,7 +365,7 @@ describe("external cli oauth resolution", () => {
365365
makeOAuthCredential({ provider: "openai" }),
366366
);
367367

368-
const credential = readManagedExternalCliCredential({
368+
const credential = readExternalCliBootstrapCredential({
369369
profileId: OPENAI_CODEX_DEFAULT_PROFILE_ID,
370370
credential: makeOAuthCredential({ provider: "anthropic" }),
371371
});

‎src/agents/auth-profiles/effective-oauth.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import { resolveEffectiveOAuthCredential } from "./effective-oauth.js";
88
import type { OAuthCredential } from "./types.js";
99

1010
const mocks = vi.hoisted(() => ({
11-
readManagedExternalCliCredential: vi.fn<() => OAuthCredential | null>(() => null),
11+
readExternalCliBootstrapCredential: vi.fn<() => OAuthCredential | null>(() => null),
1212
}));
1313

1414
vi.mock("./external-cli-sync.js", () => ({
15-
readManagedExternalCliCredential: mocks.readManagedExternalCliCredential,
15+
readExternalCliBootstrapCredential: mocks.readExternalCliBootstrapCredential,
1616
}));
1717

1818
function makeCredential(overrides: Partial<OAuthCredential> = {}): OAuthCredential {
@@ -28,7 +28,7 @@ function makeCredential(overrides: Partial<OAuthCredential> = {}): OAuthCredenti
2828

2929
describe("resolveEffectiveOAuthCredential", () => {
3030
beforeEach(() => {
31-
mocks.readManagedExternalCliCredential.mockReset().mockReturnValue(null);
31+
mocks.readExternalCliBootstrapCredential.mockReset().mockReturnValue(null);
3232
});
3333

3434
it("uses external cli oauth only when local credentials are unusable and safe to bootstrap", () => {
@@ -37,7 +37,7 @@ describe("resolveEffectiveOAuthCredential", () => {
3737
refresh: "fresh-cli-refresh-token",
3838
expires: Date.now() + 30 * 60_000,
3939
});
40-
mocks.readManagedExternalCliCredential.mockReturnValue(imported);
40+
mocks.readExternalCliBootstrapCredential.mockReturnValue(imported);
4141

4242
expect(
4343
resolveEffectiveOAuthCredential({
@@ -58,7 +58,7 @@ describe("resolveEffectiveOAuthCredential", () => {
5858
refresh: "healthy-local-refresh-token",
5959
expires: Date.now() + 30 * 60_000,
6060
});
61-
mocks.readManagedExternalCliCredential.mockReturnValue(imported);
61+
mocks.readExternalCliBootstrapCredential.mockReturnValue(imported);
6262

6363
expect(
6464
resolveEffectiveOAuthCredential({
@@ -75,7 +75,7 @@ describe("resolveEffectiveOAuthCredential", () => {
7575
expires: Date.now() + 30 * 60_000,
7676
accountId: "acct-external",
7777
});
78-
mocks.readManagedExternalCliCredential.mockReturnValue(imported);
78+
mocks.readExternalCliBootstrapCredential.mockReturnValue(imported);
7979

8080
expect(
8181
resolveEffectiveOAuthCredential({

‎src/agents/auth-profiles/effective-oauth.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Delegates to the managed OAuth selector while allowing external CLI
44
* bootstrap credentials to fill unusable local profile state.
55
*/
6-
import { readManagedExternalCliCredential } from "./external-cli-sync.js";
6+
import { readExternalCliBootstrapCredential } from "./external-cli-sync.js";
77
import { resolveEffectiveOAuthCredential as resolveManagedOAuthCredential } from "./oauth-manager.js";
88
import type { OAuthCredential } from "./types.js";
99

@@ -17,7 +17,7 @@ export function resolveEffectiveOAuthCredential(params: {
1717
profileId: params.profileId,
1818
credential: params.credential,
1919
readBootstrapCredential: ({ profileId, credential }) =>
20-
readManagedExternalCliCredential({
20+
readExternalCliBootstrapCredential({
2121
profileId,
2222
credential,
2323
allowKeychainPrompt: params.allowKeychainPrompt ?? false,

‎src/agents/auth-profiles/external-cli-sync.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,6 @@ export function readExternalCliBootstrapCredential(params: {
223223
);
224224
}
225225

226-
export const readManagedExternalCliCredential = readExternalCliBootstrapCredential;
227-
228226
/** Read a CLI credential as a fallback for refresh/runtime auth recovery. */
229227
export function readExternalCliFallbackCredential(params: {
230228
profileId: string;

‎src/agents/auth-profiles/external-oauth.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/**
22
* Tests runtime external OAuth overlays.
33
* Covers provider plugin profiles, external CLI scoped discovery, persistence
4-
* rules, and compatibility aliases.
4+
* rules, and external CLI bootstrap policy.
55
*/
66
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
77
import type { ProviderExternalAuthProfile } from "../../plugins/types.js";
88
import { testing, overlayExternalAuthProfiles } from "./external-auth.js";
9-
import { readManagedExternalCliCredential } from "./external-cli-sync.js";
9+
import { readExternalCliBootstrapCredential } from "./external-cli-sync.js";
1010
import type { AuthProfileStore, OAuthCredential } from "./types.js";
1111

1212
const resolveExternalAuthProfilesWithPluginsMock = vi.fn<
@@ -186,7 +186,7 @@ describe("auth external oauth helpers", () => {
186186
expect(overlaidProfile.access).toBe("fresh-cli-access-token");
187187
expect(overlaidProfile.refresh).toBe("fresh-cli-refresh-token");
188188
expect(overlaidProfile.accountId).toBe("acct-cli");
189-
const managedCredential = readManagedExternalCliCredential({
189+
const managedCredential = readExternalCliBootstrapCredential({
190190
profileId: "openai:default",
191191
credential: tokenlessCredential,
192192
});

‎src/agents/auth-profiles/oauth-common-mocks.test-support.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ vi.mock("./external-cli-sync.js", () => ({
4646
credential.expires - now > 5 * 60 * 1000,
4747
isSafeToUseExternalCliCredential: () => true,
4848
readExternalCliBootstrapCredential: () => null,
49-
readManagedExternalCliCredential: () => null,
5049
resolveExternalCliAuthProfiles: () => [],
5150
shouldBootstrapFromExternalCliCredential: () => false,
5251
shouldReplaceStoredOAuthCredential: (existing: unknown, incoming: unknown) =>

‎src/agents/auth-profiles/oauth.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import { log } from "./constants.js";
2626
import { resolveTokenExpiryState } from "./credential-state.js";
2727
import { formatAuthDoctorHint } from "./doctor.js";
2828
import {
29+
readExternalCliBootstrapCredential,
2930
readExternalCliFallbackCredential,
30-
readManagedExternalCliCredential,
3131
} from "./external-cli-sync.js";
3232
import { createOAuthManager, OAuthManagerRefreshError } from "./oauth-manager.js";
3333
import { OAuthRefreshFailureError } from "./oauth-refresh-failure.js";
@@ -232,7 +232,7 @@ const oauthManager = createOAuthManager({
232232
buildApiKey: buildOAuthApiKey,
233233
refreshCredential: refreshOAuthCredential,
234234
readBootstrapCredential: ({ profileId, credential }) =>
235-
readManagedExternalCliCredential({
235+
readExternalCliBootstrapCredential({
236236
profileId,
237237
credential,
238238
}),

‎src/agents/cli-runner.spawn.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import {
5050
executePreparedCliRun,
5151
setCliRunnerExecuteTestDeps,
5252
} from "./cli-runner/execute.js";
53-
import { buildSystemPrompt, writeCliSystemPromptFile } from "./cli-runner/helpers.js";
53+
import { buildCliAgentSystemPrompt, writeCliSystemPromptFile } from "./cli-runner/helpers.js";
5454
import { cliBackendLog, formatCliBackendOutputDigest } from "./cli-runner/log.js";
5555
import { setCliRunnerPrepareTestDeps } from "./cli-runner/prepare.js";
5656
import type { PreparedCliRunContext } from "./cli-runner/types.js";
@@ -391,7 +391,7 @@ describe("runCliAgent spawn path", () => {
391391
});
392392

393393
it("includes the OpenClaw skills prompt in CLI system prompts", () => {
394-
const systemPrompt = buildSystemPrompt({
394+
const systemPrompt = buildCliAgentSystemPrompt({
395395
workspaceDir: "/tmp",
396396
modelDisplay: "claude-cli/sonnet",
397397
tools: [],
@@ -3710,7 +3710,7 @@ ${JSON.stringify({
37103710
const { contextFiles } = await realResolveBootstrapContextForRun({
37113711
workspaceDir,
37123712
});
3713-
const allArgs = buildSystemPrompt({
3713+
const allArgs = buildCliAgentSystemPrompt({
37143714
workspaceDir,
37153715
modelDisplay: "claude-cli/sonnet",
37163716
contextFiles,

‎src/agents/cli-runner/helpers.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,6 @@ export function buildCliAgentSystemPrompt(params: {
197197
});
198198
}
199199

200-
/** Alternate export name for the CLI system prompt builder. */
201-
export const buildSystemPrompt = buildCliAgentSystemPrompt;
202-
203200
/** Applies backend model aliases to a requested CLI model id. */
204201
export function normalizeCliModel(modelId: string, backend: CliBackendConfig): string {
205202
const trimmed = modelId.trim();

‎src/commands/migrate.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ vi.mock("@clack/prompts", () => ({
5656
}));
5757

5858
vi.mock("./migrate/skill-selection-prompt.js", () => ({
59-
promptMigrationSelectionValues: mocks.multiselect,
6059
promptMigrationSkillSelectionValues: mocks.multiselect,
6160
}));
6261

0 commit comments

Comments
 (0)