Skip to content

Commit 1d589c5

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/cma
2 parents 9cad199 + fac2b2d commit 1d589c5

12 files changed

Lines changed: 143 additions & 42 deletions

File tree

AGENTS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ Skill / 命令手册随 `skills/bailian-cli/` 经 `npx skills add modelstudioai/
6868
| 鉴权扩展 | 加 OAuth / SSO / 换 token 来源 | [docs/agents/auth-change.md](docs/agents/auth-change.md) |
6969
| 配置项扩展 | 新 env var 或 `~/.bailian/config.json` 字段 | [docs/agents/config-add.md](docs/agents/config-add.md) |
7070
| Profile / 激活 | 改命名 Profile、预设或 `active_config` | [docs/agents/config-profile-change.md](docs/agents/config-profile-change.md) |
71+
| 安装文档 | 改安装、鉴权、验证流程或线上 install 页面 | [docs/agents/install-doc-change.md](docs/agents/install-doc-change.md) |
7172
| 发布 | channel / stable 发布到 npm(CI 驱动) | [docs/agents/publish.md](docs/agents/publish.md) |
7273
| Change Log | 发版说明 / 历史版本说明 | [docs/agents/changelog-write.md](docs/agents/changelog-write.md) |
7374
| 工具链调整 | lint 规则 / 构建配置 / 依赖升级 | [docs/agents/lint-toolchain.md](docs/agents/lint-toolchain.md) |

INSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ npx skills add modelstudioai/cli --all -g
9898
### Agent 安全约束
9999

100100
- **禁止**把真实 API Key 写入仓库、日志、Skill、聊天记录的可公开部分。
101-
- CI / 非交互环境:使用 `bl ... --non-interactive`通过密钥管理或环境变量注入,勿在脚本中硬编码 Key。
101+
- CI / 非交互环境:显式传入必填参数并使用 `--output json` 获取机器可读结果;如需纯文本输出,设置 `NO_COLOR=1`通过密钥管理或环境变量注入,勿在脚本中硬编码 Key。
102102

103103
---
104104

docs/agents/auth-change.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ defineCommand({ auth }) → runtime/authStage → ctx.client → command.run(ctx
4343
解析分工:
4444

4545
- `resolveApiKey()``auth: "apiKey"` 命令;优先级 `--api-key` > `DASHSCOPE_API_KEY` > config `api_key`
46-
- `resolveModelBaseUrl()` — model base URL;优先级 `--base-url` > `DASHSCOPE_BASE_URL` > config `base_url` > `REGIONS.cn`返回前统一去除 query、fragment、尾斜杠和已知 SDK/API Base 后缀,同时保留自定义网关前缀
46+
- `resolveModelBaseUrl()` — model base URL;优先级 `--base-url` > `DASHSCOPE_BASE_URL` > config `base_url` > `REGIONS.cn`返回前统一归一化为 URL origin(仅保留协议、host 和显式端口,去除 path、query、fragment)
4747
- `--config` 只选择 config 文件 block,不提升该 block 的字段优先级;内置套餐 Profile(当前为 `token-plan`)的预设仅在登录时物化写入,运行时继续走统一的 flag > env > selected config file > 默认值
4848
- 显式 `auth login --config <name>` 在凭证验证并落盘成功后自动激活目标 Profile;未传
4949
`--config` 时继续写当前激活项,失败和 dry-run 不切换

docs/agents/install-doc-change.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# 安装文档变更
2+
3+
## 触发条件
4+
5+
- 修改根目录 `INSTALL.md` 的安装、鉴权或验证流程
6+
- 修改发布包 Node.js 要求、全局 flag 或安装文档引用的命令
7+
- 同步或发布 `https://bailian.aliyun.com/cli/install.md`
8+
9+
## 必查清单
10+
11+
### A. CLI 契约
12+
13+
- [ ] `INSTALL.md` 中的 `bl` 命令路径存在于 `packages/cli/src/commands.ts`
14+
- [ ] 示例 flag 属于 `GLOBAL_FLAGS`、命令鉴权域 flag 或命令自身 `flags`
15+
- [ ] Node.js 用户安装要求与 `packages/cli/package.json``engines.node` 一致,不使用根 `package.json` 的开发环境要求
16+
- [ ] 鉴权流程与 `packages/commands/src/commands/auth/` 的实际校验、保存和 Profile 激活行为一致
17+
18+
### B. 静态副本
19+
20+
- [ ]`INSTALL.md` 同步到 `bailian-cli-static-resources/public/install.txt`
21+
- [ ] 使用 `cmp -s` 确认两份文档逐字节一致
22+
- [ ] 静态资源仓库单独创建分支、提交和发布,不把跨仓库改动遗漏在 CLI PR 之外
23+
24+
### C. 线上验证
25+
26+
- [ ] 发布后读取 `https://bailian.aliyun.com/cli/install.md`,确认内容来自最新静态副本
27+
- [ ] 带随机 query 参数复查,区分 CDN 缓存与源站未更新
28+
- [ ] 验证线上文档中的安装命令、Node.js 要求和配置验证段落,不只检查页面可访问
29+
30+
## 完成后自查
31+
32+
```sh
33+
pnpm -F bailian-cli test -- tests/install-doc.test.ts
34+
cmp -s INSTALL.md ../bailian-cli-static-resources/public/install.txt
35+
curl -L -s "https://bailian.aliyun.com/cli/install.md?verify=$(date +%s)"
36+
```
37+
38+
## 常见漏点
39+
40+
- `--non-interactive` 已从 CLI 移除,但旧安装文档和静态副本仍把它当作全局 flag
41+
-`package.json` 是开发工具链 Node.js 要求;用户安装要求以 `packages/cli/package.json` 为准
42+
- 静态仓库文件名是 `public/install.txt`,线上稳定地址是 `/cli/install.md`;只更新其中一侧不会自动证明发布成功
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
import { readFileSync } from "node:fs";
2+
import { join } from "node:path";
3+
import { credentialFlagDefs, GLOBAL_FLAGS, type AnyCommand } from "bailian-cli-core";
4+
import { monorepoRoot } from "e2e/monorepo-root";
5+
import { describe, expect, test } from "vite-plus/test";
6+
import { commands } from "../src/commands.ts";
7+
8+
const repositoryRoot = monorepoRoot();
9+
const installGuide = readFileSync(join(repositoryRoot, "INSTALL.md"), "utf8");
10+
const cliPackage = JSON.parse(
11+
readFileSync(join(repositoryRoot, "packages/cli/package.json"), "utf8"),
12+
) as {
13+
engines?: { node?: string };
14+
};
15+
16+
function toFlagName(key: string): string {
17+
return `--${key.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`)}`;
18+
}
19+
20+
function findDocumentedCommand(snippet: string): {
21+
commandPath?: string;
22+
command?: AnyCommand;
23+
} {
24+
const argumentText = snippet.slice("bl ".length).trim();
25+
const commandPath = Object.keys(commands)
26+
.sort((leftPath, rightPath) => rightPath.length - leftPath.length)
27+
.find((candidatePath) => {
28+
return argumentText === candidatePath || argumentText.startsWith(`${candidatePath} `);
29+
});
30+
31+
return commandPath ? { commandPath, command: commands[commandPath] } : {};
32+
}
33+
34+
function documentedCommandSnippets(): string[] {
35+
const fencedCommands = installGuide
36+
.split("\n")
37+
.map((line) => line.trim())
38+
.filter((line) => line.startsWith("bl "));
39+
const inlineCommands = Array.from(installGuide.matchAll(/`(bl [^`\n]+)`/g), (match) => match[1]);
40+
return [...new Set([...fencedCommands, ...inlineCommands])];
41+
}
42+
43+
describe("INSTALL.md", () => {
44+
test("发布包 Node.js 要求与安装文档一致", () => {
45+
const nodeEngine = cliPackage.engines?.node;
46+
expect(nodeEngine).toMatch(/^>=\d+\.\d+\.\d+$/);
47+
expect(installGuide).toContain(`要求 **≥ ${nodeEngine?.slice(2)}**`);
48+
});
49+
50+
test("示例只使用当前命令支持的 flags", () => {
51+
for (const snippet of documentedCommandSnippets()) {
52+
const { commandPath, command } = findDocumentedCommand(snippet);
53+
const argumentText = snippet.slice("bl ".length).trim();
54+
55+
if (!commandPath || !command) {
56+
expect(argumentText, `INSTALL.md 中存在未知命令:${snippet}`).toMatch(/^--/);
57+
}
58+
59+
const supportedFlags = {
60+
...GLOBAL_FLAGS,
61+
...(command ? credentialFlagDefs(command) : {}),
62+
...command?.flags,
63+
};
64+
const supportedFlagNames = new Set(Object.keys(supportedFlags).map(toFlagName));
65+
const usedFlagNames = Array.from(snippet.matchAll(/--[a-z0-9-]+/g), (match) => match[0]);
66+
const unsupportedFlagNames = usedFlagNames.filter(
67+
(flagName) => !supportedFlagNames.has(flagName),
68+
);
69+
70+
expect(unsupportedFlagNames, `INSTALL.md 命令使用了未声明的 flag:${snippet}`).toEqual([]);
71+
}
72+
});
73+
});

packages/commands/tests/config-ui.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ test("POST /api/profile 写命名 profile(timeout 强制为 number),空串
114114
expect(readConfigFile("stage")).toMatchObject({
115115
api_key: "sk-stage",
116116
timeout: 90,
117-
base_url: "https://proxy.example.com/team",
117+
base_url: "https://proxy.example.com",
118118
});
119119
const rawConfig = JSON.parse(readFileSync(getConfigPath(), "utf8"));
120-
expect(rawConfig.stage.base_url).toBe("https://proxy.example.com/team");
120+
expect(rawConfig.stage.base_url).toBe("https://proxy.example.com");
121121

122122
// 空串清除 api_key(整块替换)
123123
const clear = await httpJson(port, "POST", `/api/profile?token=${TOKEN}`, {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,10 @@ describe("e2e: config", () => {
247247
);
248248
expect(setResult.exitCode, setResult.stderr).toBe(0);
249249
expect(parseStdoutJson<{ base_url?: string }>(setResult.stdout).base_url).toBe(
250-
"https://proxy.example.com/bailian",
250+
"https://proxy.example.com",
251251
);
252252
expect(JSON.parse(readFileSync(join(configDir, "config.json"), "utf8")).base_url).toBe(
253-
"https://proxy.example.com/bailian",
253+
"https://proxy.example.com",
254254
);
255255

256256
const invalidResult = await runCommandE2e(

packages/core/src/config/model-base-url.ts

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import { BailianError } from "../errors/base.ts";
22
import { ExitCode } from "../errors/codes.ts";
33

4-
const KNOWN_API_BASE_SUFFIXES = ["/compatible-mode/v1", "/apps/anthropic"] as const;
5-
64
/**
7-
* Normalize a model-service base URL while preserving custom gateway prefixes.
8-
* CLI endpoints append their own API paths, so known SDK/API base suffixes must
9-
* not remain in the stored or resolved base URL.
5+
* Normalize a model-service base URL to its origin.
6+
* CLI endpoints append their own API paths, so user-provided paths, query
7+
* parameters, and fragments must not remain in the stored or resolved base URL.
108
*/
119
export function normalizeModelBaseUrl(input: string): string {
1210
const trimmed = input.trim();
@@ -21,19 +19,7 @@ export function normalizeModelBaseUrl(input: string): string {
2119
throw invalidModelBaseUrl(input);
2220
}
2321

24-
parsed.search = "";
25-
parsed.hash = "";
26-
27-
let pathname = parsed.pathname.replace(/\/+$/, "");
28-
const knownSuffix = KNOWN_API_BASE_SUFFIXES.find(
29-
(suffix) => pathname === suffix || pathname.endsWith(suffix),
30-
);
31-
if (knownSuffix) {
32-
pathname = pathname.slice(0, -knownSuffix.length).replace(/\/+$/, "");
33-
}
34-
parsed.pathname = pathname || "/";
35-
36-
return parsed.toString().replace(/\/$/, "");
22+
return parsed.origin;
3723
}
3824

3925
function invalidModelBaseUrl(input: string): BailianError {

packages/core/tests/config-priority.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ test("baseUrl:flag > env > file > 默认,所有来源统一归一化", () => {
4646
const file: ConfigFile = { base_url: "https://file.example.com/gateway/" };
4747
expect(resolveModelBaseUrl(src({ flags, env, file }))).toBe("https://flag.example.com");
4848
expect(resolveModelBaseUrl(src({ env, file }))).toBe("https://env.example.com");
49-
expect(resolveModelBaseUrl(src({ file }))).toBe("https://file.example.com/gateway");
49+
expect(resolveModelBaseUrl(src({ file }))).toBe("https://file.example.com");
5050
expect(resolveModelBaseUrl(src({}))).toBe("https://dashscope.aliyuncs.com");
5151
});
5252

packages/core/tests/config-store.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ test("ConfigStore/AuthStore 写入前归一化 model Base URL", async () => {
5454
await configStore.write({
5555
base_url: "https://proxy.example.com/bailian/compatible-mode/v1/?query=one#fragment",
5656
});
57-
expect(readConfigFile().base_url).toBe("https://proxy.example.com/bailian");
57+
expect(readConfigFile().base_url).toBe("https://proxy.example.com");
5858
expect(JSON.parse(readFileSync(getConfigPath(), "utf8")).base_url).toBe(
59-
"https://proxy.example.com/bailian",
59+
"https://proxy.example.com",
6060
);
6161

6262
const authStore = makeAuthStore(buildSources({}));

0 commit comments

Comments
 (0)