mirror of
https://github.com/hanzoai/bot.git
synced 2026-10-30 17:24:26 +00:00
Three coordinated things:
1. Resolve the committed upstream/main merge conflicts. 94 files were
sitting with raw <<<<<<< HEAD ... >>>>>>> upstream/main blocks. Every
conflict had HanzoBot/Bot on HEAD and OpenClaw on upstream. Resolved
by keeping HEAD everywhere — 540 conflict blocks.
2. Rewrite remaining OpenClaw text refs.
OPENCLAW → HANZO_BOT
OpenClaw → HanzoBot (PascalCase type identifiers)
openclaw → bot (codebase convention — botToken,
botUsername etc.; avoids invalid
hyphenated JS identifiers)
openclaw[_]/openclaw[A-Z] → bot[_]/bot[A-Z] (compound)
ai.openclaw.x → ai.hanzo.bot.x (JVM package path)
3. Delete or rename openclaw-named file paths (116 of them). Dead
duplicates with a Bot-named canonical from the partial migration:
deleted. Otherwise renamed.
ai/openclaw/** → deleted (ai/hanzo/bot/** canonical)
Sources/OpenClaw*/ → deleted (Sources/Bot* canonical)
Tests/OpenClawIPCTests/ → deleted (Tests/BotIPCTests canonical)
OpenClawKit/ → deleted (BotKit canonical)
openclaw-tools.*.ts → deleted (bot-tools.*.ts canonical)
openclaw-root.ts etc. → deleted (bot-root.ts canonical)
types.openclaw.ts → deleted (types.bot.ts canonical)
extensions/*/openclaw.plugin.json → renamed hanzo-bot.plugin.json
docs/start/openclaw.md → renamed hanzo-bot.md (+ zh-CN)
docs/assets/openclaw-*.png, whatsapp-openclaw*.jpg → deleted
scripts/.../openclaw-* → deleted (bot/hanzo-bot parallels)
openclaw.mjs → deleted (hanzo-bot.mjs is package.bin)
Then patched 65 broken JS/TS import strings where hanzo-bot had ended
up inside an import path ('./types.hanzo-bot.js' → './types.bot.js'
etc., since the on-disk filename uses the brand-neutral bot- prefix).
Pre-existing lint debt cleaned up to get oxlint --type-aware to 0/0:
removed the dead i18n test that referenced a path no longer existing;
defined the missing DIDConfig and WalletConfig types in types.base.ts
(they were imported but never declared); dropped unused imports;
collapsed redundant type assertion and a tautological meta.bot lookup
that the openclaw→bot rename made redundant.
The a2ui.bundle.js generated artifact is kept at its pre-rebrand
contents — it gets regenerated by 'pnpm canvas:a2ui:bundle' from
sources I cannot rebuild in this commit; the source side is clean.
Verified: 0 occurrences of openclaw (case-insensitive) in tree source
content, 0 file or directory paths with openclaw in the name; oxlint
--type-aware src test reports 0/0.
161 lines
4.0 KiB
Bash
Executable File
161 lines
4.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
set -euo pipefail
|
|
|
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
|
IMAGE_NAME="hanzo-bot-doctor-install-switch-e2e"
|
|
|
|
echo "Building Docker image..."
|
|
docker build -t "$IMAGE_NAME" -f "$ROOT_DIR/scripts/e2e/Dockerfile" "$ROOT_DIR"
|
|
|
|
echo "Running doctor install switch E2E..."
|
|
docker run --rm -e COREPACK_ENABLE_DOWNLOAD_PROMPT=0 "$IMAGE_NAME" bash -lc '
|
|
set -euo pipefail
|
|
|
|
# Keep logs focused; the npm global install step can emit noisy deprecation warnings.
|
|
export npm_config_loglevel=error
|
|
export npm_config_fund=false
|
|
export npm_config_audit=false
|
|
|
|
# Stub systemd/loginctl so doctor + daemon flows work in Docker.
|
|
export PATH="/tmp/hanzo-bot-bin:$PATH"
|
|
mkdir -p /tmp/hanzo-bot-bin
|
|
|
|
cat > /tmp/hanzo-bot-bin/systemctl <<"SYSTEMCTL"
|
|
#!/usr/bin/env bash
|
|
set -euo pipefail
|
|
|
|
args=("$@")
|
|
if [[ "${args[0]:-}" == "--user" ]]; then
|
|
args=("${args[@]:1}")
|
|
fi
|
|
cmd="${args[0]:-}"
|
|
case "$cmd" in
|
|
status)
|
|
exit 0
|
|
;;
|
|
is-enabled)
|
|
unit="${args[1]:-}"
|
|
unit_path="$HOME/.config/systemd/user/${unit}"
|
|
if [ -f "$unit_path" ]; then
|
|
echo "enabled"
|
|
exit 0
|
|
fi
|
|
echo "disabled" >&2
|
|
exit 1
|
|
;;
|
|
show)
|
|
echo "ActiveState=inactive"
|
|
echo "SubState=dead"
|
|
echo "MainPID=0"
|
|
echo "ExecMainStatus=0"
|
|
echo "ExecMainCode=0"
|
|
exit 0
|
|
;;
|
|
*)
|
|
exit 0
|
|
;;
|
|
esac
|
|
SYSTEMCTL
|
|
chmod +x /tmp/hanzo-bot-bin/systemctl
|
|
|
|
cat > /tmp/hanzo-bot-bin/loginctl <<"LOGINCTL"
|
|
#!/usr/bin/env bash
|
|
set -euo pipefail
|
|
|
|
if [[ "$*" == *"show-user"* ]]; then
|
|
echo "Linger=yes"
|
|
exit 0
|
|
fi
|
|
if [[ "$*" == *"enable-linger"* ]]; then
|
|
exit 0
|
|
fi
|
|
exit 0
|
|
LOGINCTL
|
|
chmod +x /tmp/hanzo-bot-bin/loginctl
|
|
|
|
# Install the npm-global variant from the local /app source.
|
|
# `npm pack` can emit script output; keep only the tarball name.
|
|
pkg_tgz="$(npm pack --silent /app | tail -n 1 | tr -d '\r')"
|
|
if [ ! -f "/app/$pkg_tgz" ]; then
|
|
echo "npm pack failed (expected /app/$pkg_tgz)"
|
|
exit 1
|
|
fi
|
|
npm install -g --prefix /tmp/npm-prefix "/app/$pkg_tgz"
|
|
|
|
npm_bin="/tmp/npm-prefix/bin/hanzo-bot"
|
|
npm_root="/tmp/npm-prefix/lib/node_modules/hanzo-bot"
|
|
if [ -f "$npm_root/dist/index.mjs" ]; then
|
|
npm_entry="$npm_root/dist/index.mjs"
|
|
else
|
|
npm_entry="$npm_root/dist/index.js"
|
|
fi
|
|
|
|
if [ -f "/app/dist/index.mjs" ]; then
|
|
git_entry="/app/dist/index.mjs"
|
|
else
|
|
git_entry="/app/dist/index.js"
|
|
fi
|
|
git_cli="/app/hanzo-bot.mjs"
|
|
|
|
assert_entrypoint() {
|
|
local unit_path="$1"
|
|
local expected="$2"
|
|
local exec_line=""
|
|
exec_line=$(grep -m1 "^ExecStart=" "$unit_path" || true)
|
|
if [ -z "$exec_line" ]; then
|
|
echo "Missing ExecStart in $unit_path"
|
|
exit 1
|
|
fi
|
|
exec_line="${exec_line#ExecStart=}"
|
|
entrypoint=$(echo "$exec_line" | awk "{print \$2}")
|
|
entrypoint="${entrypoint%\"}"
|
|
entrypoint="${entrypoint#\"}"
|
|
if [ "$entrypoint" != "$expected" ]; then
|
|
echo "Expected entrypoint $expected, got $entrypoint"
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
# Each flow: install service with one variant, run doctor from the other,
|
|
# and verify ExecStart entrypoint switches accordingly.
|
|
run_flow() {
|
|
local name="$1"
|
|
local install_cmd="$2"
|
|
local install_expected="$3"
|
|
local doctor_cmd="$4"
|
|
local doctor_expected="$5"
|
|
|
|
echo "== Flow: $name =="
|
|
home_dir=$(mktemp -d "/tmp/hanzo-bot-switch-${name}.XXXXXX")
|
|
export HOME="$home_dir"
|
|
export USER="testuser"
|
|
|
|
eval "$install_cmd"
|
|
|
|
unit_path="$HOME/.config/systemd/user/hanzo-bot-gateway.service"
|
|
if [ ! -f "$unit_path" ]; then
|
|
echo "Missing unit file: $unit_path"
|
|
exit 1
|
|
fi
|
|
assert_entrypoint "$unit_path" "$install_expected"
|
|
|
|
eval "$doctor_cmd"
|
|
|
|
assert_entrypoint "$unit_path" "$doctor_expected"
|
|
}
|
|
|
|
run_flow \
|
|
"npm-to-git" \
|
|
"$npm_bin daemon install --force" \
|
|
"$npm_entry" \
|
|
"node $git_cli doctor --repair --force --yes" \
|
|
"$git_entry"
|
|
|
|
run_flow \
|
|
"git-to-npm" \
|
|
"node $git_cli daemon install --force" \
|
|
"$git_entry" \
|
|
"$npm_bin doctor --repair --force --yes" \
|
|
"$npm_entry"
|
|
'
|