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.
45 lines
1.5 KiB
TypeScript
45 lines
1.5 KiB
TypeScript
import { spawnSync } from "node:child_process";
|
|
import fs from "node:fs/promises";
|
|
import path from "node:path";
|
|
import { describe, expect, it } from "vitest";
|
|
import { withTempHome } from "./helpers/temp-home.ts";
|
|
|
|
describe("cli json stdout contract", () => {
|
|
it("keeps `update status --json` stdout parseable even with legacy doctor preflight inputs", async () => {
|
|
await withTempHome(
|
|
async (tempHome) => {
|
|
const legacyDir = path.join(tempHome, ".clawdbot");
|
|
await fs.mkdir(legacyDir, { recursive: true });
|
|
await fs.writeFile(path.join(legacyDir, "clawdbot.json"), "{}", "utf8");
|
|
|
|
const env = {
|
|
...process.env,
|
|
HOME: tempHome,
|
|
USERPROFILE: tempHome,
|
|
BOT_TEST_FAST: "1",
|
|
};
|
|
delete env.BOT_HOME;
|
|
delete env.BOT_STATE_DIR;
|
|
delete env.BOT_CONFIG_PATH;
|
|
delete env.VITEST;
|
|
|
|
const entry = path.resolve(process.cwd(), "bot.mjs");
|
|
const result = spawnSync(
|
|
process.execPath,
|
|
[entry, "update", "status", "--json", "--timeout", "1"],
|
|
{ cwd: process.cwd(), env, encoding: "utf8" },
|
|
);
|
|
|
|
expect(result.status).toBe(0);
|
|
const stdout = result.stdout.trim();
|
|
expect(stdout.length).toBeGreaterThan(0);
|
|
expect(() => JSON.parse(stdout)).not.toThrow();
|
|
expect(stdout).not.toContain("Doctor warnings");
|
|
expect(stdout).not.toContain("Doctor changes");
|
|
expect(stdout).not.toContain("Config invalid");
|
|
},
|
|
{ prefix: "bot-json-e2e-" },
|
|
);
|
|
});
|
|
});
|