@dhf-openclaw/grix 0.4.7 → 0.4.8

package/README.md

@@ -91,7 +91,7 @@ If you need the detailed admin-side requirements, see the companion Grix admin p
 
 After install, OpenClaw can surface these bundled skills from this plugin:
 
-- `grix-auth-access`: inspect current readiness, guide website registration/login, create or reuse `provider_type=3` API agents, install or enable `@dhf-openclaw/grix-admin`, and configure the main `channels.grix` path plus required tools
+- `grix-auth-access`: inspect current readiness, follow the protocol-based main-agent path, create or reuse `provider_type=3` API agents when an access token is already available, install or enable `@dhf-openclaw/grix-admin`, and configure the main `channels.grix` path plus required tools
 - `egg-install`: handle Shrimp Pond egg install chats, confirm targets with the user in the current private conversation, execute persona.zip or skill.zip installation with正规步骤, and report progress or failures in normal dialogue
 - `message-send`: send current-session or cross-session Grix messages
 - `message-unsend`: unsend previously sent Grix messages
@@ -302,7 +302,7 @@ Grix fully adapts the OpenClaw communication protocol, so OpenClaw interaction a
 
 1. inspect whether the local OpenClaw main agent is already configured
 2. if the main channel is already configured, tell the user they can log in to [https://grix.dhf.pub/](https://grix.dhf.pub/) immediately
-3. otherwise guide registration or login
+3. otherwise continue with the protocol-based agent setup path
 4. create or reuse a `provider_type=3` API agent
 5. install or enable `@dhf-openclaw/grix-admin` when group-governance capability is requested
 6. configure the OpenClaw main `channels.grix` entry and required tools block

package/dist/index.js

@@ -1934,6 +1934,9 @@ function deleteAccountFromConfigSection(params) {
 // src/actions.ts
 var WS_ACTIONS = /* @__PURE__ */ new Set(["unsend", "delete"]);
 var DISCOVERABLE_ACTIONS = ["unsend", "delete"];
+function hasConfiguredEnabledAccount(cfg) {
+  return listAibotAccountIds(cfg).map((accountId) => resolveAibotAccount({ cfg, accountId })).some((account) => account.enabled && account.configured);
+}
 function toSnakeCaseKey(key) {
   return key.replace(/([A-Z]+)([A-Z][a-z])/g, "$1_$2").replace(/([a-z0-9])([A-Z])/g, "$1_$2").toLowerCase();
 }
@@ -1950,12 +1953,11 @@ function readStringishParam(params, key) {
   return void 0;
 }
 var aibotMessageActions = {
-  listActions: ({ cfg }) => {
-    const hasConfiguredAccount = listAibotAccountIds(cfg).map((accountId) => resolveAibotAccount({ cfg, accountId })).some((account) => account.enabled && account.configured);
-    if (!hasConfiguredAccount) {
-      return [];
+  describeMessageTool: ({ cfg }) => {
+    if (!hasConfiguredEnabledAccount(cfg)) {
+      return null;
     }
-    return DISCOVERABLE_ACTIONS;
+    return { actions: DISCOVERABLE_ACTIONS };
   },
   supportsAction: ({ action }) => {
     const normalizedAction = String(action ?? "").trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhf-openclaw/grix",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "Connect OpenClaw to grix.dhf.pub for OpenClaw website management with mobile PWA support",
   "type": "module",
   "main": "./dist/index.js",

package/skills/grix-auth-access/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: grix-auth-access
-description: 用 Grix 网站公开鉴权 API 完成邮箱验证码发送、邮箱注册、邮箱或账号密码登录拿 token、创建 `provider_type=3` 的 Agent API 类型 agent，并按 `@dhf-openclaw/grix` 与 `@dhf-openclaw/grix-admin` 说明为 OpenClaw 主 agent 配置 grix 渠道和群管理能力；插件接入目标是让用户在 `https://grix.dhf.pub/` 管理 OpenClaw，并支持移动端 PWA 页面。
+description: 用 Grix 协议创建或复用 `provider_type=3` 的 Agent API 类型 agent，并按 `@dhf-openclaw/grix` 与 `@dhf-openclaw/grix-admin` 说明为 OpenClaw 主 agent 配置 grix 渠道和群管理能力。插件接入目标是让用户在 `https://grix.dhf.pub/` 管理 OpenClaw，并支持移动端 PWA 页面。
 ---
 
 # Grix Auth Access
@@ -9,15 +9,10 @@ Use the bundled scripts and local OpenClaw CLI to bootstrap Grix channel access
 
 ## Business Capabilities
 
-1. `send-email-code`
-2. `register`
-3. `login`
-4. `create-api-agent`
-5. `inspect@dhf-openclaw`
-6. `configure@dhf-openclaw`
-7. `bootstrap@dhf-openclaw`
-
-`fetch-captcha` is only a helper step for `reset` and `change_password` email-code sends.
+1. `create-api-agent`
+2. `inspect@dhf-openclaw`
+3. `configure@dhf-openclaw`
+4. `bootstrap@dhf-openclaw`
 
 ## Explain Grix
 
@@ -34,52 +29,21 @@ When the user asks what Grix is, what they gain after setup, or whether it is wo
 
 If the user wants the main OpenClaw agent to gain Grix channel ability quickly:
 
-1. If the request is first to verify whether the local machine is already ready, run `inspect@dhf-openclaw` before any remote login or local mutation.
+1. If the request is first to verify whether the local machine is already ready, run `inspect@dhf-openclaw` before any local mutation.
 2. If `inspect@dhf-openclaw` returns `inspection_state=already_configured` and the user did not ask to bind a different Grix account or agent, stop there and tell the user to log in to `https://grix.dhf.pub/` directly.
 3. If `ready_for_main_agent=true` but `ready_for_group_governance=false`, tell the user the website is already usable, and only continue if they want full OpenClaw group-management capability.
 4. Otherwise prefer `bootstrap@dhf-openclaw`.
-5. If the user already has `access_token`, use it directly.
-6. Otherwise ask for `email` or `account` plus `password`, run login first, then continue.
-7. Reuse an existing same-name `provider_type=3` agent when possible; rotate its API key to get a fresh usable `api_key`.
-8. If no matching API agent exists, create one.
-9. Inspect local OpenClaw plugin state, main `channels.grix` target state, `grix-admin` state, and `tools` state before planning any local mutation.
-10. Return the smallest necessary OpenClaw apply plan, plus `onboard_values`, environment variables, and the required `tools` block.
-11. Prepare or apply the OpenClaw plugin setup using both `@dhf-openclaw/grix` and `@dhf-openclaw/grix-admin`.
+5. Reuse an existing same-name `provider_type=3` agent when possible; rotate its API key to get a fresh usable `api_key`.
+6. If no matching API agent exists, create one.
+7. Inspect local OpenClaw plugin state, main `channels.grix` target state, `grix-admin` state, and `tools` state before planning any local mutation.
+8. Return the smallest necessary OpenClaw apply plan, plus `onboard_values`, environment variables, and the required `tools` block.
+9. Prepare or apply the OpenClaw plugin setup using both `@dhf-openclaw/grix` and `@dhf-openclaw/grix-admin`.
 
 ## Workflow
 
-### A. Send registration email code
-
-1. Ask for `email`.
-2. Run `scripts/grix_auth.py send-email-code --email ... --scene register`.
-
-### A2. Send reset or change-password email code
-
-1. Ask for `email`.
-2. Run `scripts/grix_auth.py fetch-captcha`.
-3. Show `captcha_image_path` to the user if present.
-4. Ask the user to read the captcha text.
-5. Run `scripts/grix_auth.py send-email-code --email ... --scene reset --captcha-id ... --captcha-value ...`.
-
-### B. Register
-
-1. Ask for `email`, `password`, and `email verification code`.
-2. Run `scripts/grix_auth.py register --email ... --password ... --email-code ...`.
-3. Return top-level `access_token`, `refresh_token`, `expires_in`, and `user_id`.
-
-### C. Login and get token
-
-1. Ask for `email` or `account` plus `password`.
-2. Prefer email login when the user gives an email address:
-   - `scripts/grix_auth.py login --email ... --password ...`
-3. If the user gives a username instead:
-   - `scripts/grix_auth.py login --account ... --password ...`
-4. Return top-level `access_token`, `refresh_token`, `expires_in`, and `user_id`.
-5. Tell the user they can also log in to `https://grix.dhf.pub/` directly to start using it.
-
-### D. Create provider_type=3 agent
+### A. Create provider_type=3 agent
 
-1. Require `access_token`.
+1. Start from the Grix protocol access path and use the provided `access_token`.
 2. Ask for `agent_name`.
 3. By default, prefer reusing an existing same-name `provider_type=3` agent:
    - list existing agents
@@ -88,7 +52,7 @@ If the user wants the main OpenClaw agent to gain Grix channel ability quickly:
 4. Run `scripts/grix_auth.py create-api-agent --access-token ... --agent-name ...`.
 5. Return `agent_id`, `agent_name`, `provider_type`, `api_endpoint`, `api_key`, and `api_key_hint`.
 
-### E. Configure OpenClaw grix channel
+### B. Configure OpenClaw grix channel
 
 1. Require `agent_id`, `api_endpoint`, and `api_key`.
 2. Default channel name: `grix-main`.
@@ -133,7 +97,7 @@ If the user wants the main OpenClaw agent to gain Grix channel ability quickly:
 
    - `openclaw gateway restart`
 
-### F. Inspect local OpenClaw readiness
+### C. Inspect local OpenClaw readiness
 
 Use:
 
@@ -149,9 +113,9 @@ This action:
 4. checks whether `tools.profile`, `tools.alsoAllow`, and `tools.sessions.visibility` match the required group-governance settings
 5. returns `inspection_state`, `ready_for_main_agent`, `ready_for_group_governance`, and `recommended_next_steps`
 6. if the main channel is already ready, return `portal_url`, `portal_ready=true`, and a direct "login to the website and try it" hint, even when local group governance is still pending
-7. never logs in, creates agents, or mutates local OpenClaw state
+7. never mutates local OpenClaw state
 
-### G. One-shot bootstrap
+### D. One-shot bootstrap
 
 Use:
 
@@ -161,7 +125,7 @@ scripts/grix_auth.py bootstrap@dhf-openclaw ...
 
 This action can:
 
-1. login when needed
+1. use a provided `access_token`
 2. reuse-or-create the API agent
 3. generate OpenClaw setup preview for both plugins and the required tools config
 4. apply OpenClaw setup when `--apply` is present
@@ -169,36 +133,16 @@ This action can:
 
 ## Guardrails
 
-1. Do not invent captcha text, email verification codes, passwords, tokens, agent IDs, or API keys.
-2. Do not call `send-email-code` for `reset` or `change_password` before obtaining a fresh `captcha_id`.
-3. Treat `register`, `create-api-agent`, key rotation on reused agents, and `configure@dhf-openclaw --apply` as side-effecting operations.
-4. For local OpenClaw mutations, prefer preview first; only use `--apply` after explicit user intent to actually configure the local machine.
-5. Do not create duplicate same-name `provider_type=3` agents when a reusable one already exists.
-6. Keep token and API key output exact when the user asks for them.
-7. `provider_type` for created or reused Grix agent must be `3`.
-8. When configuring the main agent, prefer updating base `channels.grix` over inventing extra accounts.
-9. Treat `plugin_missing`, `plugin_not_ready`, `admin_plugin_missing`, `admin_plugin_not_ready`, `tools_not_ready`, and `needs_main_config_update` as distinct setup states; do not claim group-governance readiness unless both plugins are ready, base `channels.grix` matches the target, and the required tools block is active.
-10. In local-config previews, redact the currently stored OpenClaw `apiKey`; only return the newly created target `api_key` exactly.
-11. If `inspect@dhf-openclaw` says the main agent is already configured and the user did not ask for a different account or agent target, stop instead of continuing into login or local mutation.
-12. When the result says `portal_ready=true`, explicitly tell the user they can log in to `https://grix.dhf.pub/` directly to experience Grix.
-13. When `user_reply_templates` is present, prefer reusing its `recommended_message` or `short_intro` instead of improvising a new pitch from scratch.
-
-## Error Handling
-
-1. `图形验证码错误或已过期`:
-   for `reset` or `change_password`, fetch a new captcha and retry send-email-code.
-2. `该邮箱已被注册`:
-   stop registration and switch to login if the user wants.
-3. `邮箱验证码错误或已过期`:
-   ask the user for a new email verification code.
-4. `用户不存在或密码错误`:
-   ask the user to re-check the login identity and password.
-5. `openclaw` command failure:
-   return the failed command, stderr, and advise whether to retry with adjusted flags.
-6. Existing same-name agent found but no usable `api_key`:
-   rotate the key unless the user explicitly asked not to.
-7. Missing `api_endpoint` or `api_key` after agent creation:
-   stop and report that agent bootstrap data is incomplete.
+1. Do not invent tokens, agent IDs, or API keys.
+2. Treat `create-api-agent`, key rotation on reused agents, and `configure@dhf-openclaw --apply` as side-effecting operations.
+3. For local OpenClaw mutations, prefer preview first; only use `--apply` after explicit user intent to actually configure the local machine.
+4. Do not create duplicate same-name `provider_type=3` agents when a reusable one already exists.
+5. Keep API key output exact when the user asks for it.
+6. `provider_type` for created or reused Grix agent must be `3`.
+7. When configuring the main agent, prefer updating base `channels.grix` over inventing extra accounts.
+8. Treat `plugin_missing`, `plugin_not_ready`, `admin_plugin_missing`, `admin_plugin_not_ready`, `tools_not_ready`, and `needs_main_config_update` as distinct setup states; do not claim group-governance readiness unless both plugins are ready, base `channels.grix` matches the target, and the required tools block is active.
+9. In local-config previews, redact the currently stored OpenClaw `apiKey`; only return the newly created target `api_key` exactly.
+10. If `inspect@dhf-openclaw` says the main agent is already configured and the user did not ask for a different agent target, stop instead of continuing into setup mutation.
 
 ## Script Contract
 
@@ -206,29 +150,24 @@ Script: `scripts/grix_auth.py`
 
 Actions:
 
-1. `fetch-captcha`
-2. `send-email-code`
-3. `register`
-4. `login`
-5. `create-api-agent`
-6. `inspect@dhf-openclaw`
-7. `configure@dhf-openclaw`
-8. `bootstrap@dhf-openclaw`
+1. `create-api-agent`
+2. `inspect@dhf-openclaw`
+3. `configure@dhf-openclaw`
+4. `bootstrap@dhf-openclaw`
 
 Success shape highlights:
 
-1. `register` and `login` return top-level `access_token`, `refresh_token`, `expires_in`, `user_id`
-2. `register`, `login`, `inspect@dhf-openclaw`, `configure@dhf-openclaw`, and `bootstrap@dhf-openclaw` can return `portal_url`, `portal_ready`, and `portal_hint`
+1. `create-api-agent` returns top-level `agent_id`, `api_endpoint`, `api_key`, `api_key_hint`, and whether the agent was reused or newly created
+2. `inspect@dhf-openclaw`, `configure@dhf-openclaw`, and `bootstrap@dhf-openclaw` can return `portal_url`, `portal_ready`, and `portal_hint`
 3. `inspect@dhf-openclaw`, `configure@dhf-openclaw`, and `bootstrap@dhf-openclaw` also return `grix_intro`, `grix_highlights`, and `user_reply_templates` so the agent can explain the concept to the user consistently
-4. `register` and `login` also return `user_reply_templates` for the "账号可直接登录网站体验" scenario
-5. `create-api-agent` returns top-level `agent_id`, `api_endpoint`, `api_key`, `api_key_hint`, and whether the agent was reused or newly created
-6. `inspect@dhf-openclaw` returns `inspection_state`, `plugin_status`, `admin_plugin_status`, redacted current main grix config, current tools config, channel consistency checks, tools checks, readiness booleans, and `recommended_next_steps`
-7. `configure@dhf-openclaw` returns `setup_state`, `plugin_status`, `admin_plugin_status`, current and next main grix config, current and next tools config, minimal plugin commands, `onboard_values`, environment variables, required tools config, and `command_results` when `--apply` is used
-8. `bootstrap@dhf-openclaw` returns nested `login`, `created_agent`, `openclaw_setup`, top-level `channel_credentials`, and `bootstrap_state`
+4. `create-api-agent` returns the `provider_type=3` agent data
+5. `inspect@dhf-openclaw` returns `inspection_state`, `plugin_status`, `admin_plugin_status`, redacted current main grix config, current tools config, channel consistency checks, tools checks, readiness booleans, and `recommended_next_steps`
+6. `configure@dhf-openclaw` returns `setup_state`, `plugin_status`, `admin_plugin_status`, current and next main grix config, current and next tools config, minimal plugin commands, `onboard_values`, environment variables, required tools config, and `command_results` when `--apply` is used
+7. `bootstrap@dhf-openclaw` returns nested `created_agent`, `openclaw_setup`, top-level `channel_credentials`, and `bootstrap_state`
 
 ## References
 
-1. Read [references/api-contract.md](references/api-contract.md) for auth and API-agent creation routes.
+1. Read [references/api-contract.md](references/api-contract.md) for API-agent creation routes.
 2. Read [references/openclaw-setup.md](references/openclaw-setup.md) for the `@dhf-openclaw/grix` + `@dhf-openclaw/grix-admin` setup flow.
 3. Read [references/grix-concepts.md](references/grix-concepts.md) when the user needs a clear product/concept explanation.
 4. Read [references/user-replies.md](references/user-replies.md) when the user needs short, direct pitch or status replies.

package/skills/grix-auth-access/agents/openai.yaml

@@ -1,4 +1,4 @@
 interface:
   display_name: "Grix Auth Access"
   short_description: "Inspect, explain, or bootstrap Grix for OpenClaw."
-  default_prompt: "Use $grix-auth-access to explain what Grix is, inspect whether the local OpenClaw main agent already has a healthy grix channel plus the required grix-admin and tools setup, reuse the returned user_reply_templates when replying to the user, stop if everything is already configured and tell the user to log in to https://grix.dhf.pub/ directly, or otherwise log in, reuse-or-create a provider_type=3 API agent, install or enable @dhf-openclaw/grix-admin, and return the minimal main-agent setup path including tools.alsoAllow for message, grix_group, and grix_agent_admin."
+  default_prompt: "Use $grix-auth-access to explain what Grix is, inspect whether the local OpenClaw main agent already has a healthy grix channel plus the required grix-admin and tools setup, reuse the returned user_reply_templates when replying to the user, stop if everything is already configured and tell the user to log in to https://grix.dhf.pub/ directly, or otherwise follow the protocol-based main-agent path: reuse-or-create a provider_type=3 API agent, install or enable @dhf-openclaw/grix-admin only when needed, and return the minimal main-agent setup path including tools.alsoAllow for message, grix_group, and grix_agent_admin."

package/skills/grix-auth-access/references/api-contract.md

@@ -3,24 +3,10 @@
 ## Base
 
 1. Website: `https://grix.dhf.pub/`
-2. Public auth API base: `https://grix.dhf.pub/v1`
+2. Public Grix API base: `https://grix.dhf.pub/v1`
 
 ## Route Mapping
 
-### Auth business actions
-
-| Action | Method | Route |
-|---|---|---|
-| `send-email-code` | `POST` | `/auth/send-code` |
-| `register` | `POST` | `/auth/register` |
-| `login` | `POST` | `/auth/login` |
-
-Helper prerequisite:
-
-| Helper Action | Method | Route | Purpose |
-|---|---|---|---|
-| `fetch-captcha` | `GET` | `/auth/captcha` | Fetch a fresh captcha before `send-email-code` for `reset` or `change_password` |
-
 ### Agent bootstrap action
 
 | Action | Method | Route | Auth |
@@ -31,54 +17,6 @@ Helper prerequisite:
 
 ## Payloads
 
-### `send-email-code`
-
-```json
-{
-  "email": "user@example.com",
-  "scene": "register"
-}
-```
-
-For `reset` and `change_password`, `captcha_id` and `captcha_value` are still required:
-
-```json
-{
-  "email": "user@example.com",
-  "scene": "reset",
-  "captcha_id": "captcha-id",
-  "captcha_value": "ab12"
-}
-```
-
-### `register`
-
-```json
-{
-  "email": "user@example.com",
-  "password": "secret123",
-  "email_code": "123456",
-  "device_id": "web_xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
-  "platform": "web"
-}
-```
-
-### `login`
-
-```json
-{
-  "account": "user@example.com",
-  "password": "secret123",
-  "device_id": "web_xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
-  "platform": "web"
-}
-```
-
-`account` can be either:
-
-1. email
-2. username
-
 ### `create-api-agent`
 
 ```json
@@ -90,7 +28,7 @@ For `reset` and `change_password`, `captcha_id` and `captcha_value` are still re
 
 `provider_type=3` means Agent API type.
 
-### Reuse flow
+## Reuse flow
 
 When the same-name `provider_type=3` agent already exists, the skill should:
 
@@ -101,19 +39,6 @@ When the same-name `provider_type=3` agent already exists, the skill should:
 
 ## Success Highlights
 
-### Captcha helper
-
-`fetch-captcha` returns `captcha_id` and `b64s`. The bundled script also returns `captcha_image_path` when image decoding succeeds. This helper is only needed for `reset` and `change_password` email-code sends.
-
-### `register` / `login`
-
-The bundled script lifts these fields to the top level:
-
-1. `access_token`
-2. `refresh_token`
-3. `expires_in`
-4. `user_id`
-
 ### `create-api-agent`
 
 The bundled script lifts these fields to the top level:
@@ -128,8 +53,4 @@ The bundled script lifts these fields to the top level:
 
 ## Common Errors
 
-1. `图形验证码错误或已过期` for `reset` or `change_password`
-2. `邮箱验证码错误或已过期`
-3. `该邮箱已被注册`
-4. `用户不存在或密码错误`
-5. create-agent or rotate-key returns missing `api_endpoint` or `api_key`
+1. create-agent or rotate-key returns missing `api_endpoint` or `api_key`

package/skills/grix-auth-access/references/grix-concepts.md

@@ -21,10 +21,10 @@
 
 ### Short paragraph
 
-这个插件把 OpenClaw 的渠道交互和 agent 通信直接接到 Grix，核心目标是让你在 `https://grix.dhf.pub/` 管理 OpenClaw，并在手机上通过 PWA 页面使用。除此之外，它也支持多 agent 建群互聊、agent 私聊和 agent 间互通。配置上尽量做到了简单，只要把这个技能交给 OpenClaw、Claude 或 Codex，就可以先检查现状，已经配置好就直接停下，否则自动继续完成配置；如果用户还要在 OpenClaw 里直接做群管理，还会继续补齐 `@dhf-openclaw/grix-admin` 和 required tools 配置。
+这个插件把 OpenClaw 的渠道交互和 agent 通信直接接到 Grix，核心目标是让你在 `https://grix.dhf.pub/` 管理 OpenClaw，并在手机上通过 PWA 页面使用。除此之外，它也支持多 agent 建群互聊、agent 私聊和 agent 间互通。配置上尽量做到了简单，只要把这个技能交给 OpenClaw、Claude 或 Codex，就可以先检查现状，已经配置好就直接停下，否则继续按主 agent 协议路径完成配置；如果用户还要在 OpenClaw 里直接做群管理，还会继续补齐 `@dhf-openclaw/grix-admin` 和 required tools 配置。
 
 ## After Setup
 
 1. If the result says `portal_ready=true`, tell the user to log in to `https://grix.dhf.pub/` directly to try it.
-2. If the local main agent is already configured, do not continue into redundant login, install, enable, or restart steps unless the user explicitly wants a different Grix account or agent target.
+2. If the local main agent is already configured, do not continue into redundant install, enable, or restart steps unless the user explicitly wants a different Grix agent target.
 3. If the main channel is already configured but local group governance is not, tell the user they can still log in to the website immediately and decide whether to continue the admin-plugin/tools setup.

package/skills/grix-auth-access/references/user-replies.md

@@ -23,7 +23,3 @@
 ## Needs Setup Reply
 
 这个插件接入是为了在 `https://grix.dhf.pub/` 管理 OpenClaw，并支持移动端 PWA 页面。当前还没有完全配置好，我可以继续帮你完成检查和配置。
-
-## Account Ready Reply
-
-这个插件接入是为了在 `https://grix.dhf.pub/` 管理 OpenClaw，并支持移动端 PWA 页面。账号已经可用，你可以直接登录 `https://grix.dhf.pub/` 体验；如果需要，我也可以继续帮你把 OpenClaw 主通道配好。

package/skills/grix-auth-access/scripts/grix_auth.py

@@ -141,7 +141,7 @@ def build_auth_result(action: str, result: dict):
     payload.update(
         build_portal_guidance(
             True,
-            f"账号已可用，可直接登录 {DEFAULT_PORTAL_URL} 体验。",
+            f"Grix 访问已可用，可直接登录 {DEFAULT_PORTAL_URL} 体验。",
         )
     )
     payload.update(build_user_reply_templates("login_ready"))
@@ -625,7 +625,7 @@ def build_user_reply_templates(scenario: str):
             "并补齐 message、grix_group、grix_agent_admin 这三个工具权限。"
         ),
         "needs_setup": f"{one_liner}当前还没有完全配置好，我可以继续帮你完成检查和配置。",
-        "login_ready": f"{one_liner}账号已经可用，你可以直接登录 {DEFAULT_PORTAL_URL} 体验；如果需要，我也可以继续帮你把 OpenClaw 主通道配好。",
+        "login_ready": f"{one_liner}Grix 访问已经可用，你可以直接登录 {DEFAULT_PORTAL_URL} 体验；如果需要，我也可以继续帮你把 OpenClaw 主通道配好。",
     }
     normalized_scenario = str(scenario or "").strip() or "needs_setup"
     return {
@@ -1335,25 +1335,8 @@ def handle_configure_openclaw(args):
 
 def handle_bootstrap_openclaw(args):
     access_token = (args.access_token or "").strip()
-    login_result = None
     if not access_token:
-        account = (args.email or args.account or "").strip()
-        if not account:
-            raise GrixAuthError("bootstrap@dhf-openclaw requires --access-token or login identity")
-        if not (args.password or "").strip():
-            raise GrixAuthError("bootstrap@dhf-openclaw requires --password when access token is not provided")
-        platform = (args.platform or "").strip() or "web"
-        device_id = (args.device_id or "").strip() or default_device_id(platform)
-        login_result = login_with_credentials(
-            args.base_url,
-            account,
-            args.password.strip(),
-            device_id,
-            platform,
-        )
-        access_token = str(login_result.get("access_token", "")).strip()
-        if not access_token:
-            raise GrixAuthError("login did not return access_token")
+        raise GrixAuthError("bootstrap@dhf-openclaw requires --access-token")
 
     create_result = create_or_reuse_api_agent(
         args.base_url,
@@ -1373,8 +1356,7 @@ def handle_bootstrap_openclaw(args):
     payload = {
         "ok": True,
         "action": "bootstrap@dhf-openclaw",
-        "used_access_token_source": "provided" if (args.access_token or "").strip() else "login",
-        "login": login_result,
+        "used_access_token_source": "provided",
         "created_agent": create_result,
         "openclaw_setup": None,
         "channel_credentials": build_onboard_values(agent_id, api_endpoint, api_key),
@@ -1490,13 +1472,7 @@ def build_parser():
         "bootstrap@dhf-openclaw",
         help="Login if needed, create provider_type=3 agent, then prepare or apply OpenClaw setup",
     )
-    bootstrap_openclaw.add_argument("--access-token", default="")
-    bootstrap_identity = bootstrap_openclaw.add_mutually_exclusive_group(required=False)
-    bootstrap_identity.add_argument("--account")
-    bootstrap_identity.add_argument("--email")
-    bootstrap_openclaw.add_argument("--password", default="")
-    bootstrap_openclaw.add_argument("--device-id", default="")
-    bootstrap_openclaw.add_argument("--platform", default="web")
+    bootstrap_openclaw.add_argument("--access-token", required=True)
     bootstrap_openclaw.add_argument("--agent-name", required=True)
     bootstrap_openclaw.add_argument("--avatar-url", default="")
     bootstrap_openclaw.add_argument("--channel-name", default="grix-main")