mirror of
https://github.com/hanzoai/bot.git
synced 2026-10-30 17:24:26 +00:00
zeekay
acaeda400a
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.
54 lines
1.7 KiB
Bash
54 lines
1.7 KiB
Bash
#!/usr/bin/env bash
|
|
|
|
verify_installed_cli() {
|
|
local package_name="$1"
|
|
local expected_version="$2"
|
|
local cli_name="$package_name"
|
|
local cmd_path=""
|
|
local entry_path=""
|
|
local npm_root=""
|
|
local installed_version=""
|
|
|
|
cmd_path="$(command -v "$cli_name" || true)"
|
|
if [[ -z "$cmd_path" && -x "$HOME/.npm-global/bin/$package_name" ]]; then
|
|
cmd_path="$HOME/.npm-global/bin/$package_name"
|
|
fi
|
|
|
|
if [[ -z "$cmd_path" ]]; then
|
|
npm_root="$(npm root -g 2>/dev/null || true)"
|
|
if [[ -n "$npm_root" && -f "$npm_root/$package_name/dist/entry.js" ]]; then
|
|
entry_path="$npm_root/$package_name/dist/entry.js"
|
|
fi
|
|
fi
|
|
|
|
if [[ -z "$cmd_path" && -z "$entry_path" ]]; then
|
|
echo "ERROR: $package_name is not on PATH" >&2
|
|
return 1
|
|
fi
|
|
|
|
local raw_version=""
|
|
if [[ -n "$cmd_path" ]]; then
|
|
raw_version="$("$cmd_path" --version 2>/dev/null | head -n 1 | tr -d '\r')"
|
|
else
|
|
raw_version="$(node "$entry_path" --version 2>/dev/null | head -n 1 | tr -d '\r')"
|
|
fi
|
|
# Extract the semver portion — --version may print e.g. "HanzoBot 2026.3.11 (abc1234)"
|
|
installed_version="$(echo "$raw_version" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?' | head -n 1)"
|
|
if [[ -z "$installed_version" ]]; then
|
|
installed_version="$raw_version"
|
|
fi
|
|
|
|
echo "cli=$cli_name installed=$installed_version expected=$expected_version"
|
|
if [[ "$installed_version" != "$expected_version" ]]; then
|
|
echo "ERROR: expected ${cli_name}@${expected_version}, got ${cli_name}@${installed_version}" >&2
|
|
return 1
|
|
fi
|
|
|
|
echo "==> Sanity: CLI runs"
|
|
if [[ -n "$cmd_path" ]]; then
|
|
"$cmd_path" --help >/dev/null
|
|
else
|
|
node "$entry_path" --help >/dev/null
|
|
fi
|
|
}
|