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.
75 lines
2.1 KiB
JavaScript
75 lines
2.1 KiB
JavaScript
#!/usr/bin/env node
|
|
import fs from "node:fs";
|
|
import path from "node:path";
|
|
import { fileURLToPath } from "node:url";
|
|
|
|
const args = new Set(process.argv.slice(2));
|
|
const checkOnly = args.has("--check");
|
|
const writeMode = args.has("--write") || !checkOnly;
|
|
|
|
if (checkOnly && args.has("--write")) {
|
|
console.error("Use either --check or --write, not both.");
|
|
process.exit(1);
|
|
}
|
|
|
|
const here = path.dirname(fileURLToPath(import.meta.url));
|
|
const repoRoot = path.resolve(here, "..");
|
|
const policyPath = path.join(repoRoot, "src", "infra", "host-env-security-policy.json");
|
|
const outputPath = path.join(
|
|
repoRoot,
|
|
"apps",
|
|
"macos",
|
|
"Sources",
|
|
"HanzoBot",
|
|
"HostEnvSecurityPolicy.generated.swift",
|
|
);
|
|
|
|
/** @type {{blockedKeys: string[]; blockedOverrideKeys?: string[]; blockedPrefixes: string[]}} */
|
|
const policy = JSON.parse(fs.readFileSync(policyPath, "utf8"));
|
|
|
|
const renderSwiftStringArray = (items) => items.map((item) => ` "${item}"`).join(",\n");
|
|
|
|
const generated = `// Generated file. Do not edit directly.
|
|
// Source: src/infra/host-env-security-policy.json
|
|
// Regenerate: node scripts/generate-host-env-security-policy-swift.mjs --write
|
|
|
|
import Foundation
|
|
|
|
enum HostEnvSecurityPolicy {
|
|
static let blockedKeys: Set<String> = [
|
|
${renderSwiftStringArray(policy.blockedKeys)}
|
|
]
|
|
|
|
static let blockedOverrideKeys: Set<String> = [
|
|
${renderSwiftStringArray(policy.blockedOverrideKeys ?? [])}
|
|
]
|
|
|
|
static let blockedPrefixes: [String] = [
|
|
${renderSwiftStringArray(policy.blockedPrefixes)}
|
|
]
|
|
}
|
|
`;
|
|
|
|
const current = fs.existsSync(outputPath) ? fs.readFileSync(outputPath, "utf8") : null;
|
|
|
|
if (checkOnly) {
|
|
if (current === generated) {
|
|
console.log(`OK ${path.relative(repoRoot, outputPath)}`);
|
|
process.exit(0);
|
|
}
|
|
console.error(
|
|
[
|
|
`Out of date ${path.relative(repoRoot, outputPath)}.`,
|
|
"Run: node scripts/generate-host-env-security-policy-swift.mjs --write",
|
|
].join("\n"),
|
|
);
|
|
process.exit(1);
|
|
}
|
|
|
|
if (writeMode) {
|
|
if (current !== generated) {
|
|
fs.writeFileSync(outputPath, generated);
|
|
}
|
|
console.log(`Wrote ${path.relative(repoRoot, outputPath)}`);
|
|
}
|