Auto-merge upstream openclaw/openclaw

Author: friuns2

docs/concepts/model-providers.md

@@ -301,7 +301,6 @@ See [/providers/kilocode](/providers/kilocode) for setup details.
 | DeepInfra                               | `deepinfra`                      | `DEEPINFRA_API_KEY`                                          | `deepinfra/deepseek-ai/DeepSeek-V4-Flash`                  |
 | DeepSeek                                | `deepseek`                       | `DEEPSEEK_API_KEY`                                           | `deepseek/deepseek-v4-flash`                               |
 | GitHub Copilot                          | `github-copilot`                 | `COPILOT_GITHUB_TOKEN` / `GH_TOKEN` / `GITHUB_TOKEN`         | -                                                          |
-| GMI Cloud                               | `gmi`                            | `GMI_API_KEY`                                                | `gmi/google/gemini-3.1-flash-lite`                         |
 | Groq                                    | `groq`                           | `GROQ_API_KEY`                                               | -                                                          |
 | Hugging Face Inference                  | `huggingface`                    | `HUGGINGFACE_HUB_TOKEN` or `HF_TOKEN`                        | `huggingface/deepseek-ai/DeepSeek-R1`                      |
 | Kilo Gateway                            | `kilocode`                       | `KILOCODE_API_KEY`                                           | `kilocode/kilo/auto`                                       |

docs/docs.json

@@ -1387,11 +1387,7 @@
                   "clawhub/http-api",
                   "clawhub/acceptable-usage",
                   "clawhub/moderation",
-                  "clawhub/namespace-claims",
-                  "clawhub/security",
-                  "clawhub/security-audits",
-                  "clawhub/content-rights",
-                  "clawhub/plugin-validation-fixes"
+                  "clawhub/security-audits"
                 ]
               }
             ]

docs/plugins/plugin-inventory.md

@@ -51,7 +51,7 @@ Each entry lists the package, distribution route, and description.
 
 ## Core npm package
 
-91 plugins
+90 plugins
 
 - **[admin-http-rpc](/plugins/reference/admin-http-rpc)** (`@openclaw/admin-http-rpc`) - included in OpenClaw. OpenClaw admin HTTP RPC endpoint.
 
@@ -81,7 +81,7 @@ Each entry lists the package, distribution route, and description.
 
 - **[codex-supervisor](/plugins/reference/codex-supervisor)** (`@openclaw/codex-supervisor`) - included in OpenClaw. Supervise Codex app-server sessions from OpenClaw.
 
-- **[cohere](/plugins/reference/cohere)** (`@openclaw/cohere-provider`) - included in OpenClaw. Adds Cohere model provider support to OpenClaw.
+- **[cohere](/plugins/reference/cohere)** (`@openclaw/cohere-provider`) - included in OpenClaw; npm; ClawHub: `clawhub:@openclaw/cohere-provider`. OpenClaw Cohere provider plugin.
 
 - **[comfy](/plugins/reference/comfy)** (`@openclaw/comfy-provider`) - included in OpenClaw. Adds ComfyUI model provider support to OpenClaw.
 
@@ -111,8 +111,6 @@ Each entry lists the package, distribution route, and description.
 
 - **[github-copilot](/plugins/reference/github-copilot)** (`@openclaw/github-copilot-provider`) - included in OpenClaw. Adds GitHub Copilot model provider support to OpenClaw.
 
-- **[gmi](/plugins/reference/gmi)** (`@openclaw/gmi-provider`) - included in OpenClaw. Adds Gmi, Gmi Cloud, Gmicloud model provider support to OpenClaw.
-
 - **[google](/plugins/reference/google)** (`@openclaw/google-plugin`) - included in OpenClaw. Adds Google, Google Gemini CLI, Google Vertex model provider support to OpenClaw.
 
 - **[gradium](/plugins/reference/gradium)** (`@openclaw/gradium-speech`) - included in OpenClaw. Adds text-to-speech provider support.
@@ -237,7 +235,7 @@ Each entry lists the package, distribution route, and description.
 
 ## Official external packages
 
-35 plugins
+36 plugins
 
 - **[acpx](/plugins/reference/acpx)** (`@openclaw/acpx`) - npm; ClawHub. OpenClaw ACP runtime backend with plugin-owned session and transport management.
 
@@ -265,6 +263,8 @@ Each entry lists the package, distribution route, and description.
 
 - **[feishu](/plugins/reference/feishu)** (`@openclaw/feishu`) - npm; ClawHub. OpenClaw Feishu/Lark channel plugin for chats and workplace tools (community maintained by @m1heng).
 
+- **[gmi](/plugins/reference/gmi)** (`@openclaw/gmi-provider`) - npm; ClawHub: `clawhub:@openclaw/gmi-provider`. OpenClaw GMI Cloud provider plugin.
+
 - **[google-meet](/plugins/reference/google-meet)** (`@openclaw/google-meet`) - npm; ClawHub. OpenClaw Google Meet participant plugin for joining calls through Chrome or Twilio transports.
 
 - **[googlechat](/plugins/reference/googlechat)** (`@openclaw/googlechat`) - npm; ClawHub. OpenClaw Google Chat channel plugin for spaces and direct messages.

docs/plugins/reference/cohere.md

@@ -1,18 +1,18 @@
 ---
-summary: "Adds Cohere model provider support to OpenClaw."
+summary: "OpenClaw Cohere provider plugin."
 read_when:
   - You are installing, configuring, or auditing the cohere plugin
 title: "Cohere plugin"
 ---
 
 # Cohere plugin
 
-Adds Cohere model provider support to OpenClaw.
+OpenClaw Cohere provider plugin.
 
 ## Distribution
 
 - Package: `@openclaw/cohere-provider`
-- Install route: included in OpenClaw
+- Install route: included in OpenClaw; npm; ClawHub: `clawhub:@openclaw/cohere-provider`
 
 ## Surface
 

docs/plugins/reference/gmi.md

@@ -1,18 +1,18 @@
 ---
-summary: "Adds Gmi, Gmi Cloud, Gmicloud model provider support to OpenClaw."
+summary: "OpenClaw GMI Cloud provider plugin."
 read_when:
   - You are installing, configuring, or auditing the gmi plugin
 title: "Gmi plugin"
 ---
 
 # Gmi plugin
 
-Adds Gmi, Gmi Cloud, Gmicloud model provider support to OpenClaw.
+OpenClaw GMI Cloud provider plugin.
 
 ## Distribution
 
 - Package: `@openclaw/gmi-provider`
-- Install route: included in OpenClaw
+- Install route: npm; ClawHub: `clawhub:@openclaw/gmi-provider`
 
 ## Surface
 

docs/providers/cohere.md

@@ -6,31 +6,38 @@ read_when:
   - You need the Cohere API key env var or CLI auth choice
 ---
 
-[Cohere](https://cohere.com) provides OpenAI-compatible inference through its Compatibility API. OpenClaw includes a bundled Cohere provider plugin with the Command A model catalog.
-
-| Property        | Value                                    |
-| --------------- | ---------------------------------------- |
-| Provider id     | `cohere`                                 |
-| Plugin          | bundled, `enabledByDefault: true`        |
-| Auth env var    | `COHERE_API_KEY`                         |
-| Onboarding flag | `--auth-choice cohere-api-key`           |
-| Direct CLI flag | `--cohere-api-key <key>`                 |
-| API             | OpenAI-compatible (`openai-completions`) |
-| Base URL        | `https://api.cohere.ai/compatibility/v1` |
-| Default model   | `cohere/command-a-03-2025`               |
+[Cohere](https://cohere.com) provides OpenAI-compatible inference through its Compatibility API. OpenClaw ships the Cohere provider during its externalization transition and also publishes it as an official external plugin with the Command A model catalog.
+
+| Property        | Value                                                |
+| --------------- | ---------------------------------------------------- |
+| Provider id     | `cohere`                                             |
+| Plugin          | bundled during transition; official external package |
+| Auth env var    | `COHERE_API_KEY`                                     |
+| Onboarding flag | `--auth-choice cohere-api-key`                       |
+| Direct CLI flag | `--cohere-api-key <key>`                             |
+| API             | OpenAI-compatible (`openai-completions`)             |
+| Base URL        | `https://api.cohere.ai/compatibility/v1`             |
+| Default model   | `cohere/command-a-03-2025`                           |
 
 ## Get started
 
-1. Create a Cohere API key.
-2. Run onboarding:
+1. Cohere is included in current OpenClaw packages. If it is unavailable, install the external package and restart the Gateway:
+
+```bash
+openclaw plugins install @openclaw/cohere-provider
+openclaw gateway restart
+```
+
+2. Create a Cohere API key.
+3. Run onboarding:
 
 ```bash
 openclaw onboard --non-interactive \
   --auth-choice cohere-api-key \
   --cohere-api-key "$COHERE_API_KEY"
 ```
 
-3. Confirm the catalog is available:
+4. Confirm the catalog is available:
 
 ```bash
 openclaw models list --provider cohere
@@ -40,7 +47,7 @@ The default model is set only when no primary model is already configured.
 
 ## Environment-only setup
 
-Make `COHERE_API_KEY` available to the Gateway process, then select the bundled model:
+Make `COHERE_API_KEY` available to the Gateway process, then select the Cohere model:
 
 ```json5
 {

docs/providers/gmi.md

@@ -7,9 +7,9 @@ title: "GMI Cloud"
 ---
 
 GMI Cloud is a hosted inference platform for frontier and open-weight models
-behind an OpenAI-compatible API. In OpenClaw it is a bundled model provider,
-which means you can select it with the provider id `gmi`, store credentials
-through normal model auth, and use model refs like
+behind an OpenAI-compatible API. In OpenClaw it is an official external provider
+plugin, which means you install it once, select it with the provider id `gmi`,
+store credentials through normal model auth, and use model refs like
 `gmi/google/gemini-3.1-flash-lite`.
 
 Use GMI when you want one API key for several hosted model families, including
@@ -24,7 +24,14 @@ model availability, billing, rate limits, and any provider-side routing policy.
 
 ## Setup
 
-Create an API key in GMI Cloud, then run:
+Install the plugin, restart the gateway, then create an API key in GMI Cloud:
+
+```bash
+openclaw plugins install @openclaw/gmi-provider
+openclaw gateway restart
+```
+
+Then run:
 
 ```bash
 openclaw onboard --auth-choice gmi-api-key
@@ -60,7 +67,7 @@ GPU control matters more than hosted convenience.
 
 ## Models
 
-The bundled catalog seeds commonly available GMI Cloud route ids, including:
+The plugin catalog seeds commonly available GMI Cloud route ids, including:
 
 - `gmi/zai-org/GLM-5.1-FP8`
 - `gmi/deepseek-ai/DeepSeek-V3.2`

extensions/browser/src/cli/browser-cli.test-support.ts

@@ -43,28 +43,3 @@ export function getBrowserCliRuntimeCapture(): CliRuntimeCapture {
 export function getBrowserCliRuntime() {
   return getBrowserCliRuntimeCapture().defaultRuntime;
 }
-
-/** Provides a mock module shape for defaultRuntime imports. */
-export async function mockBrowserCliDefaultRuntime() {
-  browserCliRuntimeState.capture ??= createCliRuntimeCapture();
-  return { defaultRuntime: browserCliRuntimeState.capture.defaultRuntime };
-}
-
-/** Runs a command action through the same error callback shape as the real helper. */
-export async function runCommandWithRuntimeMock(
-  _runtime: unknown,
-  action: () => Promise<void>,
-  onError: (err: unknown) => void,
-) {
-  return await action().catch(onError);
-}
-
-/** Provides a mock module shape for core runCommandWithRuntime imports. */
-export async function createBrowserCliUtilsMockModule() {
-  return { runCommandWithRuntime: runCommandWithRuntimeMock };
-}
-
-/** Provides a mock module shape for Browser CLI runtime imports. */
-export async function createBrowserCliRuntimeMockModule() {
-  return await mockBrowserCliDefaultRuntime();
-}

extensions/codex/src/app-server/sandbox-exec-server.test-helpers.ts

@@ -228,11 +228,6 @@ export async function waitForHttpBodyDeltas(
   throw new Error(`expected ${count} http body deltas`);
 }
 
-/** Quotes a value for POSIX shell snippets embedded in sandbox test commands. */
-export function shellQuote(value: string): string {
-  return `'${value.replaceAll("'", `'"'"'`)}'`;
-}
-
 /** Sends one JSON-RPC request and resolves/rejects from the matching response id. */
 export function rpc(socket: WebSocket, method: string, params: unknown): Promise<unknown> {
   const id = Math.floor(Math.random() * 1_000_000);

extensions/cohere/README.md

@@ -0,0 +1,13 @@
+# OpenClaw Cohere Provider
+
+Official OpenClaw provider plugin for Cohere's OpenAI-compatible Compatibility
+API.
+
+Install from OpenClaw:
+
+```bash
+openclaw plugins install @openclaw/cohere-provider
+openclaw gateway restart
+```
+
+Configure a Cohere API key, then select `cohere/command-a-03-2025`.