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.
85 lines
2.7 KiB
TypeScript
85 lines
2.7 KiB
TypeScript
import fs from "node:fs/promises";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import { afterEach, describe, expect, it, vi } from "vitest";
|
|
import { withEnvAsync } from "../test-utils/env.js";
|
|
import {
|
|
type AuthProfileStore,
|
|
ensureAuthProfileStore,
|
|
resolveApiKeyForProfile,
|
|
} from "./auth-profiles.js";
|
|
import { CHUTES_TOKEN_ENDPOINT } from "./chutes-oauth.js";
|
|
|
|
describe("auth-profiles (chutes)", () => {
|
|
let tempDir: string | null = null;
|
|
|
|
afterEach(async () => {
|
|
vi.unstubAllGlobals();
|
|
if (tempDir) {
|
|
await fs.rm(tempDir, { recursive: true, force: true });
|
|
tempDir = null;
|
|
}
|
|
});
|
|
|
|
it("refreshes expired Chutes OAuth credentials", async () => {
|
|
tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "bot-chutes-"));
|
|
const agentDir = path.join(tempDir, "agents", "main", "agent");
|
|
await withEnvAsync(
|
|
{
|
|
BOT_STATE_DIR: tempDir,
|
|
BOT_AGENT_DIR: agentDir,
|
|
PI_CODING_AGENT_DIR: agentDir,
|
|
CHUTES_CLIENT_ID: undefined,
|
|
},
|
|
async () => {
|
|
const authProfilePath = path.join(agentDir, "auth-profiles.json");
|
|
await fs.mkdir(path.dirname(authProfilePath), { recursive: true });
|
|
|
|
const store: AuthProfileStore = {
|
|
version: 1,
|
|
profiles: {
|
|
"chutes:default": {
|
|
type: "oauth",
|
|
provider: "chutes",
|
|
access: "at_old",
|
|
refresh: "rt_old",
|
|
expires: Date.now() - 60_000,
|
|
clientId: "cid_test",
|
|
},
|
|
},
|
|
};
|
|
await fs.writeFile(authProfilePath, `${JSON.stringify(store)}\n`);
|
|
|
|
const fetchSpy = vi.fn(async (input: string | URL) => {
|
|
const url = typeof input === "string" ? input : input.toString();
|
|
if (url !== CHUTES_TOKEN_ENDPOINT) {
|
|
return new Response("not found", { status: 404 });
|
|
}
|
|
return new Response(
|
|
JSON.stringify({
|
|
access_token: "at_new",
|
|
expires_in: 3600,
|
|
}),
|
|
{ status: 200, headers: { "Content-Type": "application/json" } },
|
|
);
|
|
});
|
|
vi.stubGlobal("fetch", fetchSpy);
|
|
|
|
const loaded = ensureAuthProfileStore();
|
|
const resolved = await resolveApiKeyForProfile({
|
|
store: loaded,
|
|
profileId: "chutes:default",
|
|
});
|
|
|
|
expect(resolved?.apiKey).toBe("at_new");
|
|
expect(fetchSpy).toHaveBeenCalled();
|
|
|
|
const persisted = JSON.parse(await fs.readFile(authProfilePath, "utf8")) as {
|
|
profiles?: Record<string, { access?: string }>;
|
|
};
|
|
expect(persisted.profiles?.["chutes:default"]?.access).toBe("at_new");
|
|
},
|
|
);
|
|
});
|
|
});
|