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.
93 lines
3.5 KiB
Swift
93 lines
3.5 KiB
Swift
// swift-tools-version: 6.2
|
|
// Package manifest for the HanzoBot macOS companion (menu bar app + IPC library).
|
|
|
|
import PackageDescription
|
|
|
|
let package = Package(
|
|
name: "HanzoBot",
|
|
platforms: [
|
|
.macOS(.v15),
|
|
],
|
|
products: [
|
|
.library(name: "BotIPC", targets: ["BotIPC"]),
|
|
.library(name: "BotDiscovery", targets: ["BotDiscovery"]),
|
|
.executable(name: "HanzoBot", targets: ["HanzoBot"]),
|
|
.executable(name: "hanzo-bot-mac", targets: ["BotMacCLI"]),
|
|
],
|
|
dependencies: [
|
|
.package(url: "https://github.com/orchetect/MenuBarExtraAccess", exact: "1.2.2"),
|
|
.package(url: "https://github.com/swiftlang/swift-subprocess.git", from: "0.1.0"),
|
|
.package(url: "https://github.com/apple/swift-log.git", from: "1.8.0"),
|
|
.package(url: "https://github.com/sparkle-project/Sparkle", from: "2.8.1"),
|
|
.package(url: "https://github.com/steipete/Peekaboo.git", branch: "main"),
|
|
.package(path: "../shared/BotKit"),
|
|
.package(path: "../../Swabble"),
|
|
],
|
|
targets: [
|
|
.target(
|
|
name: "BotIPC",
|
|
dependencies: [],
|
|
swiftSettings: [
|
|
.enableUpcomingFeature("StrictConcurrency"),
|
|
]),
|
|
.target(
|
|
name: "BotDiscovery",
|
|
dependencies: [
|
|
.product(name: "BotKit", package: "BotKit"),
|
|
],
|
|
path: "Sources/BotDiscovery",
|
|
swiftSettings: [
|
|
.enableUpcomingFeature("StrictConcurrency"),
|
|
]),
|
|
.executableTarget(
|
|
name: "HanzoBot",
|
|
dependencies: [
|
|
"BotIPC",
|
|
"BotDiscovery",
|
|
.product(name: "BotKit", package: "BotKit"),
|
|
.product(name: "BotChatUI", package: "BotKit"),
|
|
.product(name: "HanzoBotProtocol", package: "BotKit"),
|
|
.product(name: "SwabbleKit", package: "swabble"),
|
|
.product(name: "MenuBarExtraAccess", package: "MenuBarExtraAccess"),
|
|
.product(name: "Subprocess", package: "swift-subprocess"),
|
|
.product(name: "Logging", package: "swift-log"),
|
|
.product(name: "Sparkle", package: "Sparkle"),
|
|
.product(name: "PeekabooBridge", package: "Peekaboo"),
|
|
.product(name: "PeekabooAutomationKit", package: "Peekaboo"),
|
|
],
|
|
exclude: [
|
|
"Resources/Info.plist",
|
|
],
|
|
resources: [
|
|
.copy("Resources/HanzoBot.icns"),
|
|
.copy("Resources/DeviceModels"),
|
|
],
|
|
swiftSettings: [
|
|
.enableUpcomingFeature("StrictConcurrency"),
|
|
]),
|
|
.executableTarget(
|
|
name: "BotMacCLI",
|
|
dependencies: [
|
|
"BotDiscovery",
|
|
.product(name: "BotKit", package: "BotKit"),
|
|
.product(name: "HanzoBotProtocol", package: "BotKit"),
|
|
],
|
|
path: "Sources/BotMacCLI",
|
|
swiftSettings: [
|
|
.enableUpcomingFeature("StrictConcurrency"),
|
|
]),
|
|
.testTarget(
|
|
name: "BotIPCTests",
|
|
dependencies: [
|
|
"BotIPC",
|
|
"HanzoBot",
|
|
"BotDiscovery",
|
|
.product(name: "HanzoBotProtocol", package: "BotKit"),
|
|
.product(name: "SwabbleKit", package: "swabble"),
|
|
],
|
|
swiftSettings: [
|
|
.enableUpcomingFeature("StrictConcurrency"),
|
|
.enableExperimentalFeature("SwiftTesting"),
|
|
]),
|
|
])
|