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.
59 lines
1.5 KiB
JavaScript
Executable File
59 lines
1.5 KiB
JavaScript
Executable File
#!/usr/bin/env -S node --import tsx
|
|
import { spawnSync } from "node:child_process";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import { forceFreePort, type PortProcess } from "../src/cli/ports.js";
|
|
|
|
const DEFAULT_PORT = 18789;
|
|
|
|
function killGatewayListeners(port: number): PortProcess[] {
|
|
try {
|
|
const killed = forceFreePort(port);
|
|
if (killed.length > 0) {
|
|
console.log(
|
|
`freed port ${port}; terminated: ${killed
|
|
.map((p) => `${p.command} (pid ${p.pid})`)
|
|
.join(", ")}`,
|
|
);
|
|
} else {
|
|
console.log(`port ${port} already free`);
|
|
}
|
|
return killed;
|
|
} catch (err) {
|
|
console.error(`failed to free port ${port}: ${String(err)}`);
|
|
return [];
|
|
}
|
|
}
|
|
|
|
function runTests() {
|
|
const isolatedLock =
|
|
process.env.BOT_GATEWAY_LOCK ?? path.join(os.tmpdir(), `bot-gateway.lock.test.${Date.now()}`);
|
|
const result = spawnSync("pnpm", ["vitest", "run"], {
|
|
stdio: "inherit",
|
|
env: {
|
|
...process.env,
|
|
BOT_GATEWAY_LOCK: isolatedLock,
|
|
},
|
|
});
|
|
if (result.error) {
|
|
console.error(`pnpm test failed to start: ${String(result.error)}`);
|
|
process.exit(1);
|
|
}
|
|
process.exit(result.status ?? 1);
|
|
}
|
|
|
|
function main() {
|
|
const port = Number.parseInt(process.env.BOT_GATEWAY_PORT ?? `${DEFAULT_PORT}`, 10);
|
|
|
|
console.log(`🧹 test:force - clearing gateway on port ${port}`);
|
|
const killed = killGatewayListeners(port);
|
|
if (killed.length === 0) {
|
|
console.log("no listeners to kill");
|
|
}
|
|
|
|
console.log("running pnpm test…");
|
|
runTests();
|
|
}
|
|
|
|
main();
|