From 44afe34b778dda37524a69e89264e186af063b0a Mon Sep 17 00:00:00 2001 From: Cooper Gamble Date: Wed, 3 Jun 2026 10:59:51 +0000 Subject: [PATCH] [codex-app-server] expose per-surface HTTP state bridge [ci changed_files] --- codex-rs/Cargo.lock | 1 + codex-rs/Cargo.toml | 1 + .../schema/json/ClientRequest.json | 88 +++++++++ .../codex_app_server_protocol.schemas.json | 121 ++++++++++++ .../codex_app_server_protocol.v2.schemas.json | 121 ++++++++++++ .../json/v2/HttpStateClearResponse.json | 5 + .../schema/json/v2/HttpStateGetResponse.json | 13 ++ .../schema/json/v2/HttpStateSetParams.json | 20 ++ .../schema/json/v2/HttpStateSetResponse.json | 13 ++ .../schema/typescript/ClientRequest.ts | 3 +- .../typescript/v2/HttpStateClearResponse.ts | 5 + .../typescript/v2/HttpStateGetResponse.ts | 5 + .../typescript/v2/HttpStateSetParams.ts | 10 + .../typescript/v2/HttpStateSetResponse.ts | 5 + .../schema/typescript/v2/index.ts | 4 + .../src/protocol/common.rs | 15 ++ .../src/protocol/v2/http_state.rs | 34 ++++ .../src/protocol/v2/mod.rs | 2 + codex-rs/app-server/Cargo.toml | 1 + codex-rs/app-server/README.md | 5 + codex-rs/app-server/src/message_processor.rs | 16 ++ codex-rs/app-server/src/request_processors.rs | 2 + .../http_state_processor.rs | 85 +++++++++ .../app-server/tests/suite/v2/http_state.rs | 177 ++++++++++++++++++ codex-rs/app-server/tests/suite/v2/mod.rs | 1 + 25 files changed, 752 insertions(+), 1 deletion(-) create mode 100644 codex-rs/app-server-protocol/schema/json/v2/HttpStateClearResponse.json create mode 100644 codex-rs/app-server-protocol/schema/json/v2/HttpStateGetResponse.json create mode 100644 codex-rs/app-server-protocol/schema/json/v2/HttpStateSetParams.json create mode 100644 codex-rs/app-server-protocol/schema/json/v2/HttpStateSetResponse.json create mode 100644 codex-rs/app-server-protocol/schema/typescript/v2/HttpStateClearResponse.ts create mode 100644 codex-rs/app-server-protocol/schema/typescript/v2/HttpStateGetResponse.ts create mode 100644 codex-rs/app-server-protocol/schema/typescript/v2/HttpStateSetParams.ts create mode 100644 codex-rs/app-server-protocol/schema/typescript/v2/HttpStateSetResponse.ts create mode 100644 codex-rs/app-server-protocol/src/protocol/v2/http_state.rs create mode 100644 codex-rs/app-server/src/request_processors/http_state_processor.rs create mode 100644 codex-rs/app-server/tests/suite/v2/http_state.rs diff --git a/codex-rs/Cargo.lock b/codex-rs/Cargo.lock index 94a23926d3..d2a0d0bde5 100644 --- a/codex-rs/Cargo.lock +++ b/codex-rs/Cargo.lock @@ -1928,6 +1928,7 @@ dependencies = [ "codex-git-utils", "codex-guardian", "codex-hooks", + "codex-http-state", "codex-image-generation-extension", "codex-login", "codex-mcp", diff --git a/codex-rs/Cargo.toml b/codex-rs/Cargo.toml index 28714b73be..a3f29df21c 100644 --- a/codex-rs/Cargo.toml +++ b/codex-rs/Cargo.toml @@ -181,6 +181,7 @@ codex-file-search = { path = "file-search" } codex-file-watcher = { path = "file-watcher" } codex-git-utils = { path = "git-utils" } codex-hooks = { path = "hooks" } +codex-http-state = { path = "http-state" } codex-keyring-store = { path = "keyring-store" } codex-linux-sandbox = { path = "linux-sandbox" } codex-lmstudio = { path = "lmstudio" } diff --git a/codex-rs/app-server-protocol/schema/json/ClientRequest.json b/codex-rs/app-server-protocol/schema/json/ClientRequest.json index dc5dd6ad60..bf9544e391 100644 --- a/codex-rs/app-server-protocol/schema/json/ClientRequest.json +++ b/codex-rs/app-server-protocol/schema/json/ClientRequest.json @@ -1083,6 +1083,24 @@ }, "type": "object" }, + "HttpStateSetParams": { + "properties": { + "expectedState": { + "description": "Write only if the calling surface still stores this state. Omit or set to null for an unconditional replacement.", + "type": [ + "string", + "null" + ] + }, + "state": { + "type": "string" + } + }, + "required": [ + "state" + ], + "type": "object" + }, "ImageDetail": { "enum": [ "auto", @@ -5661,6 +5679,76 @@ "title": "ExperimentalFeature/enablement/setRequest", "type": "object" }, + { + "properties": { + "id": { + "$ref": "#/definitions/RequestId" + }, + "method": { + "enum": [ + "httpState/get" + ], + "title": "HttpState/getRequestMethod", + "type": "string" + }, + "params": { + "type": "null" + } + }, + "required": [ + "id", + "method" + ], + "title": "HttpState/getRequest", + "type": "object" + }, + { + "properties": { + "id": { + "$ref": "#/definitions/RequestId" + }, + "method": { + "enum": [ + "httpState/set" + ], + "title": "HttpState/setRequestMethod", + "type": "string" + }, + "params": { + "$ref": "#/definitions/HttpStateSetParams" + } + }, + "required": [ + "id", + "method", + "params" + ], + "title": "HttpState/setRequest", + "type": "object" + }, + { + "properties": { + "id": { + "$ref": "#/definitions/RequestId" + }, + "method": { + "enum": [ + "httpState/clear" + ], + "title": "HttpState/clearRequestMethod", + "type": "string" + }, + "params": { + "type": "null" + } + }, + "required": [ + "id", + "method" + ], + "title": "HttpState/clearRequest", + "type": "object" + }, { "properties": { "id": { diff --git a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json index 6aa4c5f35e..8f139ffb78 100644 --- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json +++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.schemas.json @@ -1573,6 +1573,76 @@ "title": "ExperimentalFeature/enablement/setRequest", "type": "object" }, + { + "properties": { + "id": { + "$ref": "#/definitions/v2/RequestId" + }, + "method": { + "enum": [ + "httpState/get" + ], + "title": "HttpState/getRequestMethod", + "type": "string" + }, + "params": { + "type": "null" + } + }, + "required": [ + "id", + "method" + ], + "title": "HttpState/getRequest", + "type": "object" + }, + { + "properties": { + "id": { + "$ref": "#/definitions/v2/RequestId" + }, + "method": { + "enum": [ + "httpState/set" + ], + "title": "HttpState/setRequestMethod", + "type": "string" + }, + "params": { + "$ref": "#/definitions/v2/HttpStateSetParams" + } + }, + "required": [ + "id", + "method", + "params" + ], + "title": "HttpState/setRequest", + "type": "object" + }, + { + "properties": { + "id": { + "$ref": "#/definitions/v2/RequestId" + }, + "method": { + "enum": [ + "httpState/clear" + ], + "title": "HttpState/clearRequestMethod", + "type": "string" + }, + "params": { + "type": "null" + } + }, + "required": [ + "id", + "method" + ], + "title": "HttpState/clearRequest", + "type": "object" + }, { "properties": { "id": { @@ -10237,6 +10307,57 @@ "title": "HooksListResponse", "type": "object" }, + "HttpStateClearResponse": { + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "HttpStateClearResponse", + "type": "object" + }, + "HttpStateGetResponse": { + "$schema": "http://json-schema.org/draft-07/schema#", + "properties": { + "state": { + "type": [ + "string", + "null" + ] + } + }, + "title": "HttpStateGetResponse", + "type": "object" + }, + "HttpStateSetParams": { + "$schema": "http://json-schema.org/draft-07/schema#", + "properties": { + "expectedState": { + "description": "Write only if the calling surface still stores this state. Omit or set to null for an unconditional replacement.", + "type": [ + "string", + "null" + ] + }, + "state": { + "type": "string" + } + }, + "required": [ + "state" + ], + "title": "HttpStateSetParams", + "type": "object" + }, + "HttpStateSetResponse": { + "$schema": "http://json-schema.org/draft-07/schema#", + "properties": { + "written": { + "type": "boolean" + } + }, + "required": [ + "written" + ], + "title": "HttpStateSetResponse", + "type": "object" + }, "ImageDetail": { "enum": [ "auto", diff --git a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json index 6d859ee5f3..bc9e6a9ae4 100644 --- a/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json +++ b/codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.json @@ -2332,6 +2332,76 @@ "title": "ExperimentalFeature/enablement/setRequest", "type": "object" }, + { + "properties": { + "id": { + "$ref": "#/definitions/RequestId" + }, + "method": { + "enum": [ + "httpState/get" + ], + "title": "HttpState/getRequestMethod", + "type": "string" + }, + "params": { + "type": "null" + } + }, + "required": [ + "id", + "method" + ], + "title": "HttpState/getRequest", + "type": "object" + }, + { + "properties": { + "id": { + "$ref": "#/definitions/RequestId" + }, + "method": { + "enum": [ + "httpState/set" + ], + "title": "HttpState/setRequestMethod", + "type": "string" + }, + "params": { + "$ref": "#/definitions/HttpStateSetParams" + } + }, + "required": [ + "id", + "method", + "params" + ], + "title": "HttpState/setRequest", + "type": "object" + }, + { + "properties": { + "id": { + "$ref": "#/definitions/RequestId" + }, + "method": { + "enum": [ + "httpState/clear" + ], + "title": "HttpState/clearRequestMethod", + "type": "string" + }, + "params": { + "type": "null" + } + }, + "required": [ + "id", + "method" + ], + "title": "HttpState/clearRequest", + "type": "object" + }, { "properties": { "id": { @@ -6710,6 +6780,57 @@ "title": "HooksListResponse", "type": "object" }, + "HttpStateClearResponse": { + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "HttpStateClearResponse", + "type": "object" + }, + "HttpStateGetResponse": { + "$schema": "http://json-schema.org/draft-07/schema#", + "properties": { + "state": { + "type": [ + "string", + "null" + ] + } + }, + "title": "HttpStateGetResponse", + "type": "object" + }, + "HttpStateSetParams": { + "$schema": "http://json-schema.org/draft-07/schema#", + "properties": { + "expectedState": { + "description": "Write only if the calling surface still stores this state. Omit or set to null for an unconditional replacement.", + "type": [ + "string", + "null" + ] + }, + "state": { + "type": "string" + } + }, + "required": [ + "state" + ], + "title": "HttpStateSetParams", + "type": "object" + }, + "HttpStateSetResponse": { + "$schema": "http://json-schema.org/draft-07/schema#", + "properties": { + "written": { + "type": "boolean" + } + }, + "required": [ + "written" + ], + "title": "HttpStateSetResponse", + "type": "object" + }, "ImageDetail": { "enum": [ "auto", diff --git a/codex-rs/app-server-protocol/schema/json/v2/HttpStateClearResponse.json b/codex-rs/app-server-protocol/schema/json/v2/HttpStateClearResponse.json new file mode 100644 index 0000000000..d94db962f3 --- /dev/null +++ b/codex-rs/app-server-protocol/schema/json/v2/HttpStateClearResponse.json @@ -0,0 +1,5 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "HttpStateClearResponse", + "type": "object" +} \ No newline at end of file diff --git a/codex-rs/app-server-protocol/schema/json/v2/HttpStateGetResponse.json b/codex-rs/app-server-protocol/schema/json/v2/HttpStateGetResponse.json new file mode 100644 index 0000000000..81dbf6ab72 --- /dev/null +++ b/codex-rs/app-server-protocol/schema/json/v2/HttpStateGetResponse.json @@ -0,0 +1,13 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "properties": { + "state": { + "type": [ + "string", + "null" + ] + } + }, + "title": "HttpStateGetResponse", + "type": "object" +} \ No newline at end of file diff --git a/codex-rs/app-server-protocol/schema/json/v2/HttpStateSetParams.json b/codex-rs/app-server-protocol/schema/json/v2/HttpStateSetParams.json new file mode 100644 index 0000000000..078e8aeb29 --- /dev/null +++ b/codex-rs/app-server-protocol/schema/json/v2/HttpStateSetParams.json @@ -0,0 +1,20 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "properties": { + "expectedState": { + "description": "Write only if the calling surface still stores this state. Omit or set to null for an unconditional replacement.", + "type": [ + "string", + "null" + ] + }, + "state": { + "type": "string" + } + }, + "required": [ + "state" + ], + "title": "HttpStateSetParams", + "type": "object" +} \ No newline at end of file diff --git a/codex-rs/app-server-protocol/schema/json/v2/HttpStateSetResponse.json b/codex-rs/app-server-protocol/schema/json/v2/HttpStateSetResponse.json new file mode 100644 index 0000000000..0f52c6a234 --- /dev/null +++ b/codex-rs/app-server-protocol/schema/json/v2/HttpStateSetResponse.json @@ -0,0 +1,13 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "properties": { + "written": { + "type": "boolean" + } + }, + "required": [ + "written" + ], + "title": "HttpStateSetResponse", + "type": "object" +} \ No newline at end of file diff --git a/codex-rs/app-server-protocol/schema/typescript/ClientRequest.ts b/codex-rs/app-server-protocol/schema/typescript/ClientRequest.ts index e19ac2dfde..0b144d4e8f 100644 --- a/codex-rs/app-server-protocol/schema/typescript/ClientRequest.ts +++ b/codex-rs/app-server-protocol/schema/typescript/ClientRequest.ts @@ -32,6 +32,7 @@ import type { FsWatchParams } from "./v2/FsWatchParams"; import type { FsWriteFileParams } from "./v2/FsWriteFileParams"; import type { GetAccountParams } from "./v2/GetAccountParams"; import type { HooksListParams } from "./v2/HooksListParams"; +import type { HttpStateSetParams } from "./v2/HttpStateSetParams"; import type { ListMcpServerStatusParams } from "./v2/ListMcpServerStatusParams"; import type { LoginAccountParams } from "./v2/LoginAccountParams"; import type { MarketplaceAddParams } from "./v2/MarketplaceAddParams"; @@ -86,4 +87,4 @@ import type { WindowsSandboxSetupStartParams } from "./v2/WindowsSandboxSetupSta /** * Request from the client to the server. */ -export type ClientRequest ={ "method": "initialize", id: RequestId, params: InitializeParams, } | { "method": "thread/start", id: RequestId, params: ThreadStartParams, } | { "method": "thread/resume", id: RequestId, params: ThreadResumeParams, } | { "method": "thread/fork", id: RequestId, params: ThreadForkParams, } | { "method": "thread/archive", id: RequestId, params: ThreadArchiveParams, } | { "method": "thread/unsubscribe", id: RequestId, params: ThreadUnsubscribeParams, } | { "method": "thread/name/set", id: RequestId, params: ThreadSetNameParams, } | { "method": "thread/goal/set", id: RequestId, params: ThreadGoalSetParams, } | { "method": "thread/goal/get", id: RequestId, params: ThreadGoalGetParams, } | { "method": "thread/goal/clear", id: RequestId, params: ThreadGoalClearParams, } | { "method": "thread/metadata/update", id: RequestId, params: ThreadMetadataUpdateParams, } | { "method": "thread/unarchive", id: RequestId, params: ThreadUnarchiveParams, } | { "method": "thread/compact/start", id: RequestId, params: ThreadCompactStartParams, } | { "method": "thread/shellCommand", id: RequestId, params: ThreadShellCommandParams, } | { "method": "thread/approveGuardianDeniedAction", id: RequestId, params: ThreadApproveGuardianDeniedActionParams, } | { "method": "thread/rollback", id: RequestId, params: ThreadRollbackParams, } | { "method": "thread/list", id: RequestId, params: ThreadListParams, } | { "method": "thread/loaded/list", id: RequestId, params: ThreadLoadedListParams, } | { "method": "thread/read", id: RequestId, params: ThreadReadParams, } | { "method": "thread/inject_items", id: RequestId, params: ThreadInjectItemsParams, } | { "method": "skills/list", id: RequestId, params: SkillsListParams, } | { "method": "skills/extraRoots/set", id: RequestId, params: SkillsExtraRootsSetParams, } | { "method": "hooks/list", id: RequestId, params: HooksListParams, } | { "method": "marketplace/add", id: RequestId, params: MarketplaceAddParams, } | { "method": "marketplace/remove", id: RequestId, params: MarketplaceRemoveParams, } | { "method": "marketplace/upgrade", id: RequestId, params: MarketplaceUpgradeParams, } | { "method": "plugin/list", id: RequestId, params: PluginListParams, } | { "method": "plugin/installed", id: RequestId, params: PluginInstalledParams, } | { "method": "plugin/read", id: RequestId, params: PluginReadParams, } | { "method": "plugin/skill/read", id: RequestId, params: PluginSkillReadParams, } | { "method": "plugin/share/save", id: RequestId, params: PluginShareSaveParams, } | { "method": "plugin/share/updateTargets", id: RequestId, params: PluginShareUpdateTargetsParams, } | { "method": "plugin/share/list", id: RequestId, params: PluginShareListParams, } | { "method": "plugin/share/checkout", id: RequestId, params: PluginShareCheckoutParams, } | { "method": "plugin/share/delete", id: RequestId, params: PluginShareDeleteParams, } | { "method": "app/list", id: RequestId, params: AppsListParams, } | { "method": "fs/readFile", id: RequestId, params: FsReadFileParams, } | { "method": "fs/writeFile", id: RequestId, params: FsWriteFileParams, } | { "method": "fs/createDirectory", id: RequestId, params: FsCreateDirectoryParams, } | { "method": "fs/getMetadata", id: RequestId, params: FsGetMetadataParams, } | { "method": "fs/readDirectory", id: RequestId, params: FsReadDirectoryParams, } | { "method": "fs/remove", id: RequestId, params: FsRemoveParams, } | { "method": "fs/copy", id: RequestId, params: FsCopyParams, } | { "method": "fs/watch", id: RequestId, params: FsWatchParams, } | { "method": "fs/unwatch", id: RequestId, params: FsUnwatchParams, } | { "method": "skills/config/write", id: RequestId, params: SkillsConfigWriteParams, } | { "method": "plugin/install", id: RequestId, params: PluginInstallParams, } | { "method": "plugin/uninstall", id: RequestId, params: PluginUninstallParams, } | { "method": "turn/start", id: RequestId, params: TurnStartParams, } | { "method": "turn/steer", id: RequestId, params: TurnSteerParams, } | { "method": "turn/interrupt", id: RequestId, params: TurnInterruptParams, } | { "method": "review/start", id: RequestId, params: ReviewStartParams, } | { "method": "model/list", id: RequestId, params: ModelListParams, } | { "method": "modelProvider/capabilities/read", id: RequestId, params: ModelProviderCapabilitiesReadParams, } | { "method": "experimentalFeature/list", id: RequestId, params: ExperimentalFeatureListParams, } | { "method": "permissionProfile/list", id: RequestId, params: PermissionProfileListParams, } | { "method": "experimentalFeature/enablement/set", id: RequestId, params: ExperimentalFeatureEnablementSetParams, } | { "method": "mcpServer/oauth/login", id: RequestId, params: McpServerOauthLoginParams, } | { "method": "config/mcpServer/reload", id: RequestId, params: undefined, } | { "method": "mcpServerStatus/list", id: RequestId, params: ListMcpServerStatusParams, } | { "method": "mcpServer/resource/read", id: RequestId, params: McpResourceReadParams, } | { "method": "mcpServer/tool/call", id: RequestId, params: McpServerToolCallParams, } | { "method": "windowsSandbox/setupStart", id: RequestId, params: WindowsSandboxSetupStartParams, } | { "method": "windowsSandbox/readiness", id: RequestId, params: undefined, } | { "method": "account/login/start", id: RequestId, params: LoginAccountParams, } | { "method": "account/login/cancel", id: RequestId, params: CancelLoginAccountParams, } | { "method": "account/logout", id: RequestId, params: undefined, } | { "method": "account/rateLimits/read", id: RequestId, params: undefined, } | { "method": "account/sendAddCreditsNudgeEmail", id: RequestId, params: SendAddCreditsNudgeEmailParams, } | { "method": "feedback/upload", id: RequestId, params: FeedbackUploadParams, } | { "method": "command/exec", id: RequestId, params: CommandExecParams, } | { "method": "command/exec/write", id: RequestId, params: CommandExecWriteParams, } | { "method": "command/exec/terminate", id: RequestId, params: CommandExecTerminateParams, } | { "method": "command/exec/resize", id: RequestId, params: CommandExecResizeParams, } | { "method": "config/read", id: RequestId, params: ConfigReadParams, } | { "method": "externalAgentConfig/detect", id: RequestId, params: ExternalAgentConfigDetectParams, } | { "method": "externalAgentConfig/import", id: RequestId, params: ExternalAgentConfigImportParams, } | { "method": "config/value/write", id: RequestId, params: ConfigValueWriteParams, } | { "method": "config/batchWrite", id: RequestId, params: ConfigBatchWriteParams, } | { "method": "configRequirements/read", id: RequestId, params: undefined, } | { "method": "account/read", id: RequestId, params: GetAccountParams, } | { "method": "getConversationSummary", id: RequestId, params: GetConversationSummaryParams, } | { "method": "gitDiffToRemote", id: RequestId, params: GitDiffToRemoteParams, } | { "method": "getAuthStatus", id: RequestId, params: GetAuthStatusParams, } | { "method": "fuzzyFileSearch", id: RequestId, params: FuzzyFileSearchParams, }; +export type ClientRequest ={ "method": "initialize", id: RequestId, params: InitializeParams, } | { "method": "thread/start", id: RequestId, params: ThreadStartParams, } | { "method": "thread/resume", id: RequestId, params: ThreadResumeParams, } | { "method": "thread/fork", id: RequestId, params: ThreadForkParams, } | { "method": "thread/archive", id: RequestId, params: ThreadArchiveParams, } | { "method": "thread/unsubscribe", id: RequestId, params: ThreadUnsubscribeParams, } | { "method": "thread/name/set", id: RequestId, params: ThreadSetNameParams, } | { "method": "thread/goal/set", id: RequestId, params: ThreadGoalSetParams, } | { "method": "thread/goal/get", id: RequestId, params: ThreadGoalGetParams, } | { "method": "thread/goal/clear", id: RequestId, params: ThreadGoalClearParams, } | { "method": "thread/metadata/update", id: RequestId, params: ThreadMetadataUpdateParams, } | { "method": "thread/unarchive", id: RequestId, params: ThreadUnarchiveParams, } | { "method": "thread/compact/start", id: RequestId, params: ThreadCompactStartParams, } | { "method": "thread/shellCommand", id: RequestId, params: ThreadShellCommandParams, } | { "method": "thread/approveGuardianDeniedAction", id: RequestId, params: ThreadApproveGuardianDeniedActionParams, } | { "method": "thread/rollback", id: RequestId, params: ThreadRollbackParams, } | { "method": "thread/list", id: RequestId, params: ThreadListParams, } | { "method": "thread/loaded/list", id: RequestId, params: ThreadLoadedListParams, } | { "method": "thread/read", id: RequestId, params: ThreadReadParams, } | { "method": "thread/inject_items", id: RequestId, params: ThreadInjectItemsParams, } | { "method": "skills/list", id: RequestId, params: SkillsListParams, } | { "method": "skills/extraRoots/set", id: RequestId, params: SkillsExtraRootsSetParams, } | { "method": "hooks/list", id: RequestId, params: HooksListParams, } | { "method": "marketplace/add", id: RequestId, params: MarketplaceAddParams, } | { "method": "marketplace/remove", id: RequestId, params: MarketplaceRemoveParams, } | { "method": "marketplace/upgrade", id: RequestId, params: MarketplaceUpgradeParams, } | { "method": "plugin/list", id: RequestId, params: PluginListParams, } | { "method": "plugin/installed", id: RequestId, params: PluginInstalledParams, } | { "method": "plugin/read", id: RequestId, params: PluginReadParams, } | { "method": "plugin/skill/read", id: RequestId, params: PluginSkillReadParams, } | { "method": "plugin/share/save", id: RequestId, params: PluginShareSaveParams, } | { "method": "plugin/share/updateTargets", id: RequestId, params: PluginShareUpdateTargetsParams, } | { "method": "plugin/share/list", id: RequestId, params: PluginShareListParams, } | { "method": "plugin/share/checkout", id: RequestId, params: PluginShareCheckoutParams, } | { "method": "plugin/share/delete", id: RequestId, params: PluginShareDeleteParams, } | { "method": "app/list", id: RequestId, params: AppsListParams, } | { "method": "fs/readFile", id: RequestId, params: FsReadFileParams, } | { "method": "fs/writeFile", id: RequestId, params: FsWriteFileParams, } | { "method": "fs/createDirectory", id: RequestId, params: FsCreateDirectoryParams, } | { "method": "fs/getMetadata", id: RequestId, params: FsGetMetadataParams, } | { "method": "fs/readDirectory", id: RequestId, params: FsReadDirectoryParams, } | { "method": "fs/remove", id: RequestId, params: FsRemoveParams, } | { "method": "fs/copy", id: RequestId, params: FsCopyParams, } | { "method": "fs/watch", id: RequestId, params: FsWatchParams, } | { "method": "fs/unwatch", id: RequestId, params: FsUnwatchParams, } | { "method": "skills/config/write", id: RequestId, params: SkillsConfigWriteParams, } | { "method": "plugin/install", id: RequestId, params: PluginInstallParams, } | { "method": "plugin/uninstall", id: RequestId, params: PluginUninstallParams, } | { "method": "turn/start", id: RequestId, params: TurnStartParams, } | { "method": "turn/steer", id: RequestId, params: TurnSteerParams, } | { "method": "turn/interrupt", id: RequestId, params: TurnInterruptParams, } | { "method": "review/start", id: RequestId, params: ReviewStartParams, } | { "method": "model/list", id: RequestId, params: ModelListParams, } | { "method": "modelProvider/capabilities/read", id: RequestId, params: ModelProviderCapabilitiesReadParams, } | { "method": "experimentalFeature/list", id: RequestId, params: ExperimentalFeatureListParams, } | { "method": "permissionProfile/list", id: RequestId, params: PermissionProfileListParams, } | { "method": "experimentalFeature/enablement/set", id: RequestId, params: ExperimentalFeatureEnablementSetParams, } | { "method": "httpState/get", id: RequestId, params: undefined, } | { "method": "httpState/set", id: RequestId, params: HttpStateSetParams, } | { "method": "httpState/clear", id: RequestId, params: undefined, } | { "method": "mcpServer/oauth/login", id: RequestId, params: McpServerOauthLoginParams, } | { "method": "config/mcpServer/reload", id: RequestId, params: undefined, } | { "method": "mcpServerStatus/list", id: RequestId, params: ListMcpServerStatusParams, } | { "method": "mcpServer/resource/read", id: RequestId, params: McpResourceReadParams, } | { "method": "mcpServer/tool/call", id: RequestId, params: McpServerToolCallParams, } | { "method": "windowsSandbox/setupStart", id: RequestId, params: WindowsSandboxSetupStartParams, } | { "method": "windowsSandbox/readiness", id: RequestId, params: undefined, } | { "method": "account/login/start", id: RequestId, params: LoginAccountParams, } | { "method": "account/login/cancel", id: RequestId, params: CancelLoginAccountParams, } | { "method": "account/logout", id: RequestId, params: undefined, } | { "method": "account/rateLimits/read", id: RequestId, params: undefined, } | { "method": "account/sendAddCreditsNudgeEmail", id: RequestId, params: SendAddCreditsNudgeEmailParams, } | { "method": "feedback/upload", id: RequestId, params: FeedbackUploadParams, } | { "method": "command/exec", id: RequestId, params: CommandExecParams, } | { "method": "command/exec/write", id: RequestId, params: CommandExecWriteParams, } | { "method": "command/exec/terminate", id: RequestId, params: CommandExecTerminateParams, } | { "method": "command/exec/resize", id: RequestId, params: CommandExecResizeParams, } | { "method": "config/read", id: RequestId, params: ConfigReadParams, } | { "method": "externalAgentConfig/detect", id: RequestId, params: ExternalAgentConfigDetectParams, } | { "method": "externalAgentConfig/import", id: RequestId, params: ExternalAgentConfigImportParams, } | { "method": "config/value/write", id: RequestId, params: ConfigValueWriteParams, } | { "method": "config/batchWrite", id: RequestId, params: ConfigBatchWriteParams, } | { "method": "configRequirements/read", id: RequestId, params: undefined, } | { "method": "account/read", id: RequestId, params: GetAccountParams, } | { "method": "getConversationSummary", id: RequestId, params: GetConversationSummaryParams, } | { "method": "gitDiffToRemote", id: RequestId, params: GitDiffToRemoteParams, } | { "method": "getAuthStatus", id: RequestId, params: GetAuthStatusParams, } | { "method": "fuzzyFileSearch", id: RequestId, params: FuzzyFileSearchParams, }; diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/HttpStateClearResponse.ts b/codex-rs/app-server-protocol/schema/typescript/v2/HttpStateClearResponse.ts new file mode 100644 index 0000000000..11121f5d4e --- /dev/null +++ b/codex-rs/app-server-protocol/schema/typescript/v2/HttpStateClearResponse.ts @@ -0,0 +1,5 @@ +// GENERATED CODE! DO NOT MODIFY BY HAND! + +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export type HttpStateClearResponse = Record; diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/HttpStateGetResponse.ts b/codex-rs/app-server-protocol/schema/typescript/v2/HttpStateGetResponse.ts new file mode 100644 index 0000000000..faee134ef9 --- /dev/null +++ b/codex-rs/app-server-protocol/schema/typescript/v2/HttpStateGetResponse.ts @@ -0,0 +1,5 @@ +// GENERATED CODE! DO NOT MODIFY BY HAND! + +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export type HttpStateGetResponse = { state: string | null, }; diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/HttpStateSetParams.ts b/codex-rs/app-server-protocol/schema/typescript/v2/HttpStateSetParams.ts new file mode 100644 index 0000000000..5198130e6b --- /dev/null +++ b/codex-rs/app-server-protocol/schema/typescript/v2/HttpStateSetParams.ts @@ -0,0 +1,10 @@ +// GENERATED CODE! DO NOT MODIFY BY HAND! + +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export type HttpStateSetParams = { state: string, +/** + * Write only if the calling surface still stores this state. Omit or set + * to null for an unconditional replacement. + */ +expectedState?: string | null, }; diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/HttpStateSetResponse.ts b/codex-rs/app-server-protocol/schema/typescript/v2/HttpStateSetResponse.ts new file mode 100644 index 0000000000..4e4c797100 --- /dev/null +++ b/codex-rs/app-server-protocol/schema/typescript/v2/HttpStateSetResponse.ts @@ -0,0 +1,5 @@ +// GENERATED CODE! DO NOT MODIFY BY HAND! + +// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. + +export type HttpStateSetResponse = { written: boolean, }; diff --git a/codex-rs/app-server-protocol/schema/typescript/v2/index.ts b/codex-rs/app-server-protocol/schema/typescript/v2/index.ts index 48e1f9580b..50a7cbfa21 100644 --- a/codex-rs/app-server-protocol/schema/typescript/v2/index.ts +++ b/codex-rs/app-server-protocol/schema/typescript/v2/index.ts @@ -167,6 +167,10 @@ export type { HookTrustStatus } from "./HookTrustStatus"; export type { HooksListEntry } from "./HooksListEntry"; export type { HooksListParams } from "./HooksListParams"; export type { HooksListResponse } from "./HooksListResponse"; +export type { HttpStateClearResponse } from "./HttpStateClearResponse"; +export type { HttpStateGetResponse } from "./HttpStateGetResponse"; +export type { HttpStateSetParams } from "./HttpStateSetParams"; +export type { HttpStateSetResponse } from "./HttpStateSetResponse"; export type { ItemCompletedNotification } from "./ItemCompletedNotification"; export type { ItemGuardianApprovalReviewCompletedNotification } from "./ItemGuardianApprovalReviewCompletedNotification"; export type { ItemGuardianApprovalReviewStartedNotification } from "./ItemGuardianApprovalReviewStartedNotification"; diff --git a/codex-rs/app-server-protocol/src/protocol/common.rs b/codex-rs/app-server-protocol/src/protocol/common.rs index 5a60d8d002..748c757c4f 100644 --- a/codex-rs/app-server-protocol/src/protocol/common.rs +++ b/codex-rs/app-server-protocol/src/protocol/common.rs @@ -861,6 +861,21 @@ client_request_definitions! { serialization: global("remote-control-clients"), response: v2::RemoteControlClientsRevokeResponse, }, + HttpStateGet => "httpState/get" { + params: #[ts(type = "undefined")] #[serde(skip_serializing_if = "Option::is_none")] Option<()>, + serialization: global_shared_read("http-state"), + response: v2::HttpStateGetResponse, + }, + HttpStateSet => "httpState/set" { + params: v2::HttpStateSetParams, + serialization: global("http-state"), + response: v2::HttpStateSetResponse, + }, + HttpStateClear => "httpState/clear" { + params: #[ts(type = "undefined")] #[serde(skip_serializing_if = "Option::is_none")] Option<()>, + serialization: global("http-state"), + response: v2::HttpStateClearResponse, + }, #[experimental("collaborationMode/list")] /// Lists collaboration mode presets. CollaborationModeList => "collaborationMode/list" { diff --git a/codex-rs/app-server-protocol/src/protocol/v2/http_state.rs b/codex-rs/app-server-protocol/src/protocol/v2/http_state.rs new file mode 100644 index 0000000000..829a6fa223 --- /dev/null +++ b/codex-rs/app-server-protocol/src/protocol/v2/http_state.rs @@ -0,0 +1,34 @@ +use schemars::JsonSchema; +use serde::Deserialize; +use serde::Serialize; +use ts_rs::TS; + +#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)] +#[serde(rename_all = "camelCase")] +#[ts(export_to = "v2/")] +pub struct HttpStateGetResponse { + pub state: Option, +} + +#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)] +#[serde(rename_all = "camelCase")] +#[ts(export_to = "v2/")] +pub struct HttpStateSetParams { + pub state: String, + /// Write only if the calling surface still stores this state. Omit or set + /// to null for an unconditional replacement. + #[ts(optional = nullable)] + pub expected_state: Option, +} + +#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)] +#[serde(rename_all = "camelCase")] +#[ts(export_to = "v2/")] +pub struct HttpStateSetResponse { + pub written: bool, +} + +#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, JsonSchema, TS)] +#[serde(rename_all = "camelCase")] +#[ts(export_to = "v2/")] +pub struct HttpStateClearResponse {} diff --git a/codex-rs/app-server-protocol/src/protocol/v2/mod.rs b/codex-rs/app-server-protocol/src/protocol/v2/mod.rs index b5fa9fdc65..e297a3c046 100644 --- a/codex-rs/app-server-protocol/src/protocol/v2/mod.rs +++ b/codex-rs/app-server-protocol/src/protocol/v2/mod.rs @@ -11,6 +11,7 @@ mod experimental_feature; mod feedback; mod fs; mod hook; +mod http_state; mod item; mod mcp; mod model; @@ -37,6 +38,7 @@ pub use experimental_feature::*; pub use feedback::*; pub use fs::*; pub use hook::*; +pub use http_state::*; pub use item::*; pub use mcp::*; pub use model::*; diff --git a/codex-rs/app-server/Cargo.toml b/codex-rs/app-server/Cargo.toml index 37cdf219bf..da8dbd2fbf 100644 --- a/codex-rs/app-server/Cargo.toml +++ b/codex-rs/app-server/Cargo.toml @@ -53,6 +53,7 @@ codex-utils-pty = { workspace = true } codex-backend-client = { workspace = true } codex-file-search = { workspace = true } codex-chatgpt = { workspace = true } +codex-http-state = { workspace = true } codex-login = { workspace = true } codex-image-generation-extension = { workspace = true } codex-memories-extension = { workspace = true } diff --git a/codex-rs/app-server/README.md b/codex-rs/app-server/README.md index dc02ff8c04..d0738743e0 100644 --- a/codex-rs/app-server/README.md +++ b/codex-rs/app-server/README.md @@ -214,6 +214,11 @@ Example with notification opt-out: - `remoteControl/client/list` — experimental; list controller devices granted access to an environment. Pass `environmentId` and optional `cursor`, `limit`, and `order`; returns picker-oriented client metadata plus `nextCursor`. This signed-in account-management operation works while the local relay is disabled or unenrolled. - `remoteControl/client/revoke` — experimental; revoke one controller device's grant for an environment. Pass `environmentId` and `clientId`; returns an empty object. This signed-in account-management operation works while the local relay is disabled or unenrolled. - `remoteControl/status/changed` — notification emitted when the remote-control status or client-visible environment id changes. `status` is one of `disabled`, `connecting`, `connected`, or `errored`; `serverName` is the local machine name used by this app-server process; `environmentId` is a string when the app-server has a current enrollment and `null` when that enrollment is cleared, invalidated, or remote control is disabled. Newly initialized app-server clients always receive the current status snapshot. +- `httpState/get` — read the HTTP state file for the initialized client's recognized native surface. Returns `{ state }`, where `state` is `null` when no file exists. +- `httpState/set` — write the initialized client's recognized native-surface HTTP state file. Pass a string `expectedState` to write only when the file still contains that value; omit it or pass `null` to replace the file unconditionally. Returns `{ written }`. +- `httpState/clear` — delete the HTTP state file for the initialized client's recognized native surface. Returns `{}`. + +These methods use the initialized `clientInfo.name` as routing metadata. App-server transport access remains the trust boundary. - `skills/config/write` — write user-level skill config by name or absolute path. - `plugin/install` — install a plugin from a discovered marketplace entry, rejecting marketplace entries marked unavailable for install, install MCPs if any, and return the effective plugin auth policy plus any apps that still need auth (**under development; do not call from production clients yet**). - `plugin/uninstall` — uninstall a local plugin by `pluginId` in `@` form by removing its cached files and clearing its user-level config entry, or uninstall a remote ChatGPT plugin by backend `pluginId` by forwarding the uninstall to the ChatGPT plugin backend and removing any downloaded remote-plugin cache (**under development; do not call from production clients yet**). diff --git a/codex-rs/app-server/src/message_processor.rs b/codex-rs/app-server/src/message_processor.rs index 84f22809ee..72cedbd746 100644 --- a/codex-rs/app-server/src/message_processor.rs +++ b/codex-rs/app-server/src/message_processor.rs @@ -26,6 +26,7 @@ use crate::request_processors::ExternalAgentConfigRequestProcessor; use crate::request_processors::FeedbackRequestProcessor; use crate::request_processors::FsRequestProcessor; use crate::request_processors::GitRequestProcessor; +use crate::request_processors::HttpStateRequestProcessor; use crate::request_processors::InitializeRequestProcessor; use crate::request_processors::MarketplaceRequestProcessor; use crate::request_processors::McpRequestProcessor; @@ -176,6 +177,7 @@ pub(crate) struct MessageProcessor { initialize_processor: InitializeRequestProcessor, marketplace_processor: MarketplaceRequestProcessor, mcp_processor: McpRequestProcessor, + http_state_processor: HttpStateRequestProcessor, plugin_processor: PluginRequestProcessor, remote_control_processor: RemoteControlRequestProcessor, search_processor: SearchRequestProcessor, @@ -400,6 +402,7 @@ impl MessageProcessor { outgoing.clone(), config_manager.clone(), ); + let http_state_processor = HttpStateRequestProcessor::new(config.codex_home.to_path_buf()); let plugin_processor = PluginRequestProcessor::new( auth_manager.clone(), Arc::clone(&thread_manager), @@ -503,6 +506,7 @@ impl MessageProcessor { initialize_processor, marketplace_processor, mcp_processor, + http_state_processor, plugin_processor, remote_control_processor, search_processor, @@ -932,6 +936,18 @@ impl MessageProcessor { .clients_revoke(params) .await .map(|response| Some(response.into())), + ClientRequest::HttpStateGet { .. } => self + .http_state_processor + .get(app_server_client_name.as_deref()) + .map(|response| Some(response.into())), + ClientRequest::HttpStateSet { params, .. } => self + .http_state_processor + .set(app_server_client_name.as_deref(), params) + .map(|response| Some(response.into())), + ClientRequest::HttpStateClear { .. } => self + .http_state_processor + .clear(app_server_client_name.as_deref()) + .map(|response| Some(response.into())), ClientRequest::ConfigRequirementsRead { params: _, .. } => self .config_processor .config_requirements_read() diff --git a/codex-rs/app-server/src/request_processors.rs b/codex-rs/app-server/src/request_processors.rs index 36008ce0b9..73ea4e82cb 100644 --- a/codex-rs/app-server/src/request_processors.rs +++ b/codex-rs/app-server/src/request_processors.rs @@ -463,6 +463,7 @@ mod feedback_doctor_report; mod feedback_processor; mod fs_processor; mod git_processor; +mod http_state_processor; mod initialize_processor; mod marketplace_processor; mod mcp_processor; @@ -485,6 +486,7 @@ pub(crate) use external_agent_config_processor::ExternalAgentConfigRequestProces pub(crate) use feedback_processor::FeedbackRequestProcessor; pub(crate) use fs_processor::FsRequestProcessor; pub(crate) use git_processor::GitRequestProcessor; +pub(crate) use http_state_processor::HttpStateRequestProcessor; pub(crate) use initialize_processor::InitializeRequestProcessor; pub(crate) use marketplace_processor::MarketplaceRequestProcessor; pub(crate) use mcp_processor::McpRequestProcessor; diff --git a/codex-rs/app-server/src/request_processors/http_state_processor.rs b/codex-rs/app-server/src/request_processors/http_state_processor.rs new file mode 100644 index 0000000000..87e0eb8348 --- /dev/null +++ b/codex-rs/app-server/src/request_processors/http_state_processor.rs @@ -0,0 +1,85 @@ +use std::io; +use std::path::PathBuf; + +use codex_app_server_protocol::HttpStateClearResponse; +use codex_app_server_protocol::HttpStateGetResponse; +use codex_app_server_protocol::HttpStateSetParams; +use codex_app_server_protocol::HttpStateSetResponse; +use codex_app_server_protocol::JSONRPCErrorError; +use codex_http_state::HttpStateStore; +use codex_http_state::HttpStateSurface; + +use crate::error_code::internal_error; +use crate::error_code::invalid_request; + +#[derive(Clone)] +pub(crate) struct HttpStateRequestProcessor { + store: HttpStateStore, +} + +impl HttpStateRequestProcessor { + pub(crate) fn new(codex_home: PathBuf) -> Self { + Self { + store: HttpStateStore::new(codex_home), + } + } + + pub(crate) fn get( + &self, + app_server_client_name: Option<&str>, + ) -> Result { + let surface = surface_for_client_name(app_server_client_name)?; + let state = self.store.get(surface).map_err(map_get_error)?; + Ok(HttpStateGetResponse { state }) + } + + pub(crate) fn set( + &self, + app_server_client_name: Option<&str>, + params: HttpStateSetParams, + ) -> Result { + let surface = surface_for_client_name(app_server_client_name)?; + let written = match params.expected_state { + Some(expected_state) => { + self.store + .compare_and_set(surface, &expected_state, params.state) + } + None => self.store.set(surface, params.state).map(|()| true), + } + .map_err(map_set_error)?; + Ok(HttpStateSetResponse { written }) + } + + pub(crate) fn clear( + &self, + app_server_client_name: Option<&str>, + ) -> Result { + let surface = surface_for_client_name(app_server_client_name)?; + self.store.clear(surface).map_err(map_clear_error)?; + Ok(HttpStateClearResponse {}) + } +} + +fn surface_for_client_name( + app_server_client_name: Option<&str>, +) -> Result { + let client_name = app_server_client_name + .ok_or_else(|| invalid_request("HTTP state requires an initialized client"))?; + HttpStateSurface::try_from_app_server_client_name(client_name).ok_or_else(|| { + invalid_request(format!( + "HTTP state is unavailable for app-server client {client_name:?}" + )) + }) +} + +fn map_get_error(error: io::Error) -> JSONRPCErrorError { + internal_error(format!("failed to read HTTP state: {error}")) +} + +fn map_set_error(error: io::Error) -> JSONRPCErrorError { + internal_error(format!("failed to write HTTP state: {error}")) +} + +fn map_clear_error(error: io::Error) -> JSONRPCErrorError { + internal_error(format!("failed to clear HTTP state: {error}")) +} diff --git a/codex-rs/app-server/tests/suite/v2/http_state.rs b/codex-rs/app-server/tests/suite/v2/http_state.rs new file mode 100644 index 0000000000..3763443252 --- /dev/null +++ b/codex-rs/app-server/tests/suite/v2/http_state.rs @@ -0,0 +1,177 @@ +use std::time::Duration; + +use anyhow::Result; +use app_test_support::TestAppServer; +use app_test_support::to_response; +use codex_app_server_protocol::ClientInfo; +use codex_app_server_protocol::HttpStateClearResponse; +use codex_app_server_protocol::HttpStateGetResponse; +use codex_app_server_protocol::HttpStateSetParams; +use codex_app_server_protocol::HttpStateSetResponse; +use codex_app_server_protocol::JSONRPCMessage; +use codex_app_server_protocol::JSONRPCResponse; +use codex_app_server_protocol::RequestId; +use pretty_assertions::assert_eq; +use tempfile::TempDir; +use tokio::time::timeout; + +const DEFAULT_TIMEOUT: Duration = Duration::from_secs(10); +const STATE_N: &str = "state-n"; +const STATE_N_PLUS_ONE: &str = "state-n-plus-one"; + +#[tokio::test] +async fn http_state_bridge_reads_writes_rotates_and_clears_surface_state() -> Result<()> { + let codex_home = TempDir::new()?; + let mut mcp = TestAppServer::new(codex_home.path()).await?; + let initialized = mcp + .initialize_with_capabilities(client_info("codex_desktop_ssh"), /*capabilities*/ None) + .await?; + let JSONRPCMessage::Response(_) = initialized else { + anyhow::bail!("expected initialize response, got {initialized:?}"); + }; + + assert_eq!( + get_state(&mut mcp).await?, + HttpStateGetResponse { state: None } + ); + assert_eq!( + set_state( + &mut mcp, + HttpStateSetParams { + state: STATE_N.to_string(), + expected_state: None, + }, + ) + .await?, + HttpStateSetResponse { written: true } + ); + assert_eq!( + get_state(&mut mcp).await?, + HttpStateGetResponse { + state: Some(STATE_N.to_string()), + } + ); + assert_eq!( + set_state( + &mut mcp, + HttpStateSetParams { + state: STATE_N_PLUS_ONE.to_string(), + expected_state: Some("stale-state".to_string()), + }, + ) + .await?, + HttpStateSetResponse { written: false } + ); + assert_eq!( + get_state(&mut mcp).await?, + HttpStateGetResponse { + state: Some(STATE_N.to_string()), + } + ); + assert_eq!( + set_state( + &mut mcp, + HttpStateSetParams { + state: STATE_N_PLUS_ONE.to_string(), + expected_state: Some(STATE_N.to_string()), + }, + ) + .await?, + HttpStateSetResponse { written: true } + ); + assert_eq!( + get_state(&mut mcp).await?, + HttpStateGetResponse { + state: Some(STATE_N_PLUS_ONE.to_string()), + } + ); + + let request_id = mcp + .send_raw_request("httpState/clear", /*params*/ None) + .await?; + let response: JSONRPCResponse = timeout( + DEFAULT_TIMEOUT, + mcp.read_stream_until_response_message(RequestId::Integer(request_id)), + ) + .await??; + assert_eq!( + to_response::(response)?, + HttpStateClearResponse {} + ); + assert_eq!( + get_state(&mut mcp).await?, + HttpStateGetResponse { state: None } + ); + assert!( + !codex_home + .path() + .join("state/codex_desktop_ssh.json") + .exists() + ); + + Ok(()) +} + +#[tokio::test] +async fn http_state_bridge_rejects_unknown_client_surface() -> Result<()> { + let codex_home = TempDir::new()?; + let mut mcp = TestAppServer::new(codex_home.path()).await?; + let initialized = mcp + .initialize_with_client_info(client_info("third_party_client")) + .await?; + let JSONRPCMessage::Response(_) = initialized else { + anyhow::bail!("expected initialize response, got {initialized:?}"); + }; + + let request_id = mcp + .send_raw_request("httpState/get", /*params*/ None) + .await?; + let error = timeout( + DEFAULT_TIMEOUT, + mcp.read_stream_until_error_message(RequestId::Integer(request_id)), + ) + .await??; + assert_eq!(error.error.code, -32600); + assert_eq!( + error.error.message, + "HTTP state is unavailable for app-server client \"third_party_client\"" + ); + assert_eq!(error.error.data, None); + + Ok(()) +} + +async fn get_state(mcp: &mut TestAppServer) -> Result { + let request_id = mcp + .send_raw_request("httpState/get", /*params*/ None) + .await?; + let response: JSONRPCResponse = timeout( + DEFAULT_TIMEOUT, + mcp.read_stream_until_response_message(RequestId::Integer(request_id)), + ) + .await??; + to_response(response) +} + +async fn set_state( + mcp: &mut TestAppServer, + params: HttpStateSetParams, +) -> Result { + let request_id = mcp + .send_raw_request("httpState/set", Some(serde_json::to_value(params)?)) + .await?; + let response: JSONRPCResponse = timeout( + DEFAULT_TIMEOUT, + mcp.read_stream_until_response_message(RequestId::Integer(request_id)), + ) + .await??; + to_response(response) +} + +fn client_info(name: &str) -> ClientInfo { + ClientInfo { + name: name.to_string(), + title: None, + version: "1.0.0".to_string(), + } +} diff --git a/codex-rs/app-server/tests/suite/v2/mod.rs b/codex-rs/app-server/tests/suite/v2/mod.rs index 9aef40aade..193e4e9d64 100644 --- a/codex-rs/app-server/tests/suite/v2/mod.rs +++ b/codex-rs/app-server/tests/suite/v2/mod.rs @@ -17,6 +17,7 @@ mod experimental_feature_list; mod external_agent_config; mod fs; mod hooks_list; +mod http_state; mod imagegen_extension; mod initialize; mod marketplace_add;