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.
66 lines
1.8 KiB
Bash
Executable File
66 lines
1.8 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
set -euo pipefail
|
|
|
|
# Notarize a macOS artifact (zip/dmg/pkg) and optionally staple the app bundle.
|
|
#
|
|
# Usage:
|
|
# STAPLE_APP_PATH=dist/HanzoBot.app scripts/notarize-mac-artifact.sh <artifact>
|
|
#
|
|
# Auth (pick one):
|
|
# NOTARYTOOL_PROFILE keychain profile created via `xcrun notarytool store-credentials`
|
|
# NOTARYTOOL_KEY path to App Store Connect API key (.p8)
|
|
# NOTARYTOOL_KEY_ID API key ID
|
|
# NOTARYTOOL_ISSUER API issuer ID
|
|
|
|
ARTIFACT="${1:-}"
|
|
STAPLE_APP_PATH="${STAPLE_APP_PATH:-}"
|
|
|
|
if [[ -z "$ARTIFACT" ]]; then
|
|
echo "Usage: $0 <artifact>" >&2
|
|
exit 1
|
|
fi
|
|
if [[ ! -e "$ARTIFACT" ]]; then
|
|
echo "Error: artifact not found: $ARTIFACT" >&2
|
|
exit 1
|
|
fi
|
|
|
|
if ! command -v xcrun >/dev/null 2>&1; then
|
|
echo "Error: xcrun not found; install Xcode command line tools." >&2
|
|
exit 1
|
|
fi
|
|
|
|
auth_args=()
|
|
if [[ -n "${NOTARYTOOL_PROFILE:-}" ]]; then
|
|
auth_args+=(--keychain-profile "$NOTARYTOOL_PROFILE")
|
|
elif [[ -n "${NOTARYTOOL_KEY:-}" && -n "${NOTARYTOOL_KEY_ID:-}" && -n "${NOTARYTOOL_ISSUER:-}" ]]; then
|
|
auth_args+=(--key "$NOTARYTOOL_KEY" --key-id "$NOTARYTOOL_KEY_ID" --issuer "$NOTARYTOOL_ISSUER")
|
|
else
|
|
echo "Error: Notary auth missing. Set NOTARYTOOL_PROFILE or NOTARYTOOL_KEY/NOTARYTOOL_KEY_ID/NOTARYTOOL_ISSUER." >&2
|
|
exit 1
|
|
fi
|
|
|
|
echo "🧾 Notarizing: $ARTIFACT"
|
|
xcrun notarytool submit "$ARTIFACT" "${auth_args[@]}" --wait
|
|
|
|
case "$ARTIFACT" in
|
|
*.dmg|*.pkg)
|
|
echo "📌 Stapling artifact: $ARTIFACT"
|
|
xcrun stapler staple "$ARTIFACT"
|
|
xcrun stapler validate "$ARTIFACT"
|
|
;;
|
|
*)
|
|
;;
|
|
esac
|
|
|
|
if [[ -n "$STAPLE_APP_PATH" ]]; then
|
|
if [[ -d "$STAPLE_APP_PATH" ]]; then
|
|
echo "📌 Stapling app: $STAPLE_APP_PATH"
|
|
xcrun stapler staple "$STAPLE_APP_PATH"
|
|
xcrun stapler validate "$STAPLE_APP_PATH"
|
|
else
|
|
echo "Warn: STAPLE_APP_PATH not found: $STAPLE_APP_PATH" >&2
|
|
fi
|
|
fi
|
|
|
|
echo "✅ Notarization complete"
|