From 1c76065ccd29104901a861574bfc56a10e3d9d44 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Fri, 1 May 2026 18:50:04 +0100 Subject: [PATCH] refactor: trim codex internal exports --- extensions/codex/src/app-server/auth-bridge.ts | 2 +- extensions/codex/src/app-server/capabilities.ts | 2 +- extensions/codex/src/app-server/client.ts | 4 ++-- extensions/codex/src/app-server/computer-use.ts | 4 ++-- extensions/codex/src/app-server/config.ts | 16 ++++++++-------- .../src/app-server/context-engine-projection.ts | 2 +- .../codex/src/app-server/managed-binary.ts | 2 +- .../codex/src/app-server/native-hook-relay.ts | 4 ++-- .../src/app-server/plugin-approval-roundtrip.ts | 2 +- .../codex/src/app-server/user-input-bridge.ts | 2 +- extensions/codex/src/command-formatters.ts | 2 +- extensions/codex/src/command-rpc.ts | 2 +- extensions/codex/src/conversation-binding.ts | 3 --- extensions/codex/src/migration/source.ts | 6 +++--- extensions/codex/src/migration/targets.ts | 2 +- 15 files changed, 26 insertions(+), 29 deletions(-) diff --git a/extensions/codex/src/app-server/auth-bridge.ts b/extensions/codex/src/app-server/auth-bridge.ts index ea3fc3b60f4..af98889b916 100644 --- a/extensions/codex/src/app-server/auth-bridge.ts +++ b/extensions/codex/src/app-server/auth-bridge.ts @@ -123,7 +123,7 @@ export async function applyCodexAppServerAuthProfile(params: { await params.client.request("account/login/start", loginParams); } -export function resolveCodexAppServerAuthProfileLoginParams(params: { +function resolveCodexAppServerAuthProfileLoginParams(params: { agentDir: string; authProfileId?: string; }): Promise { diff --git a/extensions/codex/src/app-server/capabilities.ts b/extensions/codex/src/app-server/capabilities.ts index 40377b95758..0428f29d179 100644 --- a/extensions/codex/src/app-server/capabilities.ts +++ b/extensions/codex/src/app-server/capabilities.ts @@ -12,7 +12,7 @@ export const CODEX_CONTROL_METHODS = { review: "review/start", } as const; -export type CodexControlName = keyof typeof CODEX_CONTROL_METHODS; +type CodexControlName = keyof typeof CODEX_CONTROL_METHODS; export type CodexControlMethod = (typeof CODEX_CONTROL_METHODS)[CodexControlName]; export function describeControlFailure(error: unknown): string { diff --git a/extensions/codex/src/app-server/client.ts b/extensions/codex/src/app-server/client.ts index e78c66d99b6..47f847c7a47 100644 --- a/extensions/codex/src/app-server/client.ts +++ b/extensions/codex/src/app-server/client.ts @@ -46,7 +46,7 @@ export class CodexAppServerRpcError extends Error { } } -export type CodexServerRequestHandler = ( +type CodexServerRequestHandler = ( request: Required> & { params?: JsonValue }, ) => Promise | JsonValue | undefined; @@ -413,7 +413,7 @@ export class CodexAppServerClient { } } -export function defaultServerRequestResponse( +function defaultServerRequestResponse( request: Required> & { params?: JsonValue }, ): JsonValue { if (request.method === "item/tool/call") { diff --git a/extensions/codex/src/app-server/computer-use.ts b/extensions/codex/src/app-server/computer-use.ts index 861c73efda2..895ba584018 100644 --- a/extensions/codex/src/app-server/computer-use.ts +++ b/extensions/codex/src/app-server/computer-use.ts @@ -16,7 +16,7 @@ export type CodexComputerUseRequest = ( params?: unknown, ) => Promise; -export type CodexComputerUseStatusReason = +type CodexComputerUseStatusReason = | "disabled" | "marketplace_missing" | "plugin_not_installed" @@ -42,7 +42,7 @@ export type CodexComputerUseStatus = { message: string; }; -export class CodexComputerUseSetupError extends Error { +class CodexComputerUseSetupError extends Error { readonly status: CodexComputerUseStatus; constructor(status: CodexComputerUseStatus) { diff --git a/extensions/codex/src/app-server/config.ts b/extensions/codex/src/app-server/config.ts index c8ed14d9e71..b8f5ac47aab 100644 --- a/extensions/codex/src/app-server/config.ts +++ b/extensions/codex/src/app-server/config.ts @@ -4,13 +4,13 @@ import type { CodexSandboxPolicy, CodexServiceTier } from "./protocol.js"; const START_OPTIONS_KEY_SECRET = randomBytes(32); -export type CodexAppServerTransportMode = "stdio" | "websocket"; -export type CodexAppServerPolicyMode = "yolo" | "guardian"; +type CodexAppServerTransportMode = "stdio" | "websocket"; +type CodexAppServerPolicyMode = "yolo" | "guardian"; export type CodexAppServerApprovalPolicy = "never" | "on-request" | "on-failure" | "untrusted"; export type CodexAppServerSandboxMode = "read-only" | "workspace-write" | "danger-full-access"; -export type CodexAppServerApprovalsReviewer = "user" | "auto_review" | "guardian_subagent"; -export type CodexAppServerCommandSource = "managed" | "resolved-managed" | "config" | "env"; -export type CodexDynamicToolsProfile = "native-first" | "openclaw-compat"; +type CodexAppServerApprovalsReviewer = "user" | "auto_review" | "guardian_subagent"; +type CodexAppServerCommandSource = "managed" | "resolved-managed" | "config" | "env"; +type CodexDynamicToolsProfile = "native-first" | "openclaw-compat"; export type CodexComputerUseConfig = { enabled?: boolean; @@ -109,9 +109,9 @@ export const CODEX_COMPUTER_USE_CONFIG_KEYS = [ "mcpServerName", ] as const; -export const DEFAULT_CODEX_COMPUTER_USE_PLUGIN_NAME = "computer-use"; -export const DEFAULT_CODEX_COMPUTER_USE_MCP_SERVER_NAME = "computer-use"; -export const DEFAULT_CODEX_COMPUTER_USE_MARKETPLACE_DISCOVERY_TIMEOUT_MS = 60_000; +const DEFAULT_CODEX_COMPUTER_USE_PLUGIN_NAME = "computer-use"; +const DEFAULT_CODEX_COMPUTER_USE_MCP_SERVER_NAME = "computer-use"; +const DEFAULT_CODEX_COMPUTER_USE_MARKETPLACE_DISCOVERY_TIMEOUT_MS = 60_000; const codexAppServerTransportSchema = z.enum(["stdio", "websocket"]); const codexAppServerPolicyModeSchema = z.enum(["yolo", "guardian"]); diff --git a/extensions/codex/src/app-server/context-engine-projection.ts b/extensions/codex/src/app-server/context-engine-projection.ts index 8846ad16b93..6d4c7c8a019 100644 --- a/extensions/codex/src/app-server/context-engine-projection.ts +++ b/extensions/codex/src/app-server/context-engine-projection.ts @@ -1,6 +1,6 @@ import type { AgentMessage } from "openclaw/plugin-sdk/agent-harness-runtime"; -export type CodexContextProjection = { +type CodexContextProjection = { developerInstructionAddition?: string; promptText: string; assembledMessages: AgentMessage[]; diff --git a/extensions/codex/src/app-server/managed-binary.ts b/extensions/codex/src/app-server/managed-binary.ts index c08c3cdc76a..15dd95975c0 100644 --- a/extensions/codex/src/app-server/managed-binary.ts +++ b/extensions/codex/src/app-server/managed-binary.ts @@ -12,7 +12,7 @@ type ManagedCodexAppServerPaths = { candidateCommandPaths: string[]; }; -export type ResolveManagedCodexAppServerOptions = { +type ResolveManagedCodexAppServerOptions = { platform?: NodeJS.Platform; pluginRoot?: string; pathExists?: (filePath: string, platform: NodeJS.Platform) => Promise; diff --git a/extensions/codex/src/app-server/native-hook-relay.ts b/extensions/codex/src/app-server/native-hook-relay.ts index 860693bd696..8c86716378e 100644 --- a/extensions/codex/src/app-server/native-hook-relay.ts +++ b/extensions/codex/src/app-server/native-hook-relay.ts @@ -4,12 +4,12 @@ import type { } from "openclaw/plugin-sdk/agent-harness-runtime"; import type { JsonObject, JsonValue } from "./protocol.js"; -export const CODEX_NATIVE_HOOK_RELAY_EVENTS = [ +export const CODEX_NATIVE_HOOK_RELAY_EVENTS: readonly NativeHookRelayEvent[] = [ "pre_tool_use", "post_tool_use", "permission_request", "before_agent_finalize", -] as const satisfies readonly NativeHookRelayEvent[]; +] as const; type CodexHookEventName = "PreToolUse" | "PostToolUse" | "PermissionRequest" | "Stop"; diff --git a/extensions/codex/src/app-server/plugin-approval-roundtrip.ts b/extensions/codex/src/app-server/plugin-approval-roundtrip.ts index d54db533421..32a9ac31dc2 100644 --- a/extensions/codex/src/app-server/plugin-approval-roundtrip.ts +++ b/extensions/codex/src/app-server/plugin-approval-roundtrip.ts @@ -3,7 +3,7 @@ import { type EmbeddedRunAttemptParams, } from "openclaw/plugin-sdk/agent-harness-runtime"; -export const DEFAULT_CODEX_APPROVAL_TIMEOUT_MS = 120_000; +const DEFAULT_CODEX_APPROVAL_TIMEOUT_MS = 120_000; const MAX_PLUGIN_APPROVAL_TITLE_LENGTH = 80; const MAX_PLUGIN_APPROVAL_DESCRIPTION_LENGTH = 256; diff --git a/extensions/codex/src/app-server/user-input-bridge.ts b/extensions/codex/src/app-server/user-input-bridge.ts index 5e7ba879b61..360c46651ee 100644 --- a/extensions/codex/src/app-server/user-input-bridge.ts +++ b/extensions/codex/src/app-server/user-input-bridge.ts @@ -33,7 +33,7 @@ type UserInputOption = { description: string; }; -export type CodexUserInputBridge = { +type CodexUserInputBridge = { handleRequest: (request: { id: number | string; params?: JsonValue; diff --git a/extensions/codex/src/command-formatters.ts b/extensions/codex/src/command-formatters.ts index 54169b98fbb..a6f935dd429 100644 --- a/extensions/codex/src/command-formatters.ts +++ b/extensions/codex/src/command-formatters.ts @@ -3,7 +3,7 @@ import type { CodexAppServerModelListResult } from "./app-server/models.js"; import { isJsonObject, type JsonObject, type JsonValue } from "./app-server/protocol.js"; import type { SafeValue } from "./command-rpc.js"; -export type CodexStatusProbes = { +type CodexStatusProbes = { models: SafeValue; account: SafeValue; limits: SafeValue; diff --git a/extensions/codex/src/command-rpc.ts b/extensions/codex/src/command-rpc.ts index 42a770456e1..ee6734bd62f 100644 --- a/extensions/codex/src/command-rpc.ts +++ b/extensions/codex/src/command-rpc.ts @@ -70,7 +70,7 @@ export async function safeCodexControlRequest( ); } -export async function safeCodexModelList(pluginConfig: unknown, limit: number) { +async function safeCodexModelList(pluginConfig: unknown, limit: number) { return await safeValue( async () => await listCodexAppServerModels(requestOptions(pluginConfig, limit)), ); diff --git a/extensions/codex/src/conversation-binding.ts b/extensions/codex/src/conversation-binding.ts index b893036a143..7896501c8bd 100644 --- a/extensions/codex/src/conversation-binding.ts +++ b/extensions/codex/src/conversation-binding.ts @@ -36,11 +36,8 @@ import { buildCodexConversationTurnInput } from "./conversation-turn-input.js"; const DEFAULT_BOUND_TURN_TIMEOUT_MS = 20 * 60_000; export { - createCodexConversationBindingData, readCodexConversationBindingData, - readCodexConversationBindingDataRecord, resolveCodexDefaultWorkspaceDir, - type CodexConversationBindingData, } from "./conversation-binding-data.js"; type CodexConversationRunOptions = { diff --git a/extensions/codex/src/migration/source.ts b/extensions/codex/src/migration/source.ts index 67101a561ee..cee268cb673 100644 --- a/extensions/codex/src/migration/source.ts +++ b/extensions/codex/src/migration/source.ts @@ -19,20 +19,20 @@ export type CodexSkillSource = { sourceLabel: string; }; -export type CodexPluginSource = { +type CodexPluginSource = { name: string; source: string; manifestPath: string; }; -export type CodexArchiveSource = { +type CodexArchiveSource = { id: string; path: string; relativePath: string; message?: string; }; -export type CodexSource = { +type CodexSource = { root: string; confidence: "low" | "medium" | "high"; codexHome: string; diff --git a/extensions/codex/src/migration/targets.ts b/extensions/codex/src/migration/targets.ts index 91f209fe183..e9d0643134e 100644 --- a/extensions/codex/src/migration/targets.ts +++ b/extensions/codex/src/migration/targets.ts @@ -7,7 +7,7 @@ import { import type { MigrationProviderContext } from "openclaw/plugin-sdk/plugin-entry"; import { resolveHomePath } from "./helpers.js"; -export type CodexMigrationTargets = { +type CodexMigrationTargets = { workspaceDir: string; agentDir: string; };