mirror of
https://github.com/hanzoai/bot.git
synced 2026-10-30 17:24:26 +00:00
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.
139 lines
5.2 KiB
Swift
139 lines
5.2 KiB
Swift
import Foundation
|
|
import OSLog
|
|
|
|
enum NodeServiceManager {
|
|
private static let logger = Logger(subsystem: "ai.hanzo.bot", category: "node.service")
|
|
|
|
static func start() async -> String? {
|
|
let result = await self.runServiceCommandResult(
|
|
["node", "start"],
|
|
timeout: 20,
|
|
quiet: false)
|
|
if let error = self.errorMessage(from: result, treatNotLoadedAsError: true) {
|
|
self.logger.error("node service start failed: \(error, privacy: .public)")
|
|
return error
|
|
}
|
|
return nil
|
|
}
|
|
|
|
static func stop() async -> String? {
|
|
let result = await self.runServiceCommandResult(
|
|
["node", "stop"],
|
|
timeout: 15,
|
|
quiet: false)
|
|
if let error = self.errorMessage(from: result, treatNotLoadedAsError: false) {
|
|
self.logger.error("node service stop failed: \(error, privacy: .public)")
|
|
return error
|
|
}
|
|
return nil
|
|
}
|
|
}
|
|
|
|
extension NodeServiceManager {
|
|
private struct CommandResult {
|
|
let success: Bool
|
|
let payload: Data?
|
|
let message: String?
|
|
let parsed: ParsedServiceJson?
|
|
}
|
|
|
|
private struct ParsedServiceJson {
|
|
let text: String
|
|
let object: [String: Any]
|
|
let ok: Bool?
|
|
let result: String?
|
|
let message: String?
|
|
let error: String?
|
|
let hints: [String]
|
|
}
|
|
|
|
private static func runServiceCommandResult(
|
|
_ args: [String],
|
|
timeout: Double,
|
|
quiet: Bool) async -> CommandResult
|
|
{
|
|
let command = CommandResolver.botCommand(
|
|
subcommand: "service",
|
|
extraArgs: self.withJsonFlag(args),
|
|
// Service management must always run locally, even if remote mode is configured.
|
|
configRoot: ["gateway": ["mode": "local"]])
|
|
var env = ProcessInfo.processInfo.environment
|
|
env["PATH"] = CommandResolver.preferredPaths().joined(separator: ":")
|
|
let response = await ShellExecutor.runDetailed(command: command, cwd: nil, env: env, timeout: timeout)
|
|
let parsed = self.parseServiceJson(from: response.stdout) ?? self.parseServiceJson(from: response.stderr)
|
|
let ok = parsed?.ok
|
|
let message = parsed?.error ?? parsed?.message
|
|
let payload = parsed?.text.data(using: .utf8)
|
|
?? (response.stdout.isEmpty ? response.stderr : response.stdout).data(using: .utf8)
|
|
let success = ok ?? response.success
|
|
if success {
|
|
return CommandResult(success: true, payload: payload, message: nil, parsed: parsed)
|
|
}
|
|
|
|
if quiet {
|
|
return CommandResult(success: false, payload: payload, message: message, parsed: parsed)
|
|
}
|
|
|
|
let detail = message ?? self.summarize(response.stderr) ?? self.summarize(response.stdout)
|
|
let exit = response.exitCode.map { "exit \($0)" } ?? (response.errorMessage ?? "failed")
|
|
let fullMessage = detail.map { "Node service command failed (\(exit)): \($0)" }
|
|
?? "Node service command failed (\(exit))"
|
|
self.logger.error("\(fullMessage, privacy: .public)")
|
|
return CommandResult(success: false, payload: payload, message: detail, parsed: parsed)
|
|
}
|
|
|
|
private static func errorMessage(from result: CommandResult, treatNotLoadedAsError: Bool) -> String? {
|
|
if !result.success {
|
|
return result.message ?? "Node service command failed"
|
|
}
|
|
guard let parsed = result.parsed else { return nil }
|
|
if parsed.ok == false {
|
|
return self.mergeHints(message: parsed.error ?? parsed.message, hints: parsed.hints)
|
|
}
|
|
if treatNotLoadedAsError, parsed.result == "not-loaded" {
|
|
let base = parsed.message ?? "Node service not loaded."
|
|
return self.mergeHints(message: base, hints: parsed.hints)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
private static func withJsonFlag(_ args: [String]) -> [String] {
|
|
if args.contains("--json") { return args }
|
|
return args + ["--json"]
|
|
}
|
|
|
|
private static func parseServiceJson(from raw: String) -> ParsedServiceJson? {
|
|
guard let parsed = JSONObjectExtractionSupport.extract(from: raw) else { return nil }
|
|
let jsonText = parsed.text
|
|
let object = parsed.object
|
|
let ok = object["ok"] as? Bool
|
|
let result = object["result"] as? String
|
|
let message = object["message"] as? String
|
|
let error = object["error"] as? String
|
|
let hints = (object["hints"] as? [String]) ?? []
|
|
return ParsedServiceJson(
|
|
text: jsonText,
|
|
object: object,
|
|
ok: ok,
|
|
result: result,
|
|
message: message,
|
|
error: error,
|
|
hints: hints)
|
|
}
|
|
|
|
private static func mergeHints(message: String?, hints: [String]) -> String? {
|
|
let trimmed = message?.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
let nonEmpty = trimmed?.isEmpty == false ? trimmed : nil
|
|
guard !hints.isEmpty else { return nonEmpty }
|
|
let hintText = hints.prefix(2).joined(separator: " · ")
|
|
if let nonEmpty {
|
|
return "\(nonEmpty) (\(hintText))"
|
|
}
|
|
return hintText
|
|
}
|
|
|
|
private static func summarize(_ text: String) -> String? {
|
|
TextSummarySupport.summarizeLastLine(text)
|
|
}
|
|
}
|