Skip to content

Commit ce64d62

Browse files
committed
feat: The command "config show" does not display the "region" field, but displays all fields in the "config.json" file
1 parent e5abd1b commit ce64d62

4 files changed

Lines changed: 13 additions & 33 deletions

File tree

packages/cli/src/commands/config/show.ts

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,21 @@ export default defineCommand({
1919
const format = detectOutputFormat(config.output);
2020

2121
const result: Record<string, unknown> = {
22-
region: config.region,
22+
...file,
2323
base_url: config.baseUrl,
2424
output: config.output,
2525
timeout: config.timeout,
2626
config_file: getConfigPath(),
2727
};
2828

29-
// Mask API key if present
30-
if (file.api_key) {
31-
result.api_key = maskToken(file.api_key);
29+
if (typeof result.api_key === "string") result.api_key = maskToken(result.api_key);
30+
if (typeof result.access_token === "string")
31+
result.access_token = maskToken(result.access_token);
32+
if (typeof result.access_key_id === "string")
33+
result.access_key_id = maskToken(result.access_key_id);
34+
if (typeof result.access_key_secret === "string") {
35+
result.access_key_secret = maskToken(result.access_key_secret);
3236
}
33-
if (file.access_token) {
34-
result.access_token = maskToken(file.access_token);
35-
}
36-
37-
// Default models
38-
if (file.default_text_model) result.default_text_model = file.default_text_model;
39-
if (file.default_video_model) result.default_video_model = file.default_video_model;
40-
if (file.default_image_model) result.default_image_model = file.default_image_model;
4137

4238
emitResult(result, format);
4339
},

packages/cli/src/output/status-bar.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ const reset = "\x1b[0m";
55
const dim = "\x1b[2m";
66
const bold = "\x1b[1m";
77
const mmBlue = "\x1b[38;2;43;82;255m";
8-
const mmCyan = "\x1b[38;2;6;184;212m";
98
const mmPink = "\x1b[38;2;236;72;153m";
109

1110
function tildePath(p: string): string {
@@ -20,7 +19,6 @@ export function maybeShowStatusBar(
2019
if (config.quiet || !process.stderr.isTTY) return;
2120

2221
const filePath = config.configPath ? tildePath(config.configPath) : "~/.bailian/config.json";
23-
const regionSrc = config.fileRegion ? `${config.fileRegion} (file)` : "cn (default)";
2422
const authTag = resolved
2523
? `${resolved.source} · ${resolved.method}`
2624
: config.apiKey
@@ -32,8 +30,6 @@ export function maybeShowStatusBar(
3230
`${bold}${mmBlue}BAILIAN${reset} ` +
3331
`${dim}${filePath}${reset} ` +
3432
`${dim}|${reset} ` +
35-
`${dim}Region:${reset} ${mmCyan}${regionSrc}${reset} ` +
36-
`${dim}|${reset} ` +
3733
`${dim}Auth:${reset} ${mmPink}${maskedKey}${reset} ${dim}${authTag}${reset}\n`,
3834
);
3935
}

packages/cli/tests/e2e/config.e2e.test.ts

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,10 @@ describe("e2e: config", () => {
4141
]);
4242
expect(exitCode, stderr).toBe(0);
4343
const data = parseStdoutJson<{
44-
region?: string;
4544
config_file?: string;
4645
base_url?: string;
4746
timeout?: number;
4847
}>(stdout);
49-
expect(data.region).toBeDefined();
5048
expect(data.config_file).toBeDefined();
5149
expect(data.base_url).toBeDefined();
5250
expect(data.timeout).toBeDefined();
@@ -62,7 +60,7 @@ describe("e2e: config", () => {
6260
"--no-color",
6361
]);
6462
expect(exitCode, stderr).toBe(0);
65-
expect(stdout).toMatch(/region|config_file|timeout|base_url/i);
63+
expect(stdout).toMatch(/config_file|timeout|base_url/i);
6664
});
6765

6866
test("config set 缺少 --key / --value 时退出为用法错误 (2)", async () => {
@@ -85,20 +83,6 @@ describe("e2e: config", () => {
8583
expect(stderr).toMatch(/Invalid config key|not-a-real-key/i);
8684
});
8785

88-
test("config set 非法 region", async () => {
89-
const { stderr, exitCode } = await runCli([
90-
"config",
91-
"set",
92-
"--non-interactive",
93-
"--key",
94-
"region",
95-
"--value",
96-
"invalid-region",
97-
]);
98-
expect(exitCode).toBe(2);
99-
expect(stderr).toMatch(/Invalid region|cn, us, intl/i);
100-
});
101-
10286
test("config set 非法 output", async () => {
10387
const { stderr, exitCode } = await runCli([
10488
"config",

pnpm-lock.yaml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)