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.
169 lines
4.8 KiB
TypeScript
169 lines
4.8 KiB
TypeScript
import { spawn } from "node:child_process";
|
|
import { randomUUID } from "node:crypto";
|
|
import fs from "node:fs/promises";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
|
|
type RunResult = {
|
|
code: number | null;
|
|
signal: NodeJS.Signals | null;
|
|
stdout: string;
|
|
stderr: string;
|
|
};
|
|
|
|
function pickAnthropicEnv(): { type: "oauth" | "api"; value: string } | null {
|
|
const oauth = process.env.ANTHROPIC_OAUTH_TOKEN?.trim();
|
|
if (oauth) {
|
|
return { type: "oauth", value: oauth };
|
|
}
|
|
const api = process.env.ANTHROPIC_API_KEY?.trim();
|
|
if (api) {
|
|
return { type: "api", value: api };
|
|
}
|
|
return null;
|
|
}
|
|
|
|
function pickZaiKey(): string | null {
|
|
return process.env.ZAI_API_KEY?.trim() ?? process.env.Z_AI_API_KEY?.trim() ?? null;
|
|
}
|
|
|
|
async function runCommand(
|
|
label: string,
|
|
args: string[],
|
|
env: NodeJS.ProcessEnv,
|
|
): Promise<RunResult> {
|
|
return await new Promise((resolve, reject) => {
|
|
const child = spawn("pnpm", args, {
|
|
env,
|
|
stdio: ["ignore", "pipe", "pipe"],
|
|
});
|
|
let stdout = "";
|
|
let stderr = "";
|
|
child.stdout.on("data", (chunk) => {
|
|
const text = String(chunk);
|
|
stdout += text;
|
|
process.stdout.write(text);
|
|
});
|
|
child.stderr.on("data", (chunk) => {
|
|
const text = String(chunk);
|
|
stderr += text;
|
|
process.stderr.write(text);
|
|
});
|
|
child.on("error", (err) => reject(err));
|
|
child.on("close", (code, signal) => {
|
|
if (code === 0) {
|
|
resolve({ code, signal, stdout, stderr });
|
|
return;
|
|
}
|
|
resolve({ code, signal, stdout, stderr });
|
|
const summary = signal
|
|
? `${label} exited with signal ${signal}`
|
|
: `${label} exited with code ${code}`;
|
|
console.error(summary);
|
|
});
|
|
});
|
|
}
|
|
|
|
async function main() {
|
|
const anthropic = pickAnthropicEnv();
|
|
const zaiKey = pickZaiKey();
|
|
if (!anthropic) {
|
|
console.error("Missing ANTHROPIC_OAUTH_TOKEN or ANTHROPIC_API_KEY.");
|
|
process.exit(1);
|
|
}
|
|
if (!zaiKey) {
|
|
console.error("Missing ZAI_API_KEY or Z_AI_API_KEY.");
|
|
process.exit(1);
|
|
}
|
|
|
|
const baseDir = await fs.mkdtemp(path.join(os.tmpdir(), "bot-zai-fallback-"));
|
|
const stateDir = path.join(baseDir, "state");
|
|
const configPath = path.join(baseDir, "bot.json");
|
|
await fs.mkdir(stateDir, { recursive: true });
|
|
|
|
const config = {
|
|
agents: {
|
|
defaults: {
|
|
model: {
|
|
primary: "anthropic/claude-opus-4-6",
|
|
fallbacks: ["zai/glm-4.7"],
|
|
},
|
|
models: {
|
|
"anthropic/claude-opus-4-6": {},
|
|
"anthropic/claude-opus-4-5": {},
|
|
"zai/glm-4.7": {},
|
|
},
|
|
},
|
|
},
|
|
};
|
|
await fs.writeFile(configPath, JSON.stringify(config, null, 2), "utf8");
|
|
|
|
const sessionId =
|
|
process.env.BOT_ZAI_FALLBACK_SESSION_ID ??
|
|
process.env.CLAWDBOT_ZAI_FALLBACK_SESSION_ID ??
|
|
randomUUID();
|
|
|
|
const baseEnv: NodeJS.ProcessEnv = {
|
|
...process.env,
|
|
BOT_CONFIG_PATH: configPath,
|
|
BOT_STATE_DIR: stateDir,
|
|
CLAWDBOT_CONFIG_PATH: configPath,
|
|
CLAWDBOT_STATE_DIR: stateDir,
|
|
ZAI_API_KEY: zaiKey,
|
|
Z_AI_API_KEY: "",
|
|
};
|
|
|
|
const envValidAnthropic: NodeJS.ProcessEnv = {
|
|
...baseEnv,
|
|
ANTHROPIC_OAUTH_TOKEN: anthropic.type === "oauth" ? anthropic.value : "",
|
|
ANTHROPIC_API_KEY: anthropic.type === "api" ? anthropic.value : "",
|
|
};
|
|
|
|
const envInvalidAnthropic: NodeJS.ProcessEnv = {
|
|
...baseEnv,
|
|
ANTHROPIC_OAUTH_TOKEN: anthropic.type === "oauth" ? "invalid" : "",
|
|
ANTHROPIC_API_KEY: anthropic.type === "api" ? "invalid" : "",
|
|
};
|
|
|
|
console.log("== Run 1: create tool history (primary only)");
|
|
const toolPrompt =
|
|
"Use the exec tool to create a file named zai-fallback-tool.txt with the content tool-ok. " +
|
|
"Then use the read tool to display the file contents. Reply with just the file contents.";
|
|
const run1 = await runCommand(
|
|
"run1",
|
|
["bot", "agent", "--local", "--session-id", sessionId, "--message", toolPrompt],
|
|
envValidAnthropic,
|
|
);
|
|
if (run1.code !== 0) {
|
|
process.exit(run1.code ?? 1);
|
|
}
|
|
|
|
const sessionFile = path.join(stateDir, "agents", "main", "sessions", `${sessionId}.jsonl`);
|
|
const transcript = await fs.readFile(sessionFile, "utf8").catch(() => "");
|
|
if (!transcript.includes('"toolResult"')) {
|
|
console.warn("Warning: no toolResult entries detected in session history.");
|
|
}
|
|
|
|
console.log("== Run 2: force auth failover to Z.AI");
|
|
const followupPrompt =
|
|
"What is the content of zai-fallback-tool.txt? Reply with just the contents.";
|
|
const run2 = await runCommand(
|
|
"run2",
|
|
["bot", "agent", "--local", "--session-id", sessionId, "--message", followupPrompt],
|
|
envInvalidAnthropic,
|
|
);
|
|
|
|
if (run2.code === 0) {
|
|
console.log("PASS: fallback succeeded.");
|
|
process.exit(0);
|
|
}
|
|
|
|
console.error("FAIL: fallback failed.");
|
|
process.exit(run2.code ?? 1);
|
|
}
|
|
|
|
main().catch((err) => {
|
|
console.error(err);
|
|
process.exit(1);
|
|
});
|