mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-06 09:10:45 +00:00
fix: sync Codex app-server protocol (#77578)
* fix: sync codex app-server protocol * docs: add codex protocol changelog * fix: refresh codex protocol schemas
This commit is contained in:
committed by
GitHub
parent
0677a4f8b3
commit
d522a18971
@@ -1,8 +1,28 @@
|
||||
import { spawnSync } from "node:child_process";
|
||||
import fs from "node:fs/promises";
|
||||
import path from "node:path";
|
||||
|
||||
const PROTOCOL_SCHEMA_RELATIVE_PATH = "codex-rs/app-server-protocol/schema";
|
||||
|
||||
export const selectedCodexAppServerJsonSchemas = [
|
||||
"DynamicToolCallParams.json",
|
||||
"v2/ErrorNotification.json",
|
||||
"v2/GetAccountResponse.json",
|
||||
"v2/ModelListResponse.json",
|
||||
"v2/ThreadResumeResponse.json",
|
||||
"v2/ThreadStartResponse.json",
|
||||
"v2/TurnCompletedNotification.json",
|
||||
"v2/TurnStartResponse.json",
|
||||
] as const;
|
||||
|
||||
export type GeneratedCodexAppServerProtocolSource = {
|
||||
root: string;
|
||||
codexRepo: string;
|
||||
typescriptRoot: string;
|
||||
jsonRoot: string;
|
||||
cleanup: () => Promise<void>;
|
||||
};
|
||||
|
||||
export async function resolveCodexAppServerProtocolSource(repoRoot: string): Promise<{
|
||||
codexRepo: string;
|
||||
sourceRoot: string;
|
||||
@@ -31,6 +51,61 @@ export async function resolveCodexAppServerProtocolSource(repoRoot: string): Pro
|
||||
);
|
||||
}
|
||||
|
||||
export async function generateExperimentalCodexAppServerProtocolSource(
|
||||
repoRoot = process.cwd(),
|
||||
): Promise<GeneratedCodexAppServerProtocolSource> {
|
||||
const { codexRepo } = await resolveCodexAppServerProtocolSource(repoRoot);
|
||||
const root = await fs.mkdtemp(path.join(repoRoot, ".tmp-codex-app-server-protocol-"));
|
||||
const typescriptRoot = path.join(root, "typescript");
|
||||
const jsonRoot = path.join(root, "json");
|
||||
const manifestPath = path.join(codexRepo, "codex-rs/Cargo.toml");
|
||||
const cleanup = async () => {
|
||||
await fs.rm(root, { recursive: true, force: true });
|
||||
};
|
||||
|
||||
try {
|
||||
runCargoProtocolGenerator(codexRepo, [
|
||||
"run",
|
||||
"--manifest-path",
|
||||
manifestPath,
|
||||
"-p",
|
||||
"codex-cli",
|
||||
"--",
|
||||
"app-server",
|
||||
"generate-ts",
|
||||
"--out",
|
||||
typescriptRoot,
|
||||
"--experimental",
|
||||
]);
|
||||
runCargoProtocolGenerator(codexRepo, [
|
||||
"run",
|
||||
"--manifest-path",
|
||||
manifestPath,
|
||||
"-p",
|
||||
"codex-cli",
|
||||
"--",
|
||||
"app-server",
|
||||
"generate-json-schema",
|
||||
"--out",
|
||||
jsonRoot,
|
||||
"--experimental",
|
||||
]);
|
||||
await rewriteTypeScriptImports(typescriptRoot);
|
||||
formatGeneratedTypeScript(repoRoot, typescriptRoot);
|
||||
} catch (error) {
|
||||
await cleanup();
|
||||
throw error;
|
||||
}
|
||||
|
||||
return {
|
||||
root,
|
||||
codexRepo,
|
||||
typescriptRoot,
|
||||
jsonRoot,
|
||||
cleanup,
|
||||
};
|
||||
}
|
||||
|
||||
async function collectCodexRepoCandidates(repoRoot: string): Promise<string[]> {
|
||||
const candidates = [
|
||||
process.env.OPENCLAW_CODEX_REPO,
|
||||
@@ -72,3 +147,52 @@ async function isDirectory(candidate: string): Promise<boolean> {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
function runCargoProtocolGenerator(codexRepo: string, args: string[]): void {
|
||||
const result = spawnSync("cargo", args, {
|
||||
cwd: codexRepo,
|
||||
stdio: "inherit",
|
||||
});
|
||||
if (result.status !== 0) {
|
||||
throw new Error(`cargo ${args.join(" ")} failed with exit code ${result.status ?? "unknown"}`);
|
||||
}
|
||||
}
|
||||
|
||||
function formatGeneratedTypeScript(repoRoot: string, root: string): void {
|
||||
const result = spawnSync("pnpm", ["exec", "oxfmt", "--write", "--threads=1", root], {
|
||||
cwd: repoRoot,
|
||||
stdio: "inherit",
|
||||
});
|
||||
if (result.status !== 0) {
|
||||
throw new Error(
|
||||
`pnpm exec oxfmt --write --threads=1 ${root} failed with exit code ${
|
||||
result.status ?? "unknown"
|
||||
}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export async function rewriteTypeScriptImports(root: string): Promise<void> {
|
||||
const entries = await fs.readdir(root, { withFileTypes: true });
|
||||
await Promise.all(
|
||||
entries.map(async (entry) => {
|
||||
const fullPath = path.join(root, entry.name);
|
||||
if (entry.isDirectory()) {
|
||||
await rewriteTypeScriptImports(fullPath);
|
||||
return;
|
||||
}
|
||||
if (!entry.isFile() || !entry.name.endsWith(".ts")) {
|
||||
return;
|
||||
}
|
||||
const text = await fs.readFile(fullPath, "utf8");
|
||||
await fs.writeFile(fullPath, normalizeGeneratedTypeScript(text));
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
export function normalizeGeneratedTypeScript(text: string): string {
|
||||
return text
|
||||
.replace(/(from\s+["'])(\.{1,2}\/[^"']+?)(\.js)?(["'])/g, "$1$2.js$4")
|
||||
.replace('export * as v2 from "./v2.js";', 'export * as v2 from "./v2/index.js";')
|
||||
.replaceAll("| null | null", "| null");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user