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.
104 lines
3.7 KiB
Swift
104 lines
3.7 KiB
Swift
import Foundation
|
|
import BotKit
|
|
|
|
extension NodeAppModel {
|
|
static func normalizeWatchNotifyParams(_ params: BotWatchNotifyParams) -> BotWatchNotifyParams {
|
|
var normalized = params
|
|
normalized.title = params.title.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
normalized.body = params.body.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
normalized.promptId = self.trimmedOrNil(params.promptId)
|
|
normalized.sessionKey = self.trimmedOrNil(params.sessionKey)
|
|
normalized.kind = self.trimmedOrNil(params.kind)
|
|
normalized.details = self.trimmedOrNil(params.details)
|
|
normalized.priority = self.normalizedWatchPriority(params.priority, risk: params.risk)
|
|
normalized.risk = self.normalizedWatchRisk(params.risk, priority: normalized.priority)
|
|
|
|
let normalizedActions = self.normalizeWatchActions(
|
|
params.actions,
|
|
kind: normalized.kind,
|
|
promptId: normalized.promptId)
|
|
normalized.actions = normalizedActions.isEmpty ? nil : normalizedActions
|
|
return normalized
|
|
}
|
|
|
|
static func normalizeWatchActions(
|
|
_ actions: [BotWatchAction]?,
|
|
kind: String?,
|
|
promptId: String?) -> [BotWatchAction]
|
|
{
|
|
let provided = (actions ?? []).compactMap { action -> BotWatchAction? in
|
|
let id = action.id.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
let label = action.label.trimmingCharacters(in: .whitespacesAndNewlines)
|
|
guard !id.isEmpty, !label.isEmpty else { return nil }
|
|
return BotWatchAction(
|
|
id: id,
|
|
label: label,
|
|
style: self.trimmedOrNil(action.style))
|
|
}
|
|
if !provided.isEmpty {
|
|
return Array(provided.prefix(4))
|
|
}
|
|
|
|
// Only auto-insert quick actions when this is a prompt/decision flow.
|
|
guard promptId?.isEmpty == false else {
|
|
return []
|
|
}
|
|
|
|
let normalizedKind = kind?.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() ?? ""
|
|
if normalizedKind.contains("approval") || normalizedKind.contains("approve") {
|
|
return [
|
|
BotWatchAction(id: "approve", label: "Approve"),
|
|
BotWatchAction(id: "decline", label: "Decline", style: "destructive"),
|
|
BotWatchAction(id: "open_phone", label: "Open iPhone"),
|
|
BotWatchAction(id: "escalate", label: "Escalate"),
|
|
]
|
|
}
|
|
|
|
return [
|
|
BotWatchAction(id: "done", label: "Done"),
|
|
BotWatchAction(id: "snooze_10m", label: "Snooze 10m"),
|
|
BotWatchAction(id: "open_phone", label: "Open iPhone"),
|
|
BotWatchAction(id: "escalate", label: "Escalate"),
|
|
]
|
|
}
|
|
|
|
static func normalizedWatchRisk(
|
|
_ risk: BotWatchRisk?,
|
|
priority: BotNotificationPriority?) -> BotWatchRisk?
|
|
{
|
|
if let risk { return risk }
|
|
switch priority {
|
|
case .passive:
|
|
return .low
|
|
case .active:
|
|
return .medium
|
|
case .timeSensitive:
|
|
return .high
|
|
case nil:
|
|
return nil
|
|
}
|
|
}
|
|
|
|
static func normalizedWatchPriority(
|
|
_ priority: BotNotificationPriority?,
|
|
risk: BotWatchRisk?) -> BotNotificationPriority?
|
|
{
|
|
if let priority { return priority }
|
|
switch risk {
|
|
case .low:
|
|
return .passive
|
|
case .medium:
|
|
return .active
|
|
case .high:
|
|
return .timeSensitive
|
|
case nil:
|
|
return nil
|
|
}
|
|
}
|
|
|
|
static func trimmedOrNil(_ value: String?) -> String? {
|
|
let trimmed = value?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
|
|
return trimmed.isEmpty ? nil : trimmed
|
|
}
|
|
}
|