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.
126 lines
4.0 KiB
Swift
126 lines
4.0 KiB
Swift
import ActivityKit
|
|
import Foundation
|
|
import os
|
|
|
|
/// Minimal Live Activity lifecycle focused on connection health + stale cleanup.
|
|
@MainActor
|
|
final class LiveActivityManager {
|
|
static let shared = LiveActivityManager()
|
|
|
|
private let logger = Logger(subsystem: "ai.hanzo.bot.ios", category: "LiveActivity")
|
|
private var currentActivity: Activity<HanzoBotActivityAttributes>?
|
|
private var activityStartDate: Date = .now
|
|
|
|
private init() {
|
|
self.hydrateCurrentAndPruneDuplicates()
|
|
}
|
|
|
|
var isActive: Bool {
|
|
guard let activity = self.currentActivity else { return false }
|
|
guard activity.activityState == .active else {
|
|
self.currentActivity = nil
|
|
return false
|
|
}
|
|
return true
|
|
}
|
|
|
|
func startActivity(agentName: String, sessionKey: String) {
|
|
self.hydrateCurrentAndPruneDuplicates()
|
|
|
|
if self.currentActivity != nil {
|
|
self.handleConnecting()
|
|
return
|
|
}
|
|
|
|
let authInfo = ActivityAuthorizationInfo()
|
|
guard authInfo.areActivitiesEnabled else {
|
|
self.logger.info("Live Activities disabled; skipping start")
|
|
return
|
|
}
|
|
|
|
self.activityStartDate = .now
|
|
let attributes = HanzoBotActivityAttributes(agentName: agentName, sessionKey: sessionKey)
|
|
|
|
do {
|
|
let activity = try Activity.request(
|
|
attributes: attributes,
|
|
content: ActivityContent(state: self.connectingState(), staleDate: nil),
|
|
pushType: nil)
|
|
self.currentActivity = activity
|
|
self.logger.info("started live activity id=\(activity.id, privacy: .public)")
|
|
} catch {
|
|
self.logger.error("failed to start live activity: \(error.localizedDescription, privacy: .public)")
|
|
}
|
|
}
|
|
|
|
func handleConnecting() {
|
|
self.updateCurrent(state: self.connectingState())
|
|
}
|
|
|
|
func handleReconnect() {
|
|
self.updateCurrent(state: self.idleState())
|
|
}
|
|
|
|
func handleDisconnect() {
|
|
self.updateCurrent(state: self.disconnectedState())
|
|
}
|
|
|
|
private func hydrateCurrentAndPruneDuplicates() {
|
|
let active = Activity<HanzoBotActivityAttributes>.activities
|
|
guard !active.isEmpty else {
|
|
self.currentActivity = nil
|
|
return
|
|
}
|
|
|
|
let keeper = active.max { lhs, rhs in
|
|
lhs.content.state.startedAt < rhs.content.state.startedAt
|
|
} ?? active[0]
|
|
|
|
self.currentActivity = keeper
|
|
self.activityStartDate = keeper.content.state.startedAt
|
|
|
|
let stale = active.filter { $0.id != keeper.id }
|
|
for activity in stale {
|
|
Task {
|
|
await activity.end(
|
|
ActivityContent(state: self.disconnectedState(), staleDate: nil),
|
|
dismissalPolicy: .immediate)
|
|
}
|
|
}
|
|
}
|
|
|
|
private func updateCurrent(state: HanzoBotActivityAttributes.ContentState) {
|
|
guard let activity = self.currentActivity else { return }
|
|
Task {
|
|
await activity.update(ActivityContent(state: state, staleDate: nil))
|
|
}
|
|
}
|
|
|
|
private func connectingState() -> HanzoBotActivityAttributes.ContentState {
|
|
HanzoBotActivityAttributes.ContentState(
|
|
statusText: "Connecting...",
|
|
isIdle: false,
|
|
isDisconnected: false,
|
|
isConnecting: true,
|
|
startedAt: self.activityStartDate)
|
|
}
|
|
|
|
private func idleState() -> HanzoBotActivityAttributes.ContentState {
|
|
HanzoBotActivityAttributes.ContentState(
|
|
statusText: "Idle",
|
|
isIdle: true,
|
|
isDisconnected: false,
|
|
isConnecting: false,
|
|
startedAt: self.activityStartDate)
|
|
}
|
|
|
|
private func disconnectedState() -> HanzoBotActivityAttributes.ContentState {
|
|
HanzoBotActivityAttributes.ContentState(
|
|
statusText: "Disconnected",
|
|
isIdle: false,
|
|
isDisconnected: true,
|
|
isConnecting: false,
|
|
startedAt: self.activityStartDate)
|
|
}
|
|
}
|