mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-03 06:16:32 +00:00
* refactor: extract agent core package Introduce packages/agent-core as the OpenClaw-owned home for reusable agent loop, harness, session, prompt, and runtime dependency contracts. * refactor: extract shared llm runtime Move provider model registries, stream wrappers, OAuth helpers, and LLM utilities into src/llm with plugin-sdk barrels instead of depending on the old embedded runtime layout. * refactor: remove pi runtime internals Rename remaining Pi-shaped agent surfaces to OpenClaw agent runtime names, delete obsolete Pi docs and package graph checks, and add the third-party notice for incorporated code. * refactor: tighten agent session runtime Make agent-core/runtime dependencies explicit, consolidate compaction and session transcript helpers, and move model/session helpers behind OpenClaw-owned contracts. * refactor: remove static model and pi auth paths Drop static model catalogs and Pi auth bridges, move model/provider facts to manifest-owned runtime contracts, and harden internal embedded-agent utilities. * refactor: remove legacy provider compat paths * docs: remove agent parity notes * fix: skip provider wildcard metadata parsing * refactor: share session extension sdk loading * refactor: inline acpx proxy error formatter * refactor: fold edit recovery into edit tool * fix: accept extension batch separator * test: align startup provider plugin expectations * fix: restore provider-scoped release discovery * test: align static asset packaging expectations * fix: run static provider catalogs during scoped discovery * fix: add provider entry catalogs for scoped live discovery * fix: load lightweight provider catalog entries * fix: refresh provider-scoped plugin metadata * fix: keep provider catalog entries on release live path * fix: keep static manifest models in release live checks * fix: harden release model discovery * fix: reduce OpenAI live cache probe reasoning * fix: disable OpenAI cache probe reasoning * ci: extend OpenAI gateway live timeout * fix: extend live gateway model budget * fix: stabilize release validation regressions * fix: honor provider aliases in model rows * fix: stabilize release validation lanes * fix: stabilize release memory qa * ci: stabilize release validation lanes * ci: prefer ipv4 for live docker node calls * fix: restore shared tool-call stream wrapper * ci: remove legacy pi test shard alias * fix: clean up embedded agent test drift * fix: stabilize runtime alias status * fix: clean up embedded agent ci drift * fix: restore release ci invariants * fix: clean up post-rebase runtime drift * fix: restore release ci checks * fix: restore release ci after rebase * fix: remove stale pi runtime path * test: align compaction runtime expectations * test: update plugin prerelease expectations * fix: handle claude live tool approvals * fix: stabilize release validation gates * fix: finish agent runtime import * test: finish post-rebase agent runtime mocks * fix: keep codex compaction native * fix: stabilize codex app-server hook tests * test: isolate codex diagnostic active run * test: remove codex diagnostic completion race # Conflicts: # extensions/codex/src/app-server/run-attempt.test.ts * ci: fix full release manifest performance run id * refactor: narrow llm plugin sdk boundary * chore: drop generated google boundary stamps * fix: repair rebase fallout * fix: clean up rebased runtime references * fix: decode codex jwt payloads as base64url * fix: preserve shipped pi runtime alias * fix: add scoped sdk virtual modules * fix: decode llm codex oauth jwt as base64url * fix: avoid stale vertex adc negative cache * fix: harden tool arg decoding and codeql path * fix: keep vertex adc negative checks live * refactor: consolidate codex jwt and edit helpers * fix: await codex oauth node runtime imports * fix: preserve sdk tool and notice contracts * fix: preserve shipped compat config boundaries * fix: align codex oauth callback host * fix: terminate agent-core loop streams on failure * fix: keep codex oauth callback alive during fallback * ci: include session tools in critical codeql scans * fix: keep Cloudflare Anthropic provider auth header * docs: redirect legacy pi runtime pages * fix: honor bundled web provider compat discovery * fix: protect session output spill files * fix: keep legacy agent dir env blocked * fix: contain auto-discovered skill symlinks * fix: harden agent core sdk proxy surfaces * fix: restore approval reaction sdk compat * fix: keep live docker runs bounded * fix: keep codex oauth redirect host aligned * fix: resolve post-rebase agent runtime drift * fix: redact anthropic oauth parse failures * fix: preserve responses strict tool shaping * fix: repair agent runtime rebase cleanup * docs: redirect retired parity pages * fix: bound auto-discovered resources to roots * fix: repair post-rebase agent test drift * fix: preserve bundled provider allowlist migration * fix: preserve manifest-owned provider aliases * fix: declare photon image dependency * fix: keep provider headers out of proxy body * fix: preserve shipped env aliases * fix: refresh control ui i18n generated state * fix: quote read fallback paths * fix: preview edits through configured backend * test: satisfy core test typecheck * fix: preserve ZAI usage auth fallback * test: repair codex diagnostic test * fix: repair agent runtime rebase drift * test: finish embedded runner import rename * fix: repair agent runtime rebase integrations * test: align compaction oauth fallback expectations * fix: allow sdk-auth session models * fix: update doctor tool schema import * fix: preserve bedrock plugin region * fix: stream harmony-like prose immediately * ci: include session runtime in codeql shards * fix: repair latest rebase integrations * fix: honor explicit codex websocket transport * fix: keep openai-compatible credentials provider-scoped * fix: refresh sdk api baseline after rebase * fix: route cli runtime aliases through openclaw harness * test: rename stale harness mock expectation * test: rename embedded agent overflow calls * test: clean embedded auth test wording * test: use openclaw stream types in deepinfra cache test * fix: refresh sdk api baseline on latest main * fix: honor bundled discovery compat allowlists * fix: refresh sdk api baseline after latest rebase * fix: remove stale rebase imports * test: rename stale model catalog mock * test: mock renamed doctor runtime modules * fix: map canonical kimi env auth * fix: use internal model registry in bench script * fix: migrate deepinfra provider catalog entry * fix: enforce builtin tool suppression * fix: route compaction auth and proxy payloads safely * refactor: prune unused llm registry leftovers * test: update codex hooks session import * test: fix model picker ci coverage * test: align model picker auth mock types
289 lines
8.3 KiB
TypeScript
289 lines
8.3 KiB
TypeScript
import fs from "node:fs/promises";
|
|
import path from "node:path";
|
|
import { resolveCodexAuthProfile, type QaAuthProfileSnapshot } from "./auth-profile.fixture.js";
|
|
|
|
export const CODEX_PLUGIN_CURRENT_VERSION = "2026.5.21";
|
|
export const CODEX_PLUGIN_HEAD_VERSION = "head";
|
|
export const CODEX_PLUGIN_ID = "codex";
|
|
|
|
export const CODEX_PLUGIN_LIFECYCLE_MESSAGES = Object.freeze({
|
|
missingPlugin:
|
|
'Codex plugin is required for Codex runtime. Run "openclaw doctor --fix" to install @openclaw/codex, then retry.',
|
|
});
|
|
|
|
export type CodexPluginFixtureVersion = "missing" | "current" | "head" | (string & {});
|
|
|
|
export type CodexPluginState = {
|
|
installed: boolean;
|
|
version?: string;
|
|
};
|
|
|
|
export type CodexPluginLifecycleStatus = "ready" | "repair-required" | "blocked";
|
|
|
|
export type CodexPluginLifecycleResult = {
|
|
status: CodexPluginLifecycleStatus;
|
|
pluginState: CodexPluginState;
|
|
selectedAuthProfileId?: string;
|
|
tokenRoute?: "codex-oauth" | "unavailable";
|
|
remediation?: string;
|
|
removedRuntimePins: string[];
|
|
};
|
|
|
|
type CodexPluginPackageJson = {
|
|
name: "@openclaw/codex";
|
|
version: string;
|
|
openclaw: {
|
|
install: {
|
|
minHostVersion: string;
|
|
};
|
|
compat: {
|
|
pluginApi: string;
|
|
};
|
|
};
|
|
};
|
|
|
|
type ComparableVersion = {
|
|
major: number;
|
|
minor: number;
|
|
patch: number;
|
|
};
|
|
|
|
type CodexPluginInstallGateResult = {
|
|
text: string;
|
|
inputTokens: number;
|
|
responseCount: number;
|
|
};
|
|
|
|
function codexPluginDir(agentDir: string) {
|
|
return path.join(agentDir, "plugins", CODEX_PLUGIN_ID);
|
|
}
|
|
|
|
function resolveFixtureVersion(version: CodexPluginFixtureVersion): string {
|
|
if (version === "current") {
|
|
return CODEX_PLUGIN_CURRENT_VERSION;
|
|
}
|
|
return version;
|
|
}
|
|
|
|
function buildPackageJson(version: string): CodexPluginPackageJson {
|
|
return {
|
|
name: "@openclaw/codex",
|
|
version,
|
|
openclaw: {
|
|
install: {
|
|
minHostVersion: `>=${version === CODEX_PLUGIN_HEAD_VERSION ? CODEX_PLUGIN_CURRENT_VERSION : version}`,
|
|
},
|
|
compat: {
|
|
pluginApi: `>=${version === CODEX_PLUGIN_HEAD_VERSION ? CODEX_PLUGIN_CURRENT_VERSION : version}`,
|
|
},
|
|
},
|
|
};
|
|
}
|
|
|
|
function parseComparableVersion(value: string | undefined): ComparableVersion | null {
|
|
if (!value || value === CODEX_PLUGIN_HEAD_VERSION) {
|
|
return parseComparableVersion(CODEX_PLUGIN_CURRENT_VERSION);
|
|
}
|
|
const match = value.trim().match(/^(\d+)\.(\d+)\.(\d+)/);
|
|
if (!match) {
|
|
return null;
|
|
}
|
|
return {
|
|
major: Number.parseInt(match[1] ?? "0", 10),
|
|
minor: Number.parseInt(match[2] ?? "0", 10),
|
|
patch: Number.parseInt(match[3] ?? "0", 10),
|
|
};
|
|
}
|
|
|
|
function compareVersions(left: string | undefined, right: string): number {
|
|
const leftVersion = parseComparableVersion(left);
|
|
const rightVersion = parseComparableVersion(right);
|
|
if (!leftVersion || !rightVersion) {
|
|
return 0;
|
|
}
|
|
if (leftVersion.major !== rightVersion.major) {
|
|
return leftVersion.major - rightVersion.major;
|
|
}
|
|
if (leftVersion.minor !== rightVersion.minor) {
|
|
return leftVersion.minor - rightVersion.minor;
|
|
}
|
|
return leftVersion.patch - rightVersion.patch;
|
|
}
|
|
|
|
function formatPinnedOldRemediation(pluginVersion: string, hostVersion: string) {
|
|
return `Codex plugin version ${pluginVersion} is older than OpenClaw ${hostVersion}. Run "openclaw plugins update codex" or unpin codex, then rerun "openclaw doctor --fix".`;
|
|
}
|
|
|
|
function formatPinnedNewRemediation(pluginVersion: string, hostVersion: string) {
|
|
return `Codex plugin version ${pluginVersion} requires a newer OpenClaw host than ${hostVersion}. Upgrade OpenClaw or install a codex plugin version pinned to ${hostVersion}.`;
|
|
}
|
|
|
|
function collectStaleLegacyRuntimePins(config: unknown): string[] {
|
|
if (!config || typeof config !== "object") {
|
|
return [];
|
|
}
|
|
const root = config as {
|
|
agents?: {
|
|
defaults?: { agentRuntime?: { id?: unknown } };
|
|
list?: Record<string, { agentRuntime?: { id?: unknown } }>;
|
|
};
|
|
};
|
|
const markers = new Set<string>();
|
|
const collectRuntimePin = (value: unknown) => {
|
|
if (value === "openclaw") {
|
|
markers.add(`agentRuntime.id=${value}`);
|
|
}
|
|
};
|
|
collectRuntimePin(root.agents?.defaults?.agentRuntime?.id);
|
|
for (const entry of Object.values(root.agents?.list ?? {})) {
|
|
collectRuntimePin(entry.agentRuntime?.id);
|
|
}
|
|
return [...markers].toSorted();
|
|
}
|
|
|
|
export async function seedCodexPluginAt(
|
|
version: CodexPluginFixtureVersion,
|
|
agentDir: string,
|
|
): Promise<void> {
|
|
const targetDir = codexPluginDir(agentDir);
|
|
await fs.rm(targetDir, { recursive: true, force: true });
|
|
if (version === "missing") {
|
|
return;
|
|
}
|
|
|
|
const resolvedVersion = resolveFixtureVersion(version);
|
|
await fs.mkdir(targetDir, { recursive: true });
|
|
await fs.writeFile(
|
|
path.join(targetDir, "package.json"),
|
|
`${JSON.stringify(buildPackageJson(resolvedVersion), null, 2)}\n`,
|
|
"utf8",
|
|
);
|
|
await fs.writeFile(
|
|
path.join(targetDir, "openclaw.plugin.json"),
|
|
`${JSON.stringify({ id: CODEX_PLUGIN_ID, name: "Codex" }, null, 2)}\n`,
|
|
"utf8",
|
|
);
|
|
}
|
|
|
|
export async function snapshotCodexPluginState(agentDir: string): Promise<CodexPluginState> {
|
|
const packagePath = path.join(codexPluginDir(agentDir), "package.json");
|
|
const raw = await fs.readFile(packagePath, "utf8").catch((error: unknown) => {
|
|
if (error && typeof error === "object" && (error as { code?: unknown }).code === "ENOENT") {
|
|
return null;
|
|
}
|
|
throw error;
|
|
});
|
|
if (!raw) {
|
|
return { installed: false };
|
|
}
|
|
|
|
const parsed = JSON.parse(raw) as { version?: unknown };
|
|
return {
|
|
installed: true,
|
|
...(typeof parsed.version === "string" ? { version: parsed.version } : {}),
|
|
};
|
|
}
|
|
|
|
export function evaluateCodexPluginLifecycle(params: {
|
|
plugin: CodexPluginState;
|
|
auth: QaAuthProfileSnapshot;
|
|
hostVersion: string;
|
|
config?: unknown;
|
|
doctorFix?: boolean;
|
|
}): CodexPluginLifecycleResult {
|
|
const authSelection = resolveCodexAuthProfile(params.auth);
|
|
const selectedAuthProfileId =
|
|
authSelection.status === "ready" ? authSelection.profileId : undefined;
|
|
const tokenRoute = authSelection.status === "ready" ? "codex-oauth" : "unavailable";
|
|
const removedRuntimePins = params.doctorFix ? collectStaleLegacyRuntimePins(params.config) : [];
|
|
|
|
if (!params.plugin.installed) {
|
|
return {
|
|
status: "repair-required",
|
|
pluginState: params.plugin,
|
|
...(selectedAuthProfileId ? { selectedAuthProfileId } : {}),
|
|
tokenRoute,
|
|
remediation: CODEX_PLUGIN_LIFECYCLE_MESSAGES.missingPlugin,
|
|
removedRuntimePins,
|
|
};
|
|
}
|
|
|
|
if (authSelection.status === "blocked") {
|
|
return {
|
|
status: "blocked",
|
|
pluginState: params.plugin,
|
|
tokenRoute,
|
|
remediation: authSelection.remediation,
|
|
removedRuntimePins,
|
|
};
|
|
}
|
|
|
|
const versionDelta = compareVersions(params.plugin.version, params.hostVersion);
|
|
if (versionDelta < 0 && params.plugin.version) {
|
|
return {
|
|
status: "blocked",
|
|
pluginState: params.plugin,
|
|
selectedAuthProfileId,
|
|
tokenRoute,
|
|
remediation: formatPinnedOldRemediation(params.plugin.version, params.hostVersion),
|
|
removedRuntimePins,
|
|
};
|
|
}
|
|
if (versionDelta > 0 && params.plugin.version) {
|
|
return {
|
|
status: "blocked",
|
|
pluginState: params.plugin,
|
|
selectedAuthProfileId,
|
|
tokenRoute,
|
|
remediation: formatPinnedNewRemediation(params.plugin.version, params.hostVersion),
|
|
removedRuntimePins,
|
|
};
|
|
}
|
|
|
|
return {
|
|
status: "ready",
|
|
pluginState: params.plugin,
|
|
selectedAuthProfileId,
|
|
tokenRoute,
|
|
removedRuntimePins,
|
|
};
|
|
}
|
|
|
|
export function createCodexPluginInstallGate() {
|
|
const events: string[] = [];
|
|
let installed = false;
|
|
let resolveInstall: (() => void) | undefined;
|
|
const installedPromise = new Promise<void>((resolve) => {
|
|
resolveInstall = resolve;
|
|
});
|
|
|
|
return {
|
|
events,
|
|
markInstalled() {
|
|
if (installed) {
|
|
return;
|
|
}
|
|
installed = true;
|
|
events.push("codex-plugin:installed");
|
|
resolveInstall?.();
|
|
},
|
|
async runFirstTurnAfterInstall(params: {
|
|
inputTokens: number;
|
|
run: () => string | Promise<string>;
|
|
}): Promise<CodexPluginInstallGateResult> {
|
|
if (!installed) {
|
|
events.push("agent-turn:waiting-for-codex-plugin");
|
|
await installedPromise;
|
|
}
|
|
events.push("agent-turn:started");
|
|
const text = await params.run();
|
|
events.push("agent-turn:completed");
|
|
return {
|
|
text,
|
|
inputTokens: params.inputTokens,
|
|
responseCount: 1,
|
|
};
|
|
},
|
|
};
|
|
}
|