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.8 KiB
Swift
85 lines
2.8 KiB
Swift
import ActivityKit
|
|
import SwiftUI
|
|
import WidgetKit
|
|
|
|
struct HanzoBotLiveActivity: Widget {
|
|
var body: some WidgetConfiguration {
|
|
ActivityConfiguration(for: HanzoBotActivityAttributes.self) { context in
|
|
lockScreenView(context: context)
|
|
} dynamicIsland: { context in
|
|
DynamicIsland {
|
|
DynamicIslandExpandedRegion(.leading) {
|
|
statusDot(state: context.state)
|
|
}
|
|
DynamicIslandExpandedRegion(.center) {
|
|
Text(context.state.statusText)
|
|
.font(.subheadline)
|
|
.lineLimit(1)
|
|
}
|
|
DynamicIslandExpandedRegion(.trailing) {
|
|
trailingView(state: context.state)
|
|
}
|
|
} compactLeading: {
|
|
statusDot(state: context.state)
|
|
} compactTrailing: {
|
|
Text(context.state.statusText)
|
|
.font(.caption2)
|
|
.lineLimit(1)
|
|
.frame(maxWidth: 64)
|
|
} minimal: {
|
|
statusDot(state: context.state)
|
|
}
|
|
}
|
|
}
|
|
|
|
@ViewBuilder
|
|
private func lockScreenView(context: ActivityViewContext<HanzoBotActivityAttributes>) -> some View {
|
|
HStack(spacing: 8) {
|
|
statusDot(state: context.state)
|
|
.frame(width: 10, height: 10)
|
|
VStack(alignment: .leading, spacing: 2) {
|
|
Text("HanzoBot")
|
|
.font(.subheadline.bold())
|
|
Text(context.state.statusText)
|
|
.font(.caption)
|
|
.foregroundStyle(.secondary)
|
|
}
|
|
Spacer()
|
|
trailingView(state: context.state)
|
|
}
|
|
.padding(.vertical, 4)
|
|
}
|
|
|
|
@ViewBuilder
|
|
private func trailingView(state: HanzoBotActivityAttributes.ContentState) -> some View {
|
|
if state.isConnecting {
|
|
ProgressView().controlSize(.small)
|
|
} else if state.isDisconnected {
|
|
Image(systemName: "wifi.slash")
|
|
.foregroundStyle(.red)
|
|
} else if state.isIdle {
|
|
Image(systemName: "antenna.radiowaves.left.and.right")
|
|
.foregroundStyle(.green)
|
|
} else {
|
|
Text(state.startedAt, style: .timer)
|
|
.font(.caption)
|
|
.monospacedDigit()
|
|
.foregroundStyle(.secondary)
|
|
}
|
|
}
|
|
|
|
@ViewBuilder
|
|
private func statusDot(state: HanzoBotActivityAttributes.ContentState) -> some View {
|
|
Circle()
|
|
.fill(dotColor(state: state))
|
|
.frame(width: 6, height: 6)
|
|
}
|
|
|
|
private func dotColor(state: HanzoBotActivityAttributes.ContentState) -> Color {
|
|
if state.isDisconnected { return .red }
|
|
if state.isConnecting { return .gray }
|
|
if state.isIdle { return .green }
|
|
return .blue
|
|
}
|
|
}
|