Skip to content

Commit ba8d8a4

Browse files
Auto-merge upstream openclaw/openclaw
2 parents 7fcb0a6 + 2781897 commit ba8d8a4

39 files changed

Lines changed: 776 additions & 361 deletions

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ Docs: https://docs.openclaw.ai
113113
- Control UI/avatar: honor `ui.assistant.avatar` when serving `/avatar/:agentId` so Appearance UI avatar paths stop falling back to initials placeholders. (#60778) Thanks @hannasdev.
114114
- Control UI/Overview: prevent gateway access token/password visibility toggle buttons from overlapping their inputs at narrow widths. (#56924) Thanks @bbddbb1.
115115
- Control UI/cron: highlight the Cron refresh button while refresh is in flight so the page's loading state stays visible even when prior data remains on screen. (#60394) Thanks @coder-zhuzm.
116+
- MS Teams: replace the deprecated Teams SDK HttpPlugin stub with `httpServerAdapter` so recurring gateway deprecation warnings stop firing and the Express 5 compatibility workaround stays on the supported SDK path. (#60939) Thanks @coolramukaka-sys.
116117

117118
## 2026.4.2
118119

@@ -209,6 +210,7 @@ Docs: https://docs.openclaw.ai
209210
- Browser/profiles: reject remote browser profile `cdpUrl` values that violate strict SSRF policy before saving config, with clearer validation errors for blocked endpoints. (#60477) Thanks @eleqtrizit.
210211
- Browser/screenshots: stop sending `fromSurface: false` on CDP screenshots so managed Chrome 146+ browsers can capture images again. (#60682) Thanks @mvanhorn.
211212
- Mattermost/slash commands: harden native slash-command callback token validation to use constant-time secret comparison, matching the existing interaction-token path.
213+
- Control UI/mobile chat: reduce narrow-screen overflow by shrinking the chat pane minimum width, removing extra mobile padding, widening message groups, and hiding avatars on very small screens. (#60220) Thanks @macdao.
212214

213215
## 2026.4.1
214216

docs/cli/index.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,13 +1479,14 @@ Tip: the owner-only `gateway` runtime tool still refuses to rewrite `tools.exec.
14791479

14801480
See [/concepts/models](/concepts/models) for fallback behavior and scanning strategy.
14811481

1482-
Billing note: Anthropic changed third-party harness billing on **April 4, 2026
1483-
at 12:00 PM PT / 8:00 PM BST**. Anthropic says Claude subscription limits no
1484-
longer cover OpenClaw, and Claude CLI usage in OpenClaw now requires **Extra
1485-
Usage** billed separately from the subscription. For production, prefer an
1486-
Anthropic API key or another supported subscription-style provider such as
1487-
OpenAI Codex, Qwen Cloud Coding Plan, MiniMax Coding Plan, or
1488-
Z.AI / GLM Coding Plan.
1482+
Billing note: Anthropic's public Claude Code docs still include direct Claude
1483+
Code terminal usage in Claude plan limits. Separately, Anthropic notified
1484+
OpenClaw users on **April 4, 2026 at 12:00 PM PT / 8:00 PM BST** that the
1485+
**OpenClaw** Claude-login path counts as third-party harness usage and
1486+
requires **Extra Usage** billed separately from the subscription. For
1487+
production, prefer an Anthropic API key or another supported
1488+
subscription-style provider such as OpenAI Codex, Alibaba Cloud Model Studio
1489+
Coding Plan, MiniMax Coding Plan, or Z.AI / GLM Coding Plan.
14891490

14901491
Anthropic Claude CLI migration:
14911492

@@ -1495,8 +1496,9 @@ openclaw models auth login --provider anthropic --method cli --set-default
14951496

14961497
Onboarding shortcut: `openclaw onboard --auth-choice anthropic-cli`
14971498

1498-
Existing Anthropic OAuth/token profiles still run if already configured, but
1499-
OpenClaw no longer offers Anthropic setup-token as a new auth path.
1499+
Anthropic setup-token is also available again as a legacy/manual auth path.
1500+
Use it only with the expectation that Anthropic told OpenClaw users the
1501+
OpenClaw Claude-login path requires **Extra Usage**.
15001502

15011503
Legacy alias note: `claude-cli` is the deprecated onboarding auth-choice alias.
15021504
Use `anthropic-cli` for onboarding, or use `models auth login` directly.
@@ -1609,7 +1611,7 @@ Notes:
16091611
- `setup-token` and `paste-token` are generic token commands for providers that expose token auth methods.
16101612
- `setup-token` requires an interactive TTY and runs the provider's token-auth method.
16111613
- `paste-token` prompts for the token value and defaults to auth profile id `<provider>:manual` when `--profile-id` is omitted.
1612-
- Anthropic OAuth/token profiles still run if already configured, but Anthropic no longer supports `setup-token` or `paste-token` as a new OpenClaw auth path.
1614+
- Anthropic `setup-token` / `paste-token` are available again as a legacy/manual OpenClaw path. Anthropic told OpenClaw users this path requires **Extra Usage** on the Claude account.
16131615

16141616
### `models auth order get|set|clear`
16151617

docs/cli/models.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ openclaw models fallbacks list
9999
openclaw models auth add
100100
openclaw models auth login --provider <id>
101101
openclaw models auth setup-token --provider <id>
102-
openclaw models auth paste-token --provider <id>
102+
openclaw models auth paste-token
103103
```
104104

105105
`models auth add` is the interactive auth helper. It can launch a provider auth
@@ -126,10 +126,11 @@ Notes:
126126
- `setup-token` requires an interactive TTY and runs the provider's token-auth
127127
method (defaulting to that provider's `setup-token` method when it exposes
128128
one).
129+
- `paste-token` accepts a token string generated elsewhere or from automation.
129130
- `paste-token` requires `--provider`, prompts for the token value, and writes
130131
it to the default profile id `<provider>:manual` unless you pass
131132
`--profile-id`.
132133
- `paste-token --expires-in <duration>` stores an absolute token expiry from a
133134
relative duration such as `365d` or `12h`.
134-
- Anthropic billing note: Anthropic changed third-party harness billing on **April 4, 2026 at 12:00 PM PT / 8:00 PM BST**. Anthropic says Claude subscription limits no longer cover OpenClaw, and Claude CLI traffic in OpenClaw now requires **Extra Usage** billed separately from the subscription.
135-
- Existing Anthropic OAuth/token profiles still run if already configured, but Anthropic no longer supports `setup-token` or `paste-token` as a new OpenClaw auth path.
135+
- Anthropic billing note: Anthropic's public Claude Code docs still include direct Claude Code terminal usage in Claude plan limits. Separately, Anthropic notified OpenClaw users on **April 4, 2026 at 12:00 PM PT / 8:00 PM BST** that the **OpenClaw** Claude-login path counts as third-party harness usage and requires **Extra Usage** billed separately from the subscription.
136+
- Anthropic `setup-token` / `paste-token` are available again as a legacy/manual OpenClaw path. Use them with the expectation that Anthropic told OpenClaw users this path requires **Extra Usage**.

docs/concepts/model-providers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ OpenClaw ships with the pi‑ai catalog. These providers require **no**
255255
- Example model: `anthropic/claude-opus-4-6`
256256
- CLI: `openclaw onboard --auth-choice apiKey` or `openclaw onboard --auth-choice anthropic-cli`
257257
- Direct public Anthropic requests support the shared `/fast` toggle and `params.fastMode`, including API-key and OAuth-authenticated traffic sent to `api.anthropic.com`; OpenClaw maps that to Anthropic `service_tier` (`auto` vs `standard_only`)
258-
- Billing note: Anthropic changed third-party harness billing on **April 4, 2026 at 12:00 PM PT / 8:00 PM BST**. Anthropic says Claude subscription limits no longer cover OpenClaw, and Anthropic OAuth/subscription traffic now requires **Extra Usage** billed separately from the subscription.
259-
- Existing Anthropic OAuth/token profiles still run if already configured, but new setup is no longer offered through onboarding or auth commands.
258+
- Billing note: Anthropic's public Claude Code docs still include direct Claude Code terminal usage in Claude plan limits. Separately, Anthropic notified OpenClaw users on **April 4, 2026 at 12:00 PM PT / 8:00 PM BST** that the **OpenClaw** Claude-login path counts as third-party harness usage and requires **Extra Usage** billed separately from the subscription.
259+
- Anthropic setup-token is available again as a legacy/manual OpenClaw path. Use it with the expectation that Anthropic told OpenClaw users this path requires **Extra Usage**.
260260

261261
```json5
262262
{

docs/concepts/oauth.md

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ title: "OAuth"
1313
OpenClaw supports “subscription auth” via OAuth for providers that offer it
1414
(notably **OpenAI Codex (ChatGPT OAuth)**). For Anthropic subscriptions, new
1515
setup should use the local **Claude CLI** login path on the gateway host, but
16-
Anthropic changed third-party harness billing on
17-
**April 4, 2026 at 12:00 PM PT / 8:00 PM BST**: Anthropic says Claude
18-
subscription limits no longer cover OpenClaw and Anthropic now requires **Extra
19-
Usage** for that traffic. OpenAI Codex OAuth is explicitly supported for use in
20-
external tools like OpenClaw. This page explains:
16+
Anthropic distinguishes between direct Claude Code usage and OpenClaw's reuse
17+
path. Anthropic's public Claude Code docs say direct Claude Code use stays
18+
inside Claude subscription limits. Separately, Anthropic notified OpenClaw
19+
users on **April 4, 2026 at 12:00 PM PT / 8:00 PM BST** that OpenClaw counts as
20+
a third-party harness and now requires **Extra Usage** for that traffic.
21+
OpenAI Codex OAuth is explicitly supported for use in external tools like
22+
OpenClaw. This page explains:
2123

2224
For Anthropic in production, API key auth is the safer recommended path.
2325

@@ -64,29 +66,33 @@ All of the above also respect `$OPENCLAW_STATE_DIR` (state dir override). Full r
6466

6567
For static secret refs and runtime snapshot activation behavior, see [Secrets Management](/gateway/secrets).
6668

67-
## Anthropic OAuth/token compatibility
69+
## Anthropic legacy token compatibility
6870

6971
<Warning>
70-
Anthropic changed third-party harness billing on **April 4, 2026 at 12:00 PM
71-
PT / 8:00 PM BST**. Anthropic says Claude subscription limits no longer cover
72-
OpenClaw or other third-party harnesses. Existing Anthropic OAuth/token profiles
73-
remain technically usable in OpenClaw, but Anthropic now requires **Extra
72+
Anthropic's public Claude Code docs say direct Claude Code use stays within
73+
Claude subscription limits. Separately, Anthropic told OpenClaw users on
74+
**April 4, 2026 at 12:00 PM PT / 8:00 PM BST** that **OpenClaw counts as a
75+
third-party harness**. Existing Anthropic token profiles remain technically
76+
usable in OpenClaw, but Anthropic says the OpenClaw path now requires **Extra
7477
Usage** (pay-as-you-go billed separately from the subscription) for that
7578
traffic.
7679

80+
For Anthropic's current direct-Claude-Code plan docs, see [Using Claude Code
81+
with your Pro or Max
82+
plan](https://support.claude.com/en/articles/11145838-using-claude-code-with-your-pro-or-max-plan)
83+
and [Using Claude Code with your Team or Enterprise
84+
plan](https://support.anthropic.com/en/articles/11845131-using-claude-code-with-your-team-or-enterprise-plan/).
85+
7786
If you want other subscription-style options in OpenClaw, see [OpenAI
7887
Codex](/providers/openai), [Qwen Cloud Coding
7988
Plan](/providers/qwen), [MiniMax Coding Plan](/providers/minimax),
8089
and [Z.AI / GLM Coding Plan](/providers/glm).
8190
</Warning>
8291

83-
OpenClaw no longer offers Anthropic setup-token onboarding or auth commands for
84-
new setup. Existing Anthropic OAuth/token profiles are still honored at runtime
85-
if they are already configured.
86-
87-
The generic token helpers still exist for other providers:
88-
`openclaw models auth setup-token --provider <id>` and
89-
`openclaw models auth paste-token --provider <id>`.
92+
OpenClaw now exposes Anthropic setup-token again as a legacy/manual path.
93+
Anthropic's OpenClaw-specific billing notice still applies to that path, so
94+
use it with the expectation that Anthropic requires **Extra Usage** for
95+
OpenClaw-driven Claude-login traffic.
9096

9197
## Anthropic Claude CLI migration
9298

@@ -113,10 +119,9 @@ openclaw onboard --auth-choice anthropic-cli
113119
```
114120

115121
This keeps existing Anthropic auth profiles for rollback, but rewrites the main
116-
default-model path from `anthropic/...` to a canonical
117-
`claude-cli/claude-*` ref, rewrites matching Anthropic Claude fallbacks, and
118-
adds matching canonical `claude-cli/claude-*` allowlist entries under
119-
`agents.defaults.models`.
122+
default-model path from `anthropic/...` to `claude-cli/...`, rewrites matching
123+
Anthropic Claude fallbacks, and adds matching `claude-cli/...` allowlist
124+
entries under `agents.defaults.models`.
120125

121126
Verify:
122127

@@ -136,10 +141,14 @@ Claude CLI path:
136141

137142
1. sign in with `claude auth login` on the gateway host
138143
2. run `openclaw models auth login --provider anthropic --method cli --set-default`
139-
3. store no new auth profile; switch model selection to a canonical
140-
`claude-cli/claude-*` ref
144+
3. store no new auth profile; switch model selection to `claude-cli/...`
141145
4. keep existing Anthropic auth profiles for rollback
142146

147+
Anthropic's public Claude Code docs describe this direct Claude subscription
148+
login flow for `claude` itself. OpenClaw can reuse that local login, but
149+
Anthropic separately classifies the OpenClaw-controlled path as third-party
150+
harness usage for billing purposes.
151+
143152
Interactive assistant path:
144153

145154
- `openclaw onboard` / `openclaw configure` → auth choice `anthropic-cli`

docs/gateway/authentication.md

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,17 @@ API keys for daemon use: `openclaw onboard`.
5959
See [Help](/help) for details on env inheritance (`env.shellEnv`,
6060
`~/.openclaw/.env`, systemd/launchd).
6161

62-
## Anthropic: OAuth/token compatibility
62+
## Anthropic: legacy token compatibility
6363

64-
Existing Anthropic OAuth/token profiles are still honored at runtime if they
65-
are already configured, but OpenClaw no longer offers Anthropic setup-token
66-
auth for new setup via onboarding or `models auth` commands.
64+
Anthropic setup-token auth is still available in OpenClaw as a
65+
legacy/manual path. Anthropic's public Claude Code docs still cover direct
66+
Claude Code terminal use under Claude plans, but Anthropic separately told
67+
OpenClaw users that the **OpenClaw** Claude-login path counts as third-party
68+
harness usage and requires **Extra Usage** billed separately from the
69+
subscription.
6770

68-
For new setup, use an Anthropic API key or migrate to Claude CLI on the gateway
69-
host.
70-
71-
Other providers can still use the generic token helpers:
72-
73-
- `openclaw models auth setup-token --provider <id>` runs the provider's token
74-
auth flow (interactive TTY required).
75-
- `openclaw models auth paste-token --provider <id>` prompts for a token value
76-
and writes it to `auth-profiles.json` (default profile id:
77-
`<provider>:manual`).
71+
For the clearest setup path, use an Anthropic API key or migrate to Claude CLI
72+
on the gateway host.
7873

7974
Manual token entry (any provider; writes `auth-profiles.json` + updates config):
8075

@@ -130,8 +125,8 @@ openclaw models auth login --provider anthropic --method cli --set-default
130125
```
131126

132127
This keeps your existing Anthropic auth profiles for rollback, but changes the
133-
default model selection to a canonical `claude-cli/claude-*` ref and adds
134-
matching Claude CLI allowlist entries under `agents.defaults.models`.
128+
default model selection to `claude-cli/...` and adds matching Claude CLI
129+
allowlist entries under `agents.defaults.models`.
135130

136131
Verify:
137132

@@ -145,8 +140,9 @@ Onboarding shortcut:
145140
openclaw onboard --auth-choice anthropic-cli
146141
```
147142

148-
Interactive `openclaw onboard` and `openclaw configure` prefer Claude CLI for
149-
Anthropic and no longer offer setup-token as a new setup path.
143+
Interactive `openclaw onboard` and `openclaw configure` still prefer Claude CLI
144+
for Anthropic, but Anthropic setup-token is available again as a
145+
legacy/manual path and should be used with the Extra Usage billing expectation.
150146

151147
## Checking model auth status
152148

@@ -211,12 +207,12 @@ openclaw models status
211207

212208
### Token expiring/expired
213209

214-
Run `openclaw models status` to confirm which profile is expiring. If an
215-
Anthropic OAuth/token profile is missing or expired, migrate that setup to Claude CLI
210+
Run `openclaw models status` to confirm which profile is expiring. If a legacy
211+
Anthropic token profile is missing or expired, migrate that setup to Claude CLI
216212
or an API key.
217213

218214
## Claude CLI requirements
219215

220216
Only needed for the Anthropic Claude CLI reuse path:
221217

222-
- Claude CLI installed (`claude` command available)
218+
- Claude Code CLI installed (`claude` command available)

0 commit comments

Comments
 (0)