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.
153 lines
4.1 KiB
TypeScript
153 lines
4.1 KiB
TypeScript
import fs from "node:fs/promises";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
|
|
type EnvValue = string | undefined | ((home: string) => string | undefined);
|
|
|
|
type EnvSnapshot = {
|
|
home: string | undefined;
|
|
userProfile: string | undefined;
|
|
homeDrive: string | undefined;
|
|
homePath: string | undefined;
|
|
botHome: string | undefined;
|
|
stateDir: string | undefined;
|
|
};
|
|
|
|
type SharedHomeRootState = {
|
|
rootPromise: Promise<string>;
|
|
nextCaseId: number;
|
|
};
|
|
|
|
const SHARED_HOME_ROOTS = new Map<string, SharedHomeRootState>();
|
|
|
|
function snapshotEnv(): EnvSnapshot {
|
|
return {
|
|
home: process.env.HOME,
|
|
userProfile: process.env.USERPROFILE,
|
|
homeDrive: process.env.HOMEDRIVE,
|
|
homePath: process.env.HOMEPATH,
|
|
botHome: process.env.BOT_HOME,
|
|
stateDir: process.env.BOT_STATE_DIR,
|
|
};
|
|
}
|
|
|
|
function restoreEnv(snapshot: EnvSnapshot) {
|
|
const restoreKey = (key: string, value: string | undefined) => {
|
|
if (value === undefined) {
|
|
delete process.env[key];
|
|
} else {
|
|
process.env[key] = value;
|
|
}
|
|
};
|
|
restoreKey("HOME", snapshot.home);
|
|
restoreKey("USERPROFILE", snapshot.userProfile);
|
|
restoreKey("HOMEDRIVE", snapshot.homeDrive);
|
|
restoreKey("HOMEPATH", snapshot.homePath);
|
|
restoreKey("BOT_HOME", snapshot.botHome);
|
|
restoreKey("BOT_STATE_DIR", snapshot.stateDir);
|
|
}
|
|
|
|
function snapshotExtraEnv(keys: string[]): Record<string, string | undefined> {
|
|
const snapshot: Record<string, string | undefined> = {};
|
|
for (const key of keys) {
|
|
snapshot[key] = process.env[key];
|
|
}
|
|
return snapshot;
|
|
}
|
|
|
|
function restoreExtraEnv(snapshot: Record<string, string | undefined>) {
|
|
for (const [key, value] of Object.entries(snapshot)) {
|
|
if (value === undefined) {
|
|
delete process.env[key];
|
|
} else {
|
|
process.env[key] = value;
|
|
}
|
|
}
|
|
}
|
|
|
|
function setTempHome(base: string) {
|
|
process.env.HOME = base;
|
|
process.env.USERPROFILE = base;
|
|
// Ensure tests using HOME isolation aren't affected by leaked BOT_HOME.
|
|
delete process.env.BOT_HOME;
|
|
process.env.BOT_STATE_DIR = path.join(base, ".bot");
|
|
|
|
if (process.platform !== "win32") {
|
|
return;
|
|
}
|
|
const match = base.match(/^([A-Za-z]:)(.*)$/);
|
|
if (!match) {
|
|
return;
|
|
}
|
|
process.env.HOMEDRIVE = match[1];
|
|
process.env.HOMEPATH = match[2] || "\\";
|
|
}
|
|
|
|
async function allocateTempHomeBase(prefix: string): Promise<string> {
|
|
let state = SHARED_HOME_ROOTS.get(prefix);
|
|
if (!state) {
|
|
state = {
|
|
rootPromise: fs.mkdtemp(path.join(os.tmpdir(), prefix)),
|
|
nextCaseId: 0,
|
|
};
|
|
SHARED_HOME_ROOTS.set(prefix, state);
|
|
}
|
|
const root = await state.rootPromise;
|
|
const base = path.join(root, `case-${state.nextCaseId++}`);
|
|
await fs.mkdir(base, { recursive: true });
|
|
return base;
|
|
}
|
|
|
|
export async function withTempHome<T>(
|
|
fn: (home: string) => Promise<T>,
|
|
opts: { env?: Record<string, EnvValue>; prefix?: string } = {},
|
|
): Promise<T> {
|
|
const prefix = opts.prefix ?? "bot-test-home-";
|
|
const base = await allocateTempHomeBase(prefix);
|
|
const snapshot = snapshotEnv();
|
|
const envKeys = Object.keys(opts.env ?? {});
|
|
for (const key of envKeys) {
|
|
if (key === "HOME" || key === "USERPROFILE" || key === "HOMEDRIVE" || key === "HOMEPATH") {
|
|
throw new Error(`withTempHome: use built-in home env (got ${key})`);
|
|
}
|
|
}
|
|
const envSnapshot = snapshotExtraEnv(envKeys);
|
|
|
|
setTempHome(base);
|
|
await fs.mkdir(path.join(base, ".bot", "agents", "main", "sessions"), { recursive: true });
|
|
if (opts.env) {
|
|
for (const [key, raw] of Object.entries(opts.env)) {
|
|
const value = typeof raw === "function" ? raw(base) : raw;
|
|
if (value === undefined) {
|
|
delete process.env[key];
|
|
} else {
|
|
process.env[key] = value;
|
|
}
|
|
}
|
|
}
|
|
|
|
try {
|
|
return await fn(base);
|
|
} finally {
|
|
restoreExtraEnv(envSnapshot);
|
|
restoreEnv(snapshot);
|
|
try {
|
|
if (process.platform === "win32") {
|
|
await fs.rm(base, {
|
|
recursive: true,
|
|
force: true,
|
|
maxRetries: 10,
|
|
retryDelay: 50,
|
|
});
|
|
} else {
|
|
await fs.rm(base, {
|
|
recursive: true,
|
|
force: true,
|
|
});
|
|
}
|
|
} catch {
|
|
// ignore cleanup failures in tests
|
|
}
|
|
}
|
|
}
|