Jeremy Rose ccc6e7d7de Merge remote-tracking branch 'origin/main' into nornagon/codex/thread-artifacts-runtime ...

# Conflicts:
#	codex-rs/app-server-protocol/schema/typescript/ClientRequest.ts
#	codex-rs/app-server-protocol/schema/typescript/ServerNotification.ts
#	codex-rs/app-server-protocol/src/protocol/common.rs
#	codex-rs/app-server/Cargo.toml
#	codex-rs/app-server/src/message_processor.rs
#	codex-rs/core/src/tools/spec_plan.rs
#	codex-rs/thread-store/src/local/mod.rs
#	codex-rs/thread-store/src/local/read_thread.rs
#	codex-rs/thread-store/src/local/update_thread_metadata.rs
#	codex-rs/thread-store/src/store.rs
#	codex-rs/tui/src/app/app_server_event_targets.rs

2026-06-01 16:12:27 -07:00

..

v1

[codex] request desktop attestation from app (#20619)

2026-05-08 12:36:02 -07:00

v2

Merge remote-tracking branch 'origin/main' into nornagon/codex/thread-artifacts-runtime

2026-06-01 16:12:27 -07:00

ApplyPatchApprovalParams.json

chore: remove codex-core public protocol/shell re-exports (#12432)

2026-02-20 23:45:35 -08:00

ApplyPatchApprovalResponse.json

representing guardian review timeouts in protocol types (#17381)

2026-04-10 20:02:33 -07:00

AttestationGenerateParams.json

[codex] request desktop attestation from app (#20619)

2026-05-08 12:36:02 -07:00

AttestationGenerateResponse.json

[codex] request desktop attestation from app (#20619)

2026-05-08 12:36:02 -07:00

ChatgptAuthTokensRefreshParams.json

fix(app-server): for external auth, replace id_token with chatgpt_acc… (#11240)

2026-02-09 20:48:58 -08:00

ChatgptAuthTokensRefreshResponse.json

fix(app-server): for external auth, replace id_token with chatgpt_acc… (#11240)

2026-02-09 20:48:58 -08:00

ClientNotification.json

feat: vendor app-server protocol schema fixtures (#10371)

2026-02-01 23:38:43 -08:00

ClientRequest.json

Merge remote-tracking branch 'origin/main' into nornagon/codex/thread-artifacts-runtime

2026-06-01 16:12:27 -07:00

codex_app_server_protocol.schemas.json

Merge remote-tracking branch 'origin/main' into nornagon/codex/thread-artifacts-runtime

2026-06-01 16:12:27 -07:00

codex_app_server_protocol.v2.schemas.json

Merge remote-tracking branch 'origin/main' into nornagon/codex/thread-artifacts-runtime

2026-06-01 16:12:27 -07:00

CommandExecutionRequestApprovalParams.json

Make deny canonical for filesystem permission entries (#23493)

2026-05-19 11:03:47 -07:00

CommandExecutionRequestApprovalResponse.json

feat: include available decisions in command approval requests (#12758)

2026-02-26 01:10:46 +00:00

DynamicToolCallParams.json

app-server: define device key v2 protocol (#18428)

2026-04-21 10:08:42 -07:00

DynamicToolCallResponse.json

feat(app-server, core): allow text + image content items for dynamic tool outputs (#10567)

2026-02-04 16:12:47 -08:00

ExecCommandApprovalParams.json

chore: remove codex-core public protocol/shell re-exports (#12432)

2026-02-20 23:45:35 -08:00

ExecCommandApprovalResponse.json

representing guardian review timeouts in protocol types (#17381)

2026-04-10 20:02:33 -07:00

FileChangeRequestApprovalParams.json

[codex-analytics] plumb protocol-native review timing (#21434)

2026-05-07 20:31:41 -07:00

FileChangeRequestApprovalResponse.json

feat: vendor app-server protocol schema fixtures (#10371)

2026-02-01 23:38:43 -08:00

FuzzyFileSearchParams.json

feat: vendor app-server protocol schema fixtures (#10371)

2026-02-01 23:38:43 -08:00

FuzzyFileSearchResponse.json

Simple directory mentions (#14970)

2026-03-19 05:24:09 +00:00

FuzzyFileSearchSessionCompletedNotification.json

[app-server] add fuzzyFileSearch/sessionCompleted (#11773)

2026-02-13 15:08:14 -08:00

FuzzyFileSearchSessionUpdatedNotification.json

Simple directory mentions (#14970)

2026-03-19 05:24:09 +00:00

JSONRPCError.json

feat: vendor app-server protocol schema fixtures (#10371)

2026-02-01 23:38:43 -08:00

JSONRPCErrorError.json

feat: vendor app-server protocol schema fixtures (#10371)

2026-02-01 23:38:43 -08:00

JSONRPCMessage.json

feat(app-server): add tracing to all app-server APIs (#13285)

2026-03-02 16:01:41 -08:00

JSONRPCNotification.json

feat: vendor app-server protocol schema fixtures (#10371)

2026-02-01 23:38:43 -08:00

JSONRPCRequest.json

feat(app-server): add tracing to all app-server APIs (#13285)

2026-03-02 16:01:41 -08:00

JSONRPCResponse.json

feat: vendor app-server protocol schema fixtures (#10371)

2026-02-01 23:38:43 -08:00

McpServerElicitationRequestParams.json

[elicitations] Switch to use MCP style elicitation payload for mcp tool approvals. (#13621)

2026-03-06 01:50:26 -08:00

McpServerElicitationRequestResponse.json

[elicitations] Switch to use MCP style elicitation payload for mcp tool approvals. (#13621)

2026-03-06 01:50:26 -08:00

PermissionsRequestApprovalParams.json

Make deny canonical for filesystem permission entries (#23493)

2026-05-19 11:03:47 -07:00

PermissionsRequestApprovalResponse.json

Make deny canonical for filesystem permission entries (#23493)

2026-05-19 11:03:47 -07:00

RequestId.json

feat: vendor app-server protocol schema fixtures (#10371)

2026-02-01 23:38:43 -08:00

ServerNotification.json

Merge remote-tracking branch 'origin/main' into nornagon/codex/thread-artifacts-runtime

2026-06-01 16:12:27 -07:00

ServerRequest.json

Make deny canonical for filesystem permission entries (#23493)

2026-05-19 11:03:47 -07:00

ToolRequestUserInputParams.json

feat: vendor app-server protocol schema fixtures (#10371)

2026-02-01 23:38:43 -08:00

ToolRequestUserInputResponse.json

feat: vendor app-server protocol schema fixtures (#10371)

2026-02-01 23:38:43 -08:00