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.
60 lines
2.0 KiB
Bash
Executable File
60 lines
2.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
set -euo pipefail
|
|
|
|
# Render the macOS .icon bundle to a padded .icns like Trimmy's pipeline.
|
|
# Defaults target the HanzoBot assets so you can just run the script from repo root.
|
|
|
|
ROOT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
|
|
|
|
ICON_FILE=${1:-"$ROOT_DIR/apps/macos/Icon.icon"}
|
|
BASENAME=${2:-HanzoBot}
|
|
OUT_ROOT=${3:-"$ROOT_DIR/apps/macos/build/icon"}
|
|
XCODE_APP=${XCODE_APP:-/Applications/Xcode.app}
|
|
# Where the final .icns should live; override DEST_ICNS to change.
|
|
DEST_ICNS=${DEST_ICNS:-"$ROOT_DIR/apps/macos/Sources/HanzoBot/Resources/HanzoBot.icns"}
|
|
|
|
ICTOOL="$XCODE_APP/Contents/Applications/Icon Composer.app/Contents/Executables/ictool"
|
|
if [[ ! -x "$ICTOOL" ]]; then
|
|
ICTOOL="$XCODE_APP/Contents/Applications/Icon Composer.app/Contents/Executables/icontool"
|
|
fi
|
|
if [[ ! -x "$ICTOOL" ]]; then
|
|
echo "ictool/icontool not found. Set XCODE_APP if Xcode is elsewhere." >&2
|
|
exit 1
|
|
fi
|
|
|
|
ICONSET_DIR="$OUT_ROOT/${BASENAME}.iconset"
|
|
TMP_DIR="$OUT_ROOT/tmp"
|
|
mkdir -p "$ICONSET_DIR" "$TMP_DIR"
|
|
|
|
MASTER_ART="$TMP_DIR/icon_art_824.png"
|
|
MASTER_1024="$TMP_DIR/icon_1024.png"
|
|
|
|
# Render inner art (no margin) with macOS Default appearance
|
|
"$ICTOOL" "$ICON_FILE" \
|
|
--export-preview macOS Default 824 824 1 -45 "$MASTER_ART"
|
|
|
|
# Pad to 1024x1024 with transparent border
|
|
sips --padToHeightWidth 1024 1024 "$MASTER_ART" --out "$MASTER_1024" >/dev/null
|
|
|
|
# Generate required sizes
|
|
sizes=(16 32 64 128 256 512 1024)
|
|
for sz in "${sizes[@]}"; do
|
|
out="$ICONSET_DIR/icon_${sz}x${sz}.png"
|
|
sips -z "$sz" "$sz" "$MASTER_1024" --out "$out" >/dev/null
|
|
if [[ "$sz" -ne 1024 ]]; then
|
|
dbl=$((sz*2))
|
|
out2="$ICONSET_DIR/icon_${sz}x${sz}@2x.png"
|
|
sips -z "$dbl" "$dbl" "$MASTER_1024" --out "$out2" >/dev/null
|
|
fi
|
|
done
|
|
|
|
# 512x512@2x already covered by 1024; ensure it exists
|
|
cp "$MASTER_1024" "$ICONSET_DIR/[email protected]"
|
|
|
|
iconutil -c icns "$ICONSET_DIR" -o "$OUT_ROOT/${BASENAME}.icns"
|
|
|
|
mkdir -p "$(dirname "$DEST_ICNS")"
|
|
cp "$OUT_ROOT/${BASENAME}.icns" "$DEST_ICNS"
|
|
|
|
echo "Icon.icns generated at $DEST_ICNS"
|