@yyy9527/openclaw-manager 0.2.1 → 0.2.3

package/README.md

@@ -32,6 +32,67 @@ clawctl --help
 > 首次执行 `clawctl deploy` 需要拉取官方镜像，可能耗时较长（取决于网络）。
 > clawhub 在 macOS 安装后，只有把 skills 安装到 `OPENCLAW_HOME_ROOT` 可见目录并挂载到容器，才能持久化并在容器内生效。
 
+### 2.1 在另一台电脑安装
+
+在新机器上只需用 npm 安装包并按下面步骤做一次初始化即可使用。
+
+**前置：**
+
+- macOS，已安装 **Node.js**（建议 18+）和 **Docker Desktop**（并已启动）
+- 准备好 Git 令牌、飞书 webhook 等（见下方配置）
+
+**安装与首次配置：**
+
+```bash
+# 全局安装（推荐指定版本以便复现）
+npm i -g @yyy9527/openclaw-manager
+
+# 进入包所在目录（全局安装时通常在 node 的 lib/node_modules 下），或从本仓库复制配置到任意目录
+# 方式 A：从本仓库 clone 后，在仓库根目录操作
+cd /path/to/docker-claw
+cp config/openclaw.env.example config/openclaw.env
+cp .env.example .env
+# 编辑 .env 和 config/openclaw.env，填入 GIT_TOKEN、FEISHU_WEBHOOK_URL 等
+# 如希望首次 deploy 自动切到 Qwen，设置：
+# OPENCLAW_AUTO_SET_QWEN_ON_DEPLOY=true
+
+# 方式 B：仅用包内自带默认配置（需先找到包路径）
+# npm root -g 可查看全局 node_modules 路径，包名 @yyy9527/openclaw-manager
+# 复制该包内 config/openclaw.env.example -> config/openclaw.env，.env.example -> .env 并编辑
+
+# 使用默认配置时，clawctl 会读取「当前工作目录」下的 config/openclaw.env 与 .env
+# 因此建议：新建一个目录如 ~/openclaw-workspace，把 .env 和 config/openclaw.env 放进去，之后在该目录下执行 clawctl
+cd ~/openclaw-workspace
+clawctl setup
+clawctl deploy
+clawctl list-claw
+clawctl status-claw master   # 或你的实例名
+```
+
+**常用命令示例（在新电脑上）：**
+
+```bash
+clawctl --help
+clawctl check-env
+clawctl deploy
+clawctl list-claw
+clawctl start-claw master
+clawctl status-claw master
+clawctl chat-claw master
+```
+
+指定配置与敏感变量文件（多环境时）：
+
+```bash
+clawctl --config ./config/openclaw.prod.env --env-file ./.env.prod status
+```
+
+安装指定版本（例如 0.2.2）：
+
+```bash
+npm i -g @yyy9527/openclaw-manager@0.2.2
+```
+
 ## 3. 常用命令
 
 - `clawctl --help`：查看友好的 CLI 帮助
@@ -99,6 +160,7 @@ npm run ctl -- --config ./config/openclaw.prod.env --env-file ./.env.prod apply-
 > 若出现 `Rate limit exceeded`，请先执行 `clawhub login` 再重试 `clawctl sync-skills`。
 > 如果 TUI 报 `No API key found for provider "anthropic"`，先执行 `clawctl apply-config`。
 > 如果 TUI 报 `not connected to gateway`，通常是网关刚重启尚未就绪；`chat-claw` 内置等待逻辑，超时可执行 `clawctl apply-config` 后重试。
+> 若希望首次部署自动避免 anthropic 缺 key 问题，可在配置中开启 `OPENCLAW_AUTO_SET_QWEN_ON_DEPLOY=true`。
 
 ### 非交互切换到厂商 Qwen
 
@@ -191,4 +253,13 @@ npm login
 npm publish --access public
 ```
 
+使用 `.env` 中的 `NPM_TOKEN` 发布时（例如 CI 或本机已配置）：
+
+```bash
+# 在项目根目录
+printf '//registry.npmjs.org/:_authToken=%s\n' "${NPM_TOKEN}" > .npmrc
+export NPM_TOKEN   # 若未导出，先 source .env 或 export NPM_TOKEN=你的令牌
+npm publish --access public
+```
+
 > 当前包名：`@yyy9527/openclaw-manager`。CLI 主命令为 `clawctl`。

package/config/openclaw.env

@@ -9,6 +9,7 @@ OPENCLAW_HOME_ROOT=${HOME}/openclaws
 OPENCLAW_SHARED_SKILLS_DIR=${OPENCLAW_HOME_ROOT}/shared/skills
 OPENCLAW_ENABLE_CLAWHUB_SKILLS=true
 OPENCLAW_CLAWHUB_INSTALL_RETRIES=8
+OPENCLAW_AUTO_SET_QWEN_ON_DEPLOY=false
 OPENCLAW_FORCE_OLLAMA_AFTER_APPLY=false
 OPENCLAW_ALLOW_OLLAMA_OVERRIDE=false
 OLLAMA_BASE_URL=http://host.docker.internal:11434

package/config/openclaw.env.example

@@ -27,6 +27,8 @@ OPENCLAW_SHARED_SKILLS_DIR=${OPENCLAW_HOME_ROOT}/shared/skills
 OPENCLAW_ENABLE_CLAWHUB_SKILLS=true
 # clawhub 安装重试次数（网络超时时自动重试）
 OPENCLAW_CLAWHUB_INSTALL_RETRIES=8
+# 是否在 deploy 后自动执行 set-qwen + apply-config（默认 false）
+OPENCLAW_AUTO_SET_QWEN_ON_DEPLOY=false
 # 是否在 apply-config 后强制回写 Ollama 模型（默认 false）
 OPENCLAW_FORCE_OLLAMA_AFTER_APPLY=false
 # 是否允许执行 bootstrap-models 覆盖当前主模型（默认 false）

package/config/openclaw.test.env

@@ -0,0 +1,21 @@
+# 测试配置：单实例 xiaomo（用于包流程自测）
+OPENCLAW_IMAGE=ghcr.io/openclaw/openclaw
+OPENCLAW_VERSION=latest
+OPENCLAW_INSTANCE_IDS=xiaomo
+OPENCLAW_NAME_PREFIX=openclaw
+OPENCLAW_BASE_HTTP_PORT=3200
+OPENCLAW_CONTAINER_PORT=18789
+OPENCLAW_HOME_ROOT=${HOME}/openclaws
+OPENCLAW_SHARED_SKILLS_DIR=${OPENCLAW_HOME_ROOT}/shared/skills
+OPENCLAW_ENABLE_CLAWHUB_SKILLS=false
+OPENCLAW_CLAWHUB_INSTALL_RETRIES=8
+OPENCLAW_AUTO_SET_QWEN_ON_DEPLOY=false
+OPENCLAW_FORCE_OLLAMA_AFTER_APPLY=false
+OPENCLAW_ALLOW_OLLAMA_OVERRIDE=false
+OLLAMA_BASE_URL=http://host.docker.internal:11434
+OLLAMA_MODEL=qwen3.5:27b
+OLLAMA_API_KEY=ollama-local
+GIT_PLATFORM=gitee
+GIT_REPO=yangyiyuan0825/openclaws
+GIT_API_BASE=https://gitee.com/api/v5
+FEISHU_ENABLED=true

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@yyy9527/openclaw-manager",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "description": "OpenClaw multi-instance manager for macOS with docker, TUI, and collaboration workflow.",
   "private": false,
   "license": "MIT",
   "type": "module",
   "bin": {
-    "clawctl": "./scripts/openclaw_ctl.sh"
+    "clawctl": "scripts/openclaw_ctl.sh"
   },
   "files": [
     "scripts/",
@@ -41,6 +41,7 @@
     "bootstrap-models": "bash ./scripts/openclaw_ctl.sh bootstrap-models",
     "set-model:qwen": "bash ./scripts/openclaw_ctl.sh set-qwen",
     "health-check": "bash ./scripts/openclaw_ctl.sh health-check",
-    "self-test": "bash ./scripts/openclaw_ctl.sh self-test"
+    "self-test": "bash ./scripts/openclaw_ctl.sh self-test",
+    "test": "bash ./scripts/test_create_claw.sh"
   }
 }

package/scripts/install_openclaw.sh

@@ -53,6 +53,7 @@ check_required_vars() {
   fi
   : "${OPENCLAW_HOME_ROOT:?OPENCLAW_HOME_ROOT 未配置}"
   OPENCLAW_SHARED_SKILLS_DIR="${OPENCLAW_SHARED_SKILLS_DIR:-${OPENCLAW_HOME_ROOT}/shared/skills}"
+  OPENCLAW_AUTO_SET_QWEN_ON_DEPLOY="${OPENCLAW_AUTO_SET_QWEN_ON_DEPLOY:-false}"
 }
 
 split_instances() {
@@ -109,6 +110,14 @@ main() {
     i=$((i + 1))
   done
 
+  if [ "${OPENCLAW_AUTO_SET_QWEN_ON_DEPLOY}" = "true" ]; then
+    log "检测到 OPENCLAW_AUTO_SET_QWEN_ON_DEPLOY=true，自动切换到 Qwen 并应用配置"
+    OPENCLAW_CONFIG_FILE="${CONFIG_FILE}" OPENCLAW_DOTENV_FILE="${ENV_FILE}" \
+      "${PROJECT_ROOT}/scripts/set_qwen_vendor_model.sh"
+    OPENCLAW_CONFIG_FILE="${CONFIG_FILE}" OPENCLAW_DOTENV_FILE="${ENV_FILE}" \
+      "${PROJECT_ROOT}/scripts/apply_config.sh"
+  fi
+
   if ! "${PROJECT_ROOT}/scripts/bootstrap_models.sh"; then
     log "模型引导未完全成功，可稍后手动执行：npm run bootstrap-models"
   fi

package/scripts/openclaw_ctl.sh

@@ -1,7 +1,17 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SOURCE_PATH="${BASH_SOURCE[0]}"
+while [ -L "${SOURCE_PATH}" ]; do
+  LINK_DIR="$(cd -P "$(dirname "${SOURCE_PATH}")" && pwd)"
+  LINK_TARGET="$(readlink "${SOURCE_PATH}")"
+  if [[ "${LINK_TARGET}" != /* ]]; then
+    SOURCE_PATH="${LINK_DIR}/${LINK_TARGET}"
+  else
+    SOURCE_PATH="${LINK_TARGET}"
+  fi
+done
+SCRIPT_DIR="$(cd -P "$(dirname "${SOURCE_PATH}")" && pwd)"
 PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
 DEFAULT_CONFIG_FILE="${PROJECT_ROOT}/config/openclaw.env"
 DEFAULT_DOTENV_FILE="${PROJECT_ROOT}/.env"

package/scripts/test_create_claw.sh

@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+# 测试用例：使用 test 配置执行「创建龙虾」流程并做简单断言
+# 用于回归：check-env -> deploy -> list-claw 含 xiaomo -> status-claw xiaomo 成功
+set -euo pipefail
+
+SOURCE_PATH="${BASH_SOURCE[0]}"
+while [ -L "${SOURCE_PATH}" ]; do
+  LINK_DIR="$(cd -P "$(dirname "${SOURCE_PATH}")" && pwd)"
+  LINK_TARGET="$(readlink "${SOURCE_PATH}")"
+  if [[ "${LINK_TARGET}" != /* ]]; then
+    SOURCE_PATH="${LINK_DIR}/${LINK_TARGET}"
+  else
+    SOURCE_PATH="${LINK_TARGET}"
+  fi
+done
+SCRIPT_DIR="$(cd -P "$(dirname "${SOURCE_PATH}")" && pwd)"
+PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
+CONFIG="${PROJECT_ROOT}/config/openclaw.test.env"
+ENV_FILE="${PROJECT_ROOT}/.env"
+CTL="${PROJECT_ROOT}/scripts/openclaw_ctl.sh"
+
+if [ ! -f "${ENV_FILE}" ]; then
+  echo "跳过 deploy：未找到 .env，请复制 .env.example 为 .env 并填写后重试。仅执行 list-claw/status-claw 断言（需已有 xiaomo 容器）。"
+  SKIP_DEPLOY=1
+else
+  SKIP_DEPLOY=0
+fi
+
+run_ctl() {
+  OPENCLAW_CONFIG_FILE="${CONFIG}" OPENCLAW_DOTENV_FILE="${ENV_FILE}" bash "${CTL}" "$@"
+}
+
+echo "=== 1. check-env ==="
+run_ctl check-env
+
+if [ "${SKIP_DEPLOY}" = 0 ]; then
+  echo "=== 2. deploy（test 配置单实例 xiaomo）==="
+  run_ctl deploy
+else
+  echo "=== 2. 跳过 deploy ==="
+fi
+
+echo "=== 3. list-claw（断言含 xiaomo）==="
+list_out="$(run_ctl list-claw)"
+echo "${list_out}"
+if ! echo "${list_out}" | grep -q 'xiaomo'; then
+  echo "断言失败：list-claw 输出中未包含 xiaomo" >&2
+  exit 1
+fi
+
+echo "=== 4. status-claw xiaomo ==="
+run_ctl status-claw xiaomo
+
+echo "=== 测试通过 ==="