Merge branch 'feat/console-gateway-region-site' of github.com:modelstudioai/cli into feat/console-gateway-region-site

Author: lishengzxc

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

@@ -19,25 +19,21 @@ export default defineCommand({
     const format = detectOutputFormat(config.output);
 
     const result: Record<string, unknown> = {
-      region: config.region,
+      ...file,
       base_url: config.baseUrl,
       output: config.output,
       timeout: config.timeout,
       config_file: getConfigPath(),
     };
 
-    // Mask API key if present
-    if (file.api_key) {
-      result.api_key = maskToken(file.api_key);
+    if (typeof result.api_key === "string") result.api_key = maskToken(result.api_key);
+    if (typeof result.access_token === "string")
+      result.access_token = maskToken(result.access_token);
+    if (typeof result.access_key_id === "string")
+      result.access_key_id = maskToken(result.access_key_id);
+    if (typeof result.access_key_secret === "string") {
+      result.access_key_secret = maskToken(result.access_key_secret);
     }
-    if (file.access_token) {
-      result.access_token = maskToken(file.access_token);
-    }
-
-    // Default models
-    if (file.default_text_model) result.default_text_model = file.default_text_model;
-    if (file.default_video_model) result.default_video_model = file.default_video_model;
-    if (file.default_image_model) result.default_image_model = file.default_image_model;
 
     emitResult(result, format);
   },

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

@@ -5,7 +5,6 @@ const reset = "\x1b[0m";
 const dim = "\x1b[2m";
 const bold = "\x1b[1m";
 const mmBlue = "\x1b[38;2;43;82;255m";
-const mmCyan = "\x1b[38;2;6;184;212m";
 const mmPink = "\x1b[38;2;236;72;153m";
 
 function tildePath(p: string): string {
@@ -20,7 +19,6 @@ export function maybeShowStatusBar(
   if (config.quiet || !process.stderr.isTTY) return;
 
   const filePath = config.configPath ? tildePath(config.configPath) : "~/.bailian/config.json";
-  const regionSrc = config.fileRegion ? `${config.fileRegion} (file)` : "cn (default)";
   const authTag = resolved
     ? `${resolved.source} · ${resolved.method}`
     : config.apiKey
@@ -32,8 +30,6 @@ export function maybeShowStatusBar(
     `${bold}${mmBlue}BAILIAN${reset} ` +
       `${dim}${filePath}${reset} ` +
       `${dim}|${reset} ` +
-      `${dim}Region:${reset} ${mmCyan}${regionSrc}${reset} ` +
-      `${dim}|${reset} ` +
       `${dim}Auth:${reset} ${mmPink}${maskedKey}${reset} ${dim}${authTag}${reset}\n`,
   );
 }

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

@@ -41,12 +41,10 @@ describe("e2e: config", () => {
     ]);
     expect(exitCode, stderr).toBe(0);
     const data = parseStdoutJson<{
-      region?: string;
       config_file?: string;
       base_url?: string;
       timeout?: number;
     }>(stdout);
-    expect(data.region).toBeDefined();
     expect(data.config_file).toBeDefined();
     expect(data.base_url).toBeDefined();
     expect(data.timeout).toBeDefined();
@@ -62,7 +60,7 @@ describe("e2e: config", () => {
       "--no-color",
     ]);
     expect(exitCode, stderr).toBe(0);
-    expect(stdout).toMatch(/region|config_file|timeout|base_url/i);
+    expect(stdout).toMatch(/config_file|timeout|base_url/i);
   });
 
   test("config set 缺少 --key / --value 时退出为用法错误 (2)", async () => {
@@ -85,20 +83,6 @@ describe("e2e: config", () => {
     expect(stderr).toMatch(/Invalid config key|not-a-real-key/i);
   });
 
-  test("config set 非法 region", async () => {
-    const { stderr, exitCode } = await runCli([
-      "config",
-      "set",
-      "--non-interactive",
-      "--key",
-      "region",
-      "--value",
-      "invalid-region",
-    ]);
-    expect(exitCode).toBe(2);
-    expect(stderr).toMatch(/Invalid region|cn, us, intl/i);
-  });
-
   test("config set 非法 output", async () => {
     const { stderr, exitCode } = await runCli([
       "config",

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

@@ -79,7 +79,6 @@ describe("e2e: mcp", () => {
       };
     }>(stdout);
     expect(data.api).toBe("zeldaEasy.broadscope-bailian.mcp-server.PageList");
-    expect(data.region).toBe("cn-beijing");
     expect(data.data?.reqDTO?.activated).toBe(1);
     expect(data.data?.reqDTO?.displayTools).toBe(false);
     expect(data.data?.reqDTO?.type).toBe("OFFICIAL");