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.
85 lines
2.7 KiB
Swift
85 lines
2.7 KiB
Swift
import AppKit
|
|
import Foundation
|
|
import OSLog
|
|
|
|
@MainActor
|
|
final class CLIInstallPrompter {
|
|
static let shared = CLIInstallPrompter()
|
|
private let logger = Logger(subsystem: "ai.hanzo.bot", category: "cli.prompt")
|
|
private var isPrompting = false
|
|
|
|
func checkAndPromptIfNeeded(reason: String) {
|
|
guard self.shouldPrompt() else { return }
|
|
guard let version = Self.appVersion() else { return }
|
|
self.isPrompting = true
|
|
UserDefaults.standard.set(version, forKey: cliInstallPromptedVersionKey)
|
|
|
|
let alert = NSAlert()
|
|
alert.messageText = "Install HanzoBot CLI?"
|
|
alert.informativeText = "Local mode needs the CLI so launchd can run the gateway."
|
|
alert.addButton(withTitle: "Install CLI")
|
|
alert.addButton(withTitle: "Not now")
|
|
alert.addButton(withTitle: "Open Settings")
|
|
let response = alert.runModal()
|
|
|
|
switch response {
|
|
case .alertFirstButtonReturn:
|
|
Task { await self.installCLI() }
|
|
case .alertThirdButtonReturn:
|
|
self.openSettings(tab: .general)
|
|
default:
|
|
break
|
|
}
|
|
|
|
self.logger.debug("cli install prompt handled reason=\(reason, privacy: .public)")
|
|
self.isPrompting = false
|
|
}
|
|
|
|
private func shouldPrompt() -> Bool {
|
|
guard !self.isPrompting else { return false }
|
|
guard AppStateStore.shared.onboardingSeen else { return false }
|
|
guard AppStateStore.shared.connectionMode == .local else { return false }
|
|
guard CLIInstaller.installedLocation() == nil else { return false }
|
|
guard let version = Self.appVersion() else { return false }
|
|
let lastPrompt = UserDefaults.standard.string(forKey: cliInstallPromptedVersionKey)
|
|
return lastPrompt != version
|
|
}
|
|
|
|
private func installCLI() async {
|
|
let status = StatusBox()
|
|
await CLIInstaller.install { message in
|
|
await status.set(message)
|
|
}
|
|
if let message = await status.get() {
|
|
let alert = NSAlert()
|
|
alert.messageText = "CLI install finished"
|
|
alert.informativeText = message
|
|
alert.runModal()
|
|
}
|
|
}
|
|
|
|
private func openSettings(tab: SettingsTab) {
|
|
SettingsTabRouter.request(tab)
|
|
SettingsWindowOpener.shared.open()
|
|
DispatchQueue.main.async {
|
|
NotificationCenter.default.post(name: .botSelectSettingsTab, object: tab)
|
|
}
|
|
}
|
|
|
|
private static func appVersion() -> String? {
|
|
Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
|
|
}
|
|
}
|
|
|
|
private actor StatusBox {
|
|
private var value: String?
|
|
|
|
func set(_ value: String) {
|
|
self.value = value
|
|
}
|
|
|
|
func get() -> String? {
|
|
self.value
|
|
}
|
|
}
|