mirror of
https://github.com/hanzoai/bot.git
synced 2026-08-06 19:42:37 +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.2 KiB
JavaScript
169 lines
4.2 KiB
JavaScript
#!/usr/bin/env node
|
|
import { execFileSync, spawnSync } from "node:child_process";
|
|
import crypto from "node:crypto";
|
|
import fs from "node:fs";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
|
|
function usage() {
|
|
console.error(
|
|
[
|
|
"Usage:",
|
|
" node scripts/ghsa-patch.mjs --ghsa <GHSA-id-or-url> [--repo owner/name]",
|
|
" --summary <text> --severity <low|medium|high|critical>",
|
|
" --description-file <path>",
|
|
" --vulnerable-version-range <range>",
|
|
" --patched-versions <range-or-null>",
|
|
" [--package bot] [--ecosystem npm] [--cvss <vector>]",
|
|
].join("\n"),
|
|
);
|
|
}
|
|
|
|
function fail(message) {
|
|
console.error(message);
|
|
process.exit(1);
|
|
}
|
|
|
|
function parseArgs(argv) {
|
|
const out = {};
|
|
for (let i = 0; i < argv.length; i += 1) {
|
|
const arg = argv[i];
|
|
if (!arg.startsWith("--")) {
|
|
fail(`Unexpected argument: ${arg}`);
|
|
}
|
|
const key = arg.slice(2);
|
|
const value = argv[i + 1];
|
|
if (!value || value.startsWith("--")) {
|
|
fail(`Missing value for --${key}`);
|
|
}
|
|
out[key] = value;
|
|
i += 1;
|
|
}
|
|
return out;
|
|
}
|
|
|
|
function runGh(args) {
|
|
const proc = spawnSync("gh", args, { encoding: "utf8" });
|
|
if (proc.status !== 0) {
|
|
fail(proc.stderr.trim() || proc.stdout.trim() || `gh ${args.join(" ")} failed`);
|
|
}
|
|
return proc.stdout;
|
|
}
|
|
|
|
function deriveRepoFromOrigin() {
|
|
const remote = execFileSync("git", ["remote", "get-url", "origin"], { encoding: "utf8" }).trim();
|
|
const httpsMatch = remote.match(/github\.com[/:]([^/]+)\/([^/.]+)(?:\.git)?$/);
|
|
if (!httpsMatch) {
|
|
fail(`Could not parse origin remote: ${remote}`);
|
|
}
|
|
return `${httpsMatch[1]}/${httpsMatch[2]}`;
|
|
}
|
|
|
|
function parseGhsaId(value) {
|
|
const match = value.match(/GHSA-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}/i);
|
|
if (!match) {
|
|
fail(`Could not parse GHSA id from: ${value}`);
|
|
}
|
|
return match[0];
|
|
}
|
|
|
|
function writeTempJson(data) {
|
|
const file = path.join(os.tmpdir(), `ghsa-patch-${crypto.randomUUID()}.json`);
|
|
fs.writeFileSync(file, `${JSON.stringify(data, null, 2)}\n`);
|
|
return file;
|
|
}
|
|
|
|
const args = parseArgs(process.argv.slice(2));
|
|
if (!args.ghsa || !args.summary || !args.severity || !args["description-file"]) {
|
|
usage();
|
|
process.exit(1);
|
|
}
|
|
|
|
const repo = args.repo || deriveRepoFromOrigin();
|
|
const ghsaId = parseGhsaId(args.ghsa);
|
|
const advisoryPath = `/repos/${repo}/security-advisories/${ghsaId}`;
|
|
const descriptionPath = path.resolve(args["description-file"]);
|
|
|
|
if (!fs.existsSync(descriptionPath)) {
|
|
fail(`Description file does not exist: ${descriptionPath}`);
|
|
}
|
|
|
|
const current = JSON.parse(runGh(["api", "-H", "X-GitHub-Api-Version: 2022-11-28", advisoryPath]));
|
|
const restoredCvss = args.cvss || current?.cvss?.vector_string || null;
|
|
|
|
const ecosystem = args.ecosystem || "npm";
|
|
const packageName = args.package || "bot";
|
|
const vulnerableRange = args["vulnerable-version-range"];
|
|
const patchedVersionsRaw = args["patched-versions"];
|
|
|
|
if (!vulnerableRange) {
|
|
fail("Missing --vulnerable-version-range");
|
|
}
|
|
if (patchedVersionsRaw === undefined) {
|
|
fail("Missing --patched-versions");
|
|
}
|
|
|
|
const patchedVersions = patchedVersionsRaw === "null" ? null : patchedVersionsRaw;
|
|
const description = fs.readFileSync(descriptionPath, "utf8");
|
|
|
|
const payload = {
|
|
summary: args.summary,
|
|
severity: args.severity,
|
|
description,
|
|
vulnerabilities: [
|
|
{
|
|
package: {
|
|
ecosystem,
|
|
name: packageName,
|
|
},
|
|
vulnerable_version_range: vulnerableRange,
|
|
patched_versions: patchedVersions,
|
|
vulnerable_functions: [],
|
|
},
|
|
],
|
|
};
|
|
|
|
const patchFile = writeTempJson(payload);
|
|
runGh([
|
|
"api",
|
|
"-H",
|
|
"X-GitHub-Api-Version: 2022-11-28",
|
|
"-X",
|
|
"PATCH",
|
|
advisoryPath,
|
|
"--input",
|
|
patchFile,
|
|
]);
|
|
|
|
if (restoredCvss) {
|
|
runGh([
|
|
"api",
|
|
"-H",
|
|
"X-GitHub-Api-Version: 2022-11-28",
|
|
"-X",
|
|
"PATCH",
|
|
advisoryPath,
|
|
"-f",
|
|
`cvss_vector_string=${restoredCvss}`,
|
|
]);
|
|
}
|
|
|
|
const refreshed = JSON.parse(
|
|
runGh(["api", "-H", "X-GitHub-Api-Version: 2022-11-28", advisoryPath]),
|
|
);
|
|
console.log(
|
|
JSON.stringify(
|
|
{
|
|
html_url: refreshed.html_url,
|
|
state: refreshed.state,
|
|
severity: refreshed.severity,
|
|
summary: refreshed.summary,
|
|
vulnerabilities: refreshed.vulnerabilities,
|
|
cvss: refreshed.cvss,
|
|
updated_at: refreshed.updated_at,
|
|
},
|
|
null,
|
|
2,
|
|
),
|
|
);
|