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.
172 lines
6.6 KiB
Swift
172 lines
6.6 KiB
Swift
import Darwin
|
|
import Foundation
|
|
import Testing
|
|
@testable import HanzoBot
|
|
|
|
@Suite(.serialized) struct CommandResolverTests {
|
|
private func makeDefaults() -> UserDefaults {
|
|
// Use a unique suite to avoid cross-suite concurrency on UserDefaults.standard.
|
|
UserDefaults(suiteName: "CommandResolverTests.\(UUID().uuidString)")!
|
|
}
|
|
|
|
private func makeTempDir() throws -> URL {
|
|
let base = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
|
|
let dir = base.appendingPathComponent(UUID().uuidString, isDirectory: true)
|
|
try FileManager().createDirectory(at: dir, withIntermediateDirectories: true)
|
|
return dir
|
|
}
|
|
|
|
private func makeExec(at path: URL) throws {
|
|
try FileManager().createDirectory(
|
|
at: path.deletingLastPathComponent(),
|
|
withIntermediateDirectories: true)
|
|
FileManager().createFile(atPath: path.path, contents: Data("echo ok\n".utf8))
|
|
try FileManager().setAttributes([.posixPermissions: 0o755], ofItemAtPath: path.path)
|
|
}
|
|
|
|
@Test func prefersHanzoBotBinary() async throws {
|
|
let defaults = self.makeDefaults()
|
|
defaults.set(AppState.ConnectionMode.local.rawValue, forKey: connectionModeKey)
|
|
|
|
let tmp = try makeTempDir()
|
|
CommandResolver.setProjectRoot(tmp.path)
|
|
|
|
let botPath = tmp.appendingPathComponent("node_modules/.bin/hanzo-bot")
|
|
try self.makeExec(at: botPath)
|
|
|
|
let cmd = CommandResolver.botCommand(subcommand: "gateway", defaults: defaults, configRoot: [:])
|
|
#expect(cmd.prefix(2).elementsEqual([botPath.path, "gateway"]))
|
|
}
|
|
|
|
@Test func fallsBackToNodeAndScript() async throws {
|
|
let defaults = self.makeDefaults()
|
|
defaults.set(AppState.ConnectionMode.local.rawValue, forKey: connectionModeKey)
|
|
|
|
let tmp = try makeTempDir()
|
|
CommandResolver.setProjectRoot(tmp.path)
|
|
|
|
let nodePath = tmp.appendingPathComponent("node_modules/.bin/node")
|
|
let scriptPath = tmp.appendingPathComponent("bin/hanzo-bot.js")
|
|
try self.makeExec(at: nodePath)
|
|
try "#!/bin/sh\necho v22.0.0\n".write(to: nodePath, atomically: true, encoding: .utf8)
|
|
try FileManager().setAttributes([.posixPermissions: 0o755], ofItemAtPath: nodePath.path)
|
|
try self.makeExec(at: scriptPath)
|
|
|
|
let cmd = CommandResolver.botCommand(
|
|
subcommand: "rpc",
|
|
defaults: defaults,
|
|
configRoot: [:],
|
|
searchPaths: [tmp.appendingPathComponent("node_modules/.bin").path])
|
|
|
|
#expect(cmd.count >= 3)
|
|
if cmd.count >= 3 {
|
|
#expect(cmd[0] == nodePath.path)
|
|
#expect(cmd[1] == scriptPath.path)
|
|
#expect(cmd[2] == "rpc")
|
|
}
|
|
}
|
|
|
|
@Test func fallsBackToPnpm() async throws {
|
|
let defaults = self.makeDefaults()
|
|
defaults.set(AppState.ConnectionMode.local.rawValue, forKey: connectionModeKey)
|
|
|
|
let tmp = try makeTempDir()
|
|
CommandResolver.setProjectRoot(tmp.path)
|
|
|
|
let pnpmPath = tmp.appendingPathComponent("node_modules/.bin/pnpm")
|
|
try self.makeExec(at: pnpmPath)
|
|
|
|
let cmd = CommandResolver.botCommand(subcommand: "rpc", defaults: defaults, configRoot: [:])
|
|
|
|
#expect(cmd.prefix(4).elementsEqual([pnpmPath.path, "--silent", "hanzo-bot", "rpc"]))
|
|
}
|
|
|
|
@Test func pnpmKeepsExtraArgsAfterSubcommand() async throws {
|
|
let defaults = self.makeDefaults()
|
|
defaults.set(AppState.ConnectionMode.local.rawValue, forKey: connectionModeKey)
|
|
|
|
let tmp = try makeTempDir()
|
|
CommandResolver.setProjectRoot(tmp.path)
|
|
|
|
let pnpmPath = tmp.appendingPathComponent("node_modules/.bin/pnpm")
|
|
try self.makeExec(at: pnpmPath)
|
|
|
|
let cmd = CommandResolver.botCommand(
|
|
subcommand: "health",
|
|
extraArgs: ["--json", "--timeout", "5"],
|
|
defaults: defaults,
|
|
configRoot: [:])
|
|
|
|
#expect(cmd.prefix(5).elementsEqual([pnpmPath.path, "--silent", "hanzo-bot", "health", "--json"]))
|
|
#expect(cmd.suffix(2).elementsEqual(["--timeout", "5"]))
|
|
}
|
|
|
|
@Test func preferredPathsStartWithProjectNodeBins() async throws {
|
|
let tmp = try makeTempDir()
|
|
CommandResolver.setProjectRoot(tmp.path)
|
|
|
|
let first = CommandResolver.preferredPaths().first
|
|
#expect(first == tmp.appendingPathComponent("node_modules/.bin").path)
|
|
}
|
|
|
|
@Test func buildsSSHCommandForRemoteMode() async throws {
|
|
let defaults = self.makeDefaults()
|
|
defaults.set(AppState.ConnectionMode.remote.rawValue, forKey: connectionModeKey)
|
|
defaults.set("[email protected]:2222", forKey: remoteTargetKey)
|
|
defaults.set("/tmp/id_ed25519", forKey: remoteIdentityKey)
|
|
defaults.set("/srv/hanzo-bot", forKey: remoteProjectRootKey)
|
|
|
|
let cmd = CommandResolver.botCommand(
|
|
subcommand: "status",
|
|
extraArgs: ["--json"],
|
|
defaults: defaults,
|
|
configRoot: [:])
|
|
|
|
#expect(cmd.first == "/usr/bin/ssh")
|
|
if let marker = cmd.firstIndex(of: "--") {
|
|
#expect(cmd[marker + 1] == "[email protected]")
|
|
} else {
|
|
#expect(Bool(false))
|
|
}
|
|
#expect(cmd.contains("-i"))
|
|
#expect(cmd.contains("/tmp/id_ed25519"))
|
|
if let script = cmd.last {
|
|
#expect(script.contains("PRJ='/srv/hanzo-bot'"))
|
|
#expect(script.contains("cd \"$PRJ\""))
|
|
#expect(script.contains("hanzo-bot"))
|
|
#expect(script.contains("status"))
|
|
#expect(script.contains("--json"))
|
|
#expect(script.contains("CLI="))
|
|
}
|
|
}
|
|
|
|
@Test func rejectsUnsafeSSHTargets() async throws {
|
|
#expect(CommandResolver.parseSSHTarget("-oProxyCommand=calc") == nil)
|
|
#expect(CommandResolver.parseSSHTarget("host:-oProxyCommand=calc") == nil)
|
|
#expect(CommandResolver.parseSSHTarget("user@host:2222")?.port == 2222)
|
|
}
|
|
|
|
@Test func configRootLocalOverridesRemoteDefaults() async throws {
|
|
let defaults = self.makeDefaults()
|
|
defaults.set(AppState.ConnectionMode.remote.rawValue, forKey: connectionModeKey)
|
|
defaults.set("[email protected]:2222", forKey: remoteTargetKey)
|
|
|
|
let tmp = try makeTempDir()
|
|
CommandResolver.setProjectRoot(tmp.path)
|
|
|
|
let botPath = tmp.appendingPathComponent("node_modules/.bin/hanzo-bot")
|
|
try self.makeExec(at: botPath)
|
|
|
|
let cmd = CommandResolver.botCommand(
|
|
subcommand: "daemon",
|
|
defaults: defaults,
|
|
configRoot: ["gateway": ["mode": "local"]])
|
|
|
|
#expect(cmd.first == botPath.path)
|
|
#expect(cmd.count >= 2)
|
|
if cmd.count >= 2 {
|
|
#expect(cmd[1] == "daemon")
|
|
}
|
|
}
|
|
}
|