mirror of
https://github.com/openclaw/openclaw.git
synced 2026-08-22 02:15:26 -06:00
45dd558d92
* fix(codex): preserve thread ownership across session lifecycles * test(codex): keep canonical context-engine session fixtures * fix(codex): fence replacement thread rollback by ownership * fix(codex): fence thread handoffs by physical client ownership * fix(codex): derive conversation privacy from its source session * fix(codex): claim active native subagents at their lifecycle owner * fix(codex): preserve conversation ownership when detach fails * fix(codex): fence stale native child close notifications * fix(codex): preserve active child ownership during rollback * test(codex): keep lifecycle fixtures aligned with public contracts * fix(codex): preserve rollback failure causes across ownership recovery * fix(codex): retain aggregate rollback causes through lint analysis * fix(codex): release native children when idle retention fails
183 lines
5.7 KiB
TypeScript
183 lines
5.7 KiB
TypeScript
// Codex plugin module implements command rpc behavior.
|
|
import type { resolveCodexAppServerAuthProfileIdForAgent } from "./app-server/auth-bridge.js";
|
|
import {
|
|
CODEX_CONTROL_METHODS,
|
|
describeControlFailure,
|
|
type CodexControlMethod,
|
|
} from "./app-server/capabilities.js";
|
|
import type { CodexAppServerClient } from "./app-server/client.js";
|
|
import {
|
|
resolveCodexAppServerRuntimeOptions,
|
|
resolveCodexSupervisionAppServerRuntimeOptions,
|
|
type CodexAppServerStartOptions,
|
|
} from "./app-server/config.js";
|
|
import { listCodexAppServerModels } from "./app-server/models.js";
|
|
import type {
|
|
CodexAppServerRequestMethod,
|
|
CodexAppServerRequestParams,
|
|
CodexAppServerRequestResult,
|
|
JsonValue,
|
|
} from "./app-server/protocol.js";
|
|
import { requestCodexAppServerJson, withCodexAppServerJsonClient } from "./app-server/request.js";
|
|
|
|
export type SafeValue<T> = { ok: true; value: T } | { ok: false; error: string };
|
|
|
|
type AuthProfileOrderConfig = Parameters<
|
|
typeof resolveCodexAppServerAuthProfileIdForAgent
|
|
>[0]["config"];
|
|
|
|
export type CodexControlRequestOptions = {
|
|
config?: AuthProfileOrderConfig;
|
|
authProfileId?: string | null;
|
|
agentDir?: string;
|
|
sessionKey?: string;
|
|
sessionId?: string;
|
|
isolated?: boolean;
|
|
startOptions?: CodexAppServerStartOptions;
|
|
timeoutMs?: number;
|
|
onResponse?: (response: unknown, client: CodexAppServerClient) => Promise<void>;
|
|
};
|
|
|
|
export function requestOptions(
|
|
pluginConfig: unknown,
|
|
limit: number,
|
|
config?: AuthProfileOrderConfig,
|
|
agentDir?: string,
|
|
) {
|
|
const runtime = resolveCodexAppServerRuntimeOptions({ pluginConfig });
|
|
return {
|
|
limit,
|
|
timeoutMs: runtime.requestTimeoutMs,
|
|
startOptions: runtime.start,
|
|
config,
|
|
agentDir,
|
|
};
|
|
}
|
|
|
|
type CodexControlRequestMethod = CodexControlMethod & CodexAppServerRequestMethod;
|
|
|
|
export function codexControlRequest<M extends CodexControlRequestMethod>(
|
|
pluginConfig: unknown,
|
|
method: M,
|
|
requestParams: CodexAppServerRequestParams<M>,
|
|
options?: CodexControlRequestOptions,
|
|
): Promise<CodexAppServerRequestResult<M>>;
|
|
export function codexControlRequest(
|
|
pluginConfig: unknown,
|
|
method: CodexControlMethod,
|
|
requestParams?: JsonValue,
|
|
options?: CodexControlRequestOptions,
|
|
): Promise<JsonValue | undefined>;
|
|
export async function codexControlRequest(
|
|
pluginConfig: unknown,
|
|
method: CodexControlMethod,
|
|
requestParams?: unknown,
|
|
options: CodexControlRequestOptions = {},
|
|
): Promise<unknown> {
|
|
// Explicit control options own the connection; harness defaults would reject user-home Unix.
|
|
const runtime = options.startOptions
|
|
? resolveCodexSupervisionAppServerRuntimeOptions({ pluginConfig })
|
|
: resolveCodexAppServerRuntimeOptions({ pluginConfig });
|
|
const controlRequestOptions = {
|
|
timeoutMs: options.timeoutMs ?? runtime.requestTimeoutMs,
|
|
startOptions: options.startOptions ?? runtime.start,
|
|
config: options.config,
|
|
sessionKey: options.sessionKey,
|
|
sessionId: options.sessionId,
|
|
authProfileId: options.authProfileId,
|
|
agentDir: options.agentDir,
|
|
isolated: options.isolated,
|
|
};
|
|
if (options.onResponse) {
|
|
return await withCodexAppServerJsonClient(controlRequestOptions, async (request, client) => {
|
|
const response = await request({ method, requestParams });
|
|
// Subscription-producing control requests must publish their exact
|
|
// physical-client ownership before this shared lease can be released.
|
|
await options.onResponse!(response, client);
|
|
return response;
|
|
});
|
|
}
|
|
return await requestCodexAppServerJson({ method, requestParams, ...controlRequestOptions });
|
|
}
|
|
|
|
export function safeCodexControlRequest<M extends CodexControlRequestMethod>(
|
|
pluginConfig: unknown,
|
|
method: M,
|
|
requestParams: CodexAppServerRequestParams<M>,
|
|
options?: CodexControlRequestOptions,
|
|
): Promise<SafeValue<CodexAppServerRequestResult<M>>>;
|
|
export function safeCodexControlRequest(
|
|
pluginConfig: unknown,
|
|
method: CodexControlMethod,
|
|
requestParams?: JsonValue,
|
|
options?: CodexControlRequestOptions,
|
|
): Promise<SafeValue<JsonValue | undefined>>;
|
|
export async function safeCodexControlRequest(
|
|
pluginConfig: unknown,
|
|
method: CodexControlMethod,
|
|
requestParams?: unknown,
|
|
options: CodexControlRequestOptions = {},
|
|
): Promise<SafeValue<unknown>> {
|
|
return await safeValue(
|
|
async () =>
|
|
await codexControlRequest(pluginConfig, method, requestParams as JsonValue, options),
|
|
);
|
|
}
|
|
|
|
async function safeCodexModelList(
|
|
pluginConfig: unknown,
|
|
limit: number,
|
|
config?: AuthProfileOrderConfig,
|
|
agentDir?: string,
|
|
) {
|
|
return await safeValue(
|
|
async () =>
|
|
await listCodexAppServerModels(requestOptions(pluginConfig, limit, config, agentDir)),
|
|
);
|
|
}
|
|
|
|
export async function readCodexStatusProbes(
|
|
pluginConfig: unknown,
|
|
config?: AuthProfileOrderConfig,
|
|
agentDir?: string,
|
|
) {
|
|
const [models, account, limits, mcps, skills] = await Promise.all([
|
|
safeCodexModelList(pluginConfig, 20, config, agentDir),
|
|
safeCodexControlRequest(
|
|
pluginConfig,
|
|
CODEX_CONTROL_METHODS.account,
|
|
{ refreshToken: false },
|
|
{ config, agentDir },
|
|
),
|
|
safeCodexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.rateLimits, undefined, {
|
|
config,
|
|
agentDir,
|
|
}),
|
|
safeCodexControlRequest(
|
|
pluginConfig,
|
|
CODEX_CONTROL_METHODS.listMcpServers,
|
|
{ limit: 100 },
|
|
{ config, agentDir },
|
|
),
|
|
safeCodexControlRequest(
|
|
pluginConfig,
|
|
CODEX_CONTROL_METHODS.listSkills,
|
|
{},
|
|
{
|
|
config,
|
|
agentDir,
|
|
},
|
|
),
|
|
]);
|
|
|
|
return { models, account, limits, mcps, skills };
|
|
}
|
|
|
|
async function safeValue<T>(read: () => Promise<T>): Promise<SafeValue<T>> {
|
|
try {
|
|
return { ok: true, value: await read() };
|
|
} catch (error) {
|
|
return { ok: false, error: describeControlFailure(error) };
|
|
}
|
|
}
|