mirror of
https://github.com/hanzoai/bot.git
synced 2026-08-06 13:43:29 +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.7 KiB
TypeScript
75 lines
2.7 KiB
TypeScript
import fs from "node:fs";
|
|
import path from "node:path";
|
|
import { fileURLToPath } from "node:url";
|
|
import {
|
|
LEGACY_DAEMON_CLI_EXPORTS,
|
|
resolveLegacyDaemonCliAccessors,
|
|
} from "../src/cli/daemon-cli-compat.ts";
|
|
|
|
const rootDir = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
|
|
const distDir = path.join(rootDir, "dist");
|
|
const cliDir = path.join(distDir, "cli");
|
|
|
|
const findCandidates = () =>
|
|
fs.readdirSync(distDir).filter((entry) => {
|
|
const isDaemonCliBundle =
|
|
entry === "daemon-cli.js" || entry === "daemon-cli.mjs" || entry.startsWith("daemon-cli-");
|
|
if (!isDaemonCliBundle) {
|
|
return false;
|
|
}
|
|
// tsdown can emit either .js or .mjs depending on bundler settings/runtime.
|
|
return entry.endsWith(".js") || entry.endsWith(".mjs");
|
|
});
|
|
|
|
// In rare cases, build output can land slightly after this script starts (depending on FS timing).
|
|
// Retry briefly to avoid flaky builds.
|
|
let candidates = findCandidates();
|
|
for (let i = 0; i < 10 && candidates.length === 0; i++) {
|
|
await new Promise((resolve) => setTimeout(resolve, 50));
|
|
candidates = findCandidates();
|
|
}
|
|
|
|
if (candidates.length === 0) {
|
|
throw new Error("No daemon-cli bundle found in dist; cannot write legacy CLI shim.");
|
|
}
|
|
|
|
const orderedCandidates = candidates.toSorted();
|
|
const resolved = orderedCandidates
|
|
.map((entry) => {
|
|
const source = fs.readFileSync(path.join(distDir, entry), "utf8");
|
|
const accessors = resolveLegacyDaemonCliAccessors(source);
|
|
return { entry, accessors };
|
|
})
|
|
.find((entry) => Boolean(entry.accessors));
|
|
|
|
if (!resolved?.accessors) {
|
|
throw new Error(
|
|
`Could not resolve daemon-cli export aliases from dist bundles: ${orderedCandidates.join(", ")}`,
|
|
);
|
|
}
|
|
|
|
const target = resolved.entry;
|
|
const relPath = `../${target}`;
|
|
const { accessors } = resolved;
|
|
const missingExportError = (name: string) =>
|
|
`Legacy daemon CLI export "${name}" is unavailable in this build. Please upgrade HanzoBot.`;
|
|
const buildExportLine = (name: (typeof LEGACY_DAEMON_CLI_EXPORTS)[number]) => {
|
|
const accessor = accessors[name];
|
|
if (accessor) {
|
|
return `export const ${name} = daemonCli.${accessor};`;
|
|
}
|
|
if (name === "registerDaemonCli") {
|
|
return `export const ${name} = () => { throw new Error(${JSON.stringify(missingExportError(name))}); };`;
|
|
}
|
|
return `export const ${name} = async () => { throw new Error(${JSON.stringify(missingExportError(name))}); };`;
|
|
};
|
|
|
|
const contents =
|
|
"// Legacy shim for pre-tsdown update-cli imports.\n" +
|
|
`import * as daemonCli from "${relPath}";\n` +
|
|
LEGACY_DAEMON_CLI_EXPORTS.map(buildExportLine).join("\n") +
|
|
"\n";
|
|
|
|
fs.mkdirSync(cliDir, { recursive: true });
|
|
fs.writeFileSync(path.join(cliDir, "daemon-cli.js"), contents);
|