Skip to content

Commit 5545a61

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat/binary-install-diagnosis
2 parents 195d71b + 20594b7 commit 5545a61

187 files changed

Lines changed: 18334 additions & 970 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/publish.yml‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,15 @@ jobs:
7070
- name: publish-stable
7171
env:
7272
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
73-
# OSS release channel runs fully in CI: upload + reconcile + manifest.json.
74-
# All values come from repo Settings → Secrets — no OSS defaults live in
75-
# code. Leave AK/SK unset to skip the OSS channel; once enabled,
76-
# bucket/region/prefix are required.
77-
BAILIAN_OSS_AK: ${{ secrets.BAILIAN_OSS_AK }}
78-
BAILIAN_OSS_SK: ${{ secrets.BAILIAN_OSS_SK }}
79-
BAILIAN_OSS_BUCKET: ${{ secrets.BAILIAN_OSS_BUCKET }}
80-
BAILIAN_OSS_REGION: ${{ secrets.BAILIAN_OSS_REGION }}
81-
BAILIAN_OSS_ENDPOINT: ${{ secrets.BAILIAN_OSS_ENDPOINT }}
82-
BAILIAN_RELEASE_PREFIX: ${{ secrets.BAILIAN_RELEASE_PREFIX }}
83-
BAILIAN_STATIC_PREFIX: ${{ secrets.BAILIAN_STATIC_PREFIX }}
73+
# OSS release channel goes through the FC release function (presigned
74+
# upload + reconcile + manifest.json): this repo holds no OSS
75+
# credentials, the job only presents its GitHub OIDC token (requires
76+
# id-token: write above). The trigger URL is the shared
77+
# FC_TRIGGER_URL (same function serves publish-skills; actions are
78+
# routed by URL path); leave it unset to skip the OSS channel.
79+
# Bucket / prefix / allowlists live in the FC function.
80+
FC_TRIGGER_URL: ${{ vars.FC_TRIGGER_URL }}
81+
FC_RELEASE_AUDIENCE: ${{ vars.FC_RELEASE_AUDIENCE }}
8482
run: node tools/release/publish-stable.mjs ${{ inputs.package == 'knowledge-studio-cli' && '--knowledge' || '' }}
8583

8684
publish-channel:
@@ -130,14 +128,10 @@ jobs:
130128
- name: publish-channel
131129
env:
132130
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
133-
# OSS release channel — same Settings-injected values as stable.
134-
BAILIAN_OSS_AK: ${{ secrets.BAILIAN_OSS_AK }}
135-
BAILIAN_OSS_SK: ${{ secrets.BAILIAN_OSS_SK }}
136-
BAILIAN_OSS_BUCKET: ${{ secrets.BAILIAN_OSS_BUCKET }}
137-
BAILIAN_OSS_REGION: ${{ secrets.BAILIAN_OSS_REGION }}
138-
BAILIAN_OSS_ENDPOINT: ${{ secrets.BAILIAN_OSS_ENDPOINT }}
139-
BAILIAN_RELEASE_PREFIX: ${{ secrets.BAILIAN_RELEASE_PREFIX }}
140-
BAILIAN_STATIC_PREFIX: ${{ secrets.BAILIAN_STATIC_PREFIX }}
131+
# OSS release channel — same FC-backed flow as stable; no OSS
132+
# credentials in this repo (see publish-stable env notes).
133+
FC_TRIGGER_URL: ${{ vars.FC_TRIGGER_URL }}
134+
FC_RELEASE_AUDIENCE: ${{ vars.FC_RELEASE_AUDIENCE }}
141135
run: node tools/release/publish-channel.mjs ${{ inputs.package == 'knowledge-studio-cli' && '--knowledge' || '' }} --channel "${{ inputs.channel }}"
142136

143137
# bailian-kb-dsh is the dsh plugin (downstream host adapter): independent version,

‎.vite-hooks/pre-commit‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ git add \
1515
skills/bailian-finetune/reference \
1616
skills/bailian-managed-agent/SKILL.md \
1717
skills/bailian-managed-agent/reference \
18+
skills/bailian-sandbox/SKILL.md \
19+
skills/bailian-sandbox/reference \
1820
skills/bailian-web-search/SKILL.md
1921

2022
vp staged

‎AGENTS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ packages/core/src/auth/ # apiKey / console credential 解析与落盘
3636
packages/core/src/client/ # HTTP client / endpoints / console gateway
3737
```
3838

39-
Skill / 命令手册随 `skills/bailian-*/` 经 `bl skill init` 安装(装齐 registry 中全部 `bailian-*`,含共享协议 `bailian-protocol`)。业务 skill(`bailian-cli` / `bailian-gen` / `bailian-finetune` / `bailian-managed-agent` / `bailian-web-search`)执行前读 `skills/bailian-protocol/`;不要依赖 frontmatter `companions`(安装器不强制)。`tools/generate-reference.ts` 从 **`packages/cli/src/commands.ts`** 按一级命令归属表分流写入各 `skills/<skill>/reference/`(纳入 git);`tools/sync-skill-metadata.ts` 从 `packages/cli/package.json` 同步各 `skills/*/SKILL.md` 的 `metadata.version`。两者由根脚本 `pnpm run sync:skill-assets` 和 `.vite-hooks/pre-commit` 执行。hub `bailian-cli` 的路由表不复述领域命令明细;SKILL 文案 / 安装约定 / hand-off 见 [docs/agents/skill-change.md](docs/agents/skill-change.md)。
39+
Skill / 命令手册随 `skills/bailian-*/` 经 `bl skill init` 安装(装齐 registry 中全部 `bailian-*`,含共享协议 `bailian-protocol`)。业务 skill(`bailian-cli` / `bailian-gen` / `bailian-finetune` / `bailian-managed-agent` / `bailian-sandbox` / `bailian-web-search`)执行前读 `skills/bailian-protocol/`;不要依赖 frontmatter `companions`(安装器不强制)。`tools/generate-reference.ts` 从 **`packages/cli/src/commands.ts`** 按一级命令归属表分流写入各 `skills/<skill>/reference/`(纳入 git);`tools/sync-skill-metadata.ts` 从 `packages/cli/package.json` 同步各 `skills/*/SKILL.md` 的 `metadata.version`。两者由根脚本 `pnpm run sync:skill-assets` 和 `.vite-hooks/pre-commit` 执行。hub `bailian-cli` 的路由表不复述领域命令明细;SKILL 文案 / 安装约定 / hand-off 见 [docs/agents/skill-change.md](docs/agents/skill-change.md)。
4040

4141
约定:
4242

‎CHANGELOG.md‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,50 @@ The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and
66

77
[中文版](CHANGELOG.zh.md) · [README](README.md) · [Contributing](CONTRIBUTING.md)
88

9+
## [1.26.0] - 2026-09-17
10+
11+
### Changed
12+
13+
- **Simplified authentication** — Console login is now the recommended default and can create an ordinary API key when needed. Existing ordinary API keys and Token Plan subscription keys use the same `bl auth login --api-key <API_KEY>` command.
14+
- **Automatic API key validation and endpoint selection** — API keys are validated before being saved. The CLI automatically selects an available regional endpoint and applies the appropriate Token Plan configuration when applicable.
15+
16+
### Fixed
17+
18+
- **Video task diagnostics** — Failed video tasks now expose the service error code, message, request ID, and scheduling time; downloads show the actual failure detail instead of only an incomplete status.
19+
20+
## [1.25.0] - 2026-09-14
21+
22+
### Added
23+
24+
- **Token Plan harness quota** — `bl token-plan harness-quota` shows Token Plan harness entitlement quota usage (Console auth), joining the harness list with issued entitlements to display used/total quota, usage ratio, and reset time; harnesses with a pending entitlement are listed as issuing.
25+
- Filter the harness list with `--type official_tool|infrastructure`; render as a quota box or `--output json`.
26+
27+
## [1.24.0] - 2026-09-11
28+
29+
### Added
30+
31+
- Sandbox instance and template lifecycle commands, with automatic build polling and `--async` submission.
32+
- `bl sandbox official-images` and template `--image` presets for Code Interpreter, Browser, and All-in-One.
33+
- `bl sandbox file upload` uploads template mount files with `source=sandbox_template`; use the returned File ID in `mntConfig`.
34+
- Sandbox supports shared `--base-url`, environment and Profile configuration, with workspace-based endpoint fallback.
35+
- Dedicated `bailian-sandbox` Skill with command references and instance connection guidance.
36+
37+
### Fixed
38+
39+
- Preserve submitted `templateID` and `buildID` when template-build polling fails, so users can check the existing build before resubmitting.
40+
41+
### Security
42+
43+
- Sandbox REST calls use Bailian Bearer authentication without an E2B SDK or E2B API key. Connection credentials and dry-run environment values are redacted by default.
44+
45+
## [1.23.0] - 2026-09-10
46+
47+
### Added
48+
49+
- **Profile-level watermark control** — configure `watermark` with `bl config set --key watermark --value true|false` to control the default watermark behavior for image generation and editing, video generation and editing, and reference-to-video commands.
50+
- **ASR accuracy controls** — `bl speech recognize` now supports instant hot words with `--vocabulary`, contextual word enhancement with `--context`, and reusable pre-built vocabularies with `--vocabulary-id` for supported ASR models.
51+
- **Speech vocabulary management** — added `bl speech vocabulary create|list|get|update|delete` to manage reusable pre-built hot-word vocabularies.
52+
953
## [1.22.0] - 2026-09-08
1054

1155
### Changed

‎CHANGELOG.zh.md‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,50 @@
66

77
[English](CHANGELOG.md) · [README](README.zh.md) · [参与贡献](CONTRIBUTING.zh.md)
88

9+
## [1.26.0] - 2026-09-17
10+
11+
### 变更
12+
13+
- **简化认证方式** —— 默认推荐使用控制台登录,需要时可自动创建普通 API Key。已有普通 API Key 和 Token Plan 订阅 Key 统一使用 `bl auth login --api-key <API_KEY>` 登录。
14+
- **API Key 自动校验与地域识别** —— API Key 会在保存前进行校验,CLI 自动选择可用地域,并在适用时完成 Token Plan 配置。
15+
16+
### 修复
17+
18+
- **视频任务诊断** —— 视频任务失败时展示服务端错误码、错误信息、请求 ID 和调度时间;下载失败时展示实际失败原因,不再只提示任务未完成。
19+
20+
## [1.25.0] - 2026-09-14
21+
22+
### 新增
23+
24+
- **Token Plan harness 权益额度** —— `bl token-plan harness-quota` 查看 Token Plan harness 权益额度用量(Console 认证),联合 harness 列表与已发放权益,展示已用/总额度、使用比例和重置时间;待发放权益的 harness 以「发放中」状态列出。
25+
- 通过 `--type official_tool|infrastructure` 筛选 harness 列表;支持额度框输出或 `--output json`。
26+
27+
## [1.24.0] - 2026-09-11
28+
29+
### 新增
30+
31+
- Sandbox 实例与模版生命周期命令,支持自动轮询构建状态和 `--async` 异步提交。
32+
- `bl sandbox official-images` 与模版 `--image` 参数,内置代码解释器、浏览器和全能型镜像预设。
33+
- `bl sandbox file upload` 使用 `source=sandbox_template` 上传模版挂载文件,返回的 File ID 可用于 `mntConfig`。
34+
- Sandbox 复用 `--base-url`、环境变量和 Profile 配置,未配置时通过工作空间拼接接入地址。
35+
- 独立的 `bailian-sandbox` Skill,提供命令参考和实例连接指南。
36+
37+
### 修复
38+
39+
- 模版构建轮询失败时保留已提交的 `templateID` 和 `buildID`,便于先查询已有构建,避免重复提交。
40+
41+
### 安全
42+
43+
- Sandbox REST 调用使用百炼 Bearer 鉴权,不依赖 E2B SDK 或 E2B API Key;连接凭据和 dry-run 环境变量默认脱敏。
44+
45+
## [1.23.0] - 2026-09-10
46+
47+
### 新增
48+
49+
- **Profile 级水印控制** —— 可通过 `bl config set --key watermark --value true|false` 设置图片生成与编辑、视频生成与编辑以及参考生视频命令的默认水印行为。
50+
- **ASR 准确率增强** —— `bl speech recognize` 现支持通过 `--vocabulary` 传入即时热词、通过 `--context` 增强上下文词表,以及通过 `--vocabulary-id` 使用适用于对应 ASR 模型的预编译热词表。
51+
- **语音热词表管理** —— 新增 `bl speech vocabulary create|list|get|update|delete`,用于管理可复用的预编译热词表。
52+
953
## [1.22.0] - 2026-09-08
1054

1155
### 变更

‎INSTALL.md‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,9 @@ which bl # Windows: where.exe bl
7979
### 推荐:浏览器登录(控制台会话)
8080

8181
1. 执行 `bl auth status --output json`,判断是否已配置。
82-
2. 若未配置,在**用户本机终端**执行 `bl auth login --console`。
83-
3. 登录成功后执行 `bl auth status --output json` 确认;汇报时只使用 masked 字段,**禁止**回显完整凭据。
84-
85-
### 备选:API Key / Token Plan
86-
87-
- 普通 Key:`bl auth login --api-key <Key>`
88-
- Token Plan:`bl auth login --config token-plan --api-key <Key>`
82+
2. 若未配置,在**用户本机终端**执行 `bl auth login --console`(国际站执行 `bl auth login --console --console-site international`);需要时会自动创建普通 API Key。
83+
3. 如果使用 Token Plan 等订阅计划,不能使用 `--console`,请执行 `bl auth login --api-key <API_KEY>`。
84+
4. 登录成功后执行 `bl auth status --output json` 确认;汇报时只使用 masked 字段,**禁止**回显完整凭据。
8985

9086
### Agent 安全约束
9187

‎README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -115,36 +115,36 @@ Once installed, just describe your task to your AI Agent — no need to assemble
115115
| ------------------------ | --------------------------------------------------------------------------------- |
116116
| Managed Agent | "Create a Managed Agent that can generate short-film storyboards and videos." |
117117
| Image & video generation | "Generate an image of a cat in a spacesuit on Mars, then turn it into a video." |
118+
| Speech recognition | "Transcribe this audio; if proper nouns are wrong, add hot words and try again." |
118119
| Usage & quota | "Show my recent model usage, free-tier quota, and rate limits." |
120+
| Monitoring & alerts | "Show my model call stats, failures and logs, and create an alert rule." |
119121
| Model selection | "Recommend a model for image understanding and customer support." |
120122
| About Bailian CLI | "Tell me what Bailian CLI can do for me, and suggest how to use it for my needs." |
121123

122124
> More examples and scenarios: [Aliyun Model Studio CLI Site](https://bailian.console.aliyun.com/cli?source_channel=cli_github&)
123125
124126
## Authentication
125127

126-
### API Key
128+
### Console Login (OAuth, Recommended)
127129

128-
Required for most commands. Get your key from the [DashScope Console](https://bailian.console.aliyun.com/cn-beijing/?source_channel=key_github&tab=app#/api-key).
130+
Required for console capability commands (model list, app list, MCP list, workspace, usage queries, rate-limit increases, direct console calls). It can create an ordinary API key when needed. Token Plan and other subscription plans cannot use `--console`; use the API Key login below.
129131

130132
```bash
131-
bl auth login --api-key sk-xxxxx
133+
bl auth login --console
132134
```
133135

134-
Get or copy your Token Plan API key from the [Token Plan subscription overview](https://bailian.console.aliyun.com/cn-beijing?tab=plan#/efm/subscription/overview).
135-
136-
```bash
137-
bl auth login --config token-plan --api-key sk-sp-xxxxx
138-
```
136+
Use `--console-site international` for the international console.
139137

140-
### Console Login (OAuth)
138+
### API Key
141139

142-
Required for console capability commands (model list, app list, MCP list, workspace, usage queries, rate-limit increases, direct console calls). Opens the Bailian console in your browser to sign in.
140+
To use an existing ordinary API key or a Token Plan subscription key, run the same command:
143141

144142
```bash
145-
bl auth login --console
143+
bl auth login --api-key <API_KEY>
146144
```
147145

146+
Get an ordinary key from the [DashScope Console](https://bailian.console.aliyun.com/cn-beijing/?source_channel=key_github&tab=app#/api-key), or a Token Plan key from the [subscription overview](https://bailian.console.aliyun.com/cn-beijing?tab=plan#/efm/subscription/overview).
147+
148148
### Alibaba Cloud OpenAPI AK/SK
149149

150150
Token Plan seat and member management requires an Alibaba Cloud AccessKey. Get yours from the [RAM Console](https://ram.console.aliyun.com/manage/ak).

‎README.zh.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,36 +114,36 @@ irm https://bailian.aliyun.com/cli/install.ps1 | iex
114114
| ---------------- | ----------------------------------------------------------------------- |
115115
| Managed Agent | “帮我创建一个能够生成短片分镜和视频的 Managed Agent。” |
116116
| 图片和视频生成 | “生成一张穿着太空服的猫站在火星上的图片,再把它制作成一段视频。” |
117+
| 语音识别 | “把这段音频转写成文字,专有名词识别不准的话帮我加上热词再试。” |
117118
| 用量与额度 | “查看最近的模型用量、免费额度和限流情况。” |
119+
| 监控与告警 | “查看我的模型调用统计、失败明细和调用日志,并创建一条告警规则。” |
118120
| 模型选型 | “推荐一个适合图片理解和智能客服的模型。” |
119121
| 了解 Bailian CLI | “介绍一下 Bailian CLI 能帮我完成哪些任务,并根据我的需求推荐使用方式。” |
120122

121123
> 更多案例与使用场景:[阿里云百炼 CLI 官方主页](https://bailian.console.aliyun.com/cli?source_channel=cli_github&)
122124
123125
## 认证方式
124126

125-
### API Key
127+
### 控制台登录(OAuth,推荐)
126128

127-
大部分命令均需要 API Key。前往 [DashScope 控制台](https://bailian.console.aliyun.com/cn-beijing/?source_channel=key_github&tab=app#/api-key) 获取。
129+
控制台能力命令(模型列表、应用列表、MCP 列表、工作空间、用量查询、限流提额、控制台直调)需要使用此登录方式,并可在需要时创建普通 API Key。Token Plan 等订阅计划不能使用 `--console`,请使用下面的 API Key 登录方式。
128130

129131
```bash
130-
bl auth login --api-key sk-xxxxx
132+
bl auth login --console
131133
```
132134

133-
Token Plan 的 API Key 前往 [Token Plan 订阅详情](https://bailian.console.aliyun.com/cn-beijing?tab=plan#/efm/subscription/overview) 获取或复制。
134-
135-
```bash
136-
bl auth login --config token-plan --api-key sk-sp-xxxxx
137-
```
135+
国际站请使用 `--console-site international`。
138136

139-
### 控制台登录(OAuth)
137+
### API Key
140138

141-
控制台能力命令(模型列表、应用列表、MCP 列表、工作空间、用量查询、限流提额、控制台直调)需要使用此登录方式。打开浏览器跳转百炼控制台完成登录。
139+
使用已有的普通 API Key 或 Token Plan 订阅 Key,都执行同一条命令:
142140

143141
```bash
144-
bl auth login --console
142+
bl auth login --api-key <API_KEY>
145143
```
146144

145+
普通 Key 前往 [DashScope 控制台](https://bailian.console.aliyun.com/cn-beijing/?source_channel=key_github&tab=app#/api-key) 获取,Token Plan Key 前往 [订阅详情](https://bailian.console.aliyun.com/cn-beijing?tab=plan#/efm/subscription/overview) 获取。
146+
147147
### 阿里云 OpenAPI AK/SK
148148

149149
Token Plan 的席位与成员管理需要阿里云 AccessKey。前往 [RAM 控制台](https://ram.console.aliyun.com/manage/ak) 获取。

0 commit comments

Comments
 (0)