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.
88 lines
2.5 KiB
TypeScript
88 lines
2.5 KiB
TypeScript
import { mkdtempSync } from "node:fs";
|
|
import { tmpdir } from "node:os";
|
|
import { join } from "node:path";
|
|
import { describe, expect, it } from "vitest";
|
|
import {
|
|
normalizeAntigravityModelId,
|
|
normalizeProviders,
|
|
type ProviderConfig,
|
|
} from "./models-config.providers.js";
|
|
|
|
function buildModel(id: string): NonNullable<ProviderConfig["models"]>[number] {
|
|
return {
|
|
id,
|
|
name: id,
|
|
reasoning: true,
|
|
input: ["text"],
|
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
contextWindow: 1,
|
|
maxTokens: 1,
|
|
};
|
|
}
|
|
|
|
function buildProvider(modelIds: string[]): ProviderConfig {
|
|
return {
|
|
baseUrl: "https://example.invalid/v1",
|
|
api: "openai-completions",
|
|
apiKey: "EXAMPLE_KEY",
|
|
models: modelIds.map((id) => buildModel(id)),
|
|
};
|
|
}
|
|
|
|
describe("normalizeAntigravityModelId", () => {
|
|
it.each(["gemini-3-pro", "gemini-3.1-pro", "gemini-3-1-pro"])(
|
|
"adds default -low suffix to bare pro id: %s",
|
|
(id) => {
|
|
expect(normalizeAntigravityModelId(id)).toBe(`${id}-low`);
|
|
},
|
|
);
|
|
|
|
it.each([
|
|
"gemini-3-pro-low",
|
|
"gemini-3-pro-high",
|
|
"gemini-3.1-flash",
|
|
"claude-opus-4-6-thinking",
|
|
])("keeps already-tiered and non-pro ids unchanged: %s", (id) => {
|
|
expect(normalizeAntigravityModelId(id)).toBe(id);
|
|
});
|
|
});
|
|
|
|
describe("google-antigravity provider normalization", () => {
|
|
it("normalizes bare gemini pro IDs only for google-antigravity providers", () => {
|
|
const agentDir = mkdtempSync(join(tmpdir(), "bot-test-"));
|
|
const providers = {
|
|
"google-antigravity": buildProvider([
|
|
"gemini-3-pro",
|
|
"gemini-3.1-pro",
|
|
"gemini-3-1-pro",
|
|
"gemini-3-pro-high",
|
|
"claude-opus-4-6-thinking",
|
|
]),
|
|
openai: buildProvider(["gpt-5"]),
|
|
};
|
|
|
|
const normalized = normalizeProviders({ providers, agentDir });
|
|
|
|
expect(normalized).not.toBe(providers);
|
|
expect(normalized?.["google-antigravity"]?.models.map((model) => model.id)).toEqual([
|
|
"gemini-3-pro-low",
|
|
"gemini-3.1-pro-low",
|
|
"gemini-3-1-pro-low",
|
|
"gemini-3-pro-high",
|
|
"claude-opus-4-6-thinking",
|
|
]);
|
|
expect(normalized?.openai).toBe(providers.openai);
|
|
});
|
|
|
|
it("returns original providers object when no antigravity IDs need normalization", () => {
|
|
const agentDir = mkdtempSync(join(tmpdir(), "bot-test-"));
|
|
const providers = {
|
|
"google-antigravity": buildProvider(["gemini-3-pro-low", "claude-opus-4-6-thinking"]),
|
|
};
|
|
|
|
const normalized = normalizeProviders({ providers, agentDir });
|
|
|
|
expect(normalized).toBe(providers);
|
|
});
|
|
});
|