Skip to content

Commit e81858f

Browse files
Auto-merge upstream openclaw/openclaw
2 parents 5d5ded7 + 6ab1b43 commit e81858f

17 files changed

Lines changed: 1001 additions & 75 deletions

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ Docs: https://docs.openclaw.ai
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.
116116
- 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.
117+
- CLI/Commander: preserve Commander-computed exit codes for argument and help-error paths, and cover the user-argv parse mode in the regression tests so invalid CLI invocations no longer report success when exits are intercepted. (#60923) Thanks @Linux2010.
117118

118119
## 2026.4.2
119120

docs/help/environment.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ OpenClaw pulls environment variables from multiple sources. The rule is **never
1919
4. **Config `env` block** in `~/.openclaw/openclaw.json` (applied only if missing).
2020
5. **Optional login-shell import** (`env.shellEnv.enabled` or `OPENCLAW_LOAD_SHELL_ENV=1`), applied only for missing expected keys.
2121

22+
On Ubuntu fresh installs that use the default state dir, OpenClaw also treats `~/.config/openclaw/gateway.env` as a compatibility fallback after the global `.env`. If both files exist and disagree, OpenClaw keeps `~/.openclaw/.env` and prints a warning.
23+
2224
If the config file is missing entirely, step 4 is skipped; shell import still runs if enabled.
2325

2426
## Config `env` block

extensions/telegram/channel-config-api.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export {
2+
TELEGRAM_COMMAND_NAME_PATTERN,
23
normalizeTelegramCommandDescription,
34
normalizeTelegramCommandName,
45
resolveTelegramCustomCommands,
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
export {
22
isMemoryMultimodalEnabled,
33
normalizeMemoryMultimodalSettings,
4+
supportsMemoryMultimodalEmbeddings,
45
type MemoryMultimodalSettings,
56
} from "./host/multimodal.js";

0 commit comments

Comments
 (0)