Files
openclaw/extensions/codex/src/command-rpc.ts
WhatsSkiLL 38d53e324d fix(codex): preserve user home default for session catalog (#116131)
* fix-codex-preserve-user-home-session-catalog-default

* fix-codex-cover-catalog-reload-proof

* fix-codex-harden-catalog-home-proof

* fix-codex-enforce-proof-cleanup

* test(codex): require proof process shutdown

* fix(codex): honor supervised Unix control connections

---------

Co-authored-by: IWhatsskill <284122573+IWhatsskill@users.noreply.github.com>
Co-authored-by: Peter Steinberger <steipete@gmail.com>
2026-07-31 12:01:17 -07:00

173 lines
5.0 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 {
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 } 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;
};
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 });
return await requestCodexAppServerJson({
method,
requestParams,
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,
});
}
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) };
}
}