From 1933d8c1753dc6c59b42d2da2bfbd92912fc8688 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Wed, 13 May 2026 22:55:06 +0100 Subject: [PATCH] Remove Codex plugin feature and mention residue --- notes/fresh-workspace-handoff.md | 8 +++++ state/ledgers.msgpack | Bin 106245 -> 106624 bytes state/map.yaml | 11 ++++-- .../app-server-protocol/src/protocol/v2.rs | 8 ++--- vendor/codex/codex-rs/app-server/README.md | 28 +++------------ .../tests/suite/v2/mcp_server_elicitation.rs | 2 +- .../app-server/tests/suite/v2/turn_start.rs | 5 ++- .../codex-rs/core-skills/src/injection.rs | 32 ++---------------- .../core-skills/src/injection_tests.rs | 2 +- vendor/codex/codex-rs/core/config.schema.json | 12 ------- .../codex-rs/core/src/config_loader/tests.rs | 9 +++-- .../core/src/guardian/review_session.rs | 1 - .../codex/codex-rs/core/src/guardian/tests.rs | 7 +--- .../src/tools/handlers/multi_agents_tests.rs | 10 +++--- .../core/tests/common/context_snapshot.rs | 17 ++-------- .../codex-rs/core/tests/suite/search_tool.rs | 8 ++--- vendor/codex/codex-rs/docs/protocol_v1.md | 2 +- vendor/codex/codex-rs/features/src/lib.rs | 16 --------- vendor/codex/codex-rs/features/src/tests.rs | 4 +-- .../codex/codex-rs/protocol/src/protocol.rs | 2 -- .../codex/codex-rs/protocol/src/user_input.rs | 2 +- vendor/codex/codex-rs/tools/src/agent_tool.rs | 4 +-- ...ests__plugin_detail_popup_installable.snap | 17 ---------- ..._tests__plugin_detail_popup_installed.snap | 15 -------- ...ts__plugins_popup_curated_marketplace.snap | 17 ---------- ...t__tests__plugins_popup_loading_state.snap | 9 ----- ..._tests__plugins_popup_search_filtered.snap | 14 -------- .../tui/src/chatwidget/tests/plan_mode.rs | 2 +- .../codex/codex-rs/tui/src/mention_codec.rs | 9 +++-- 29 files changed, 61 insertions(+), 212 deletions(-) delete mode 100644 vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installable.snap delete mode 100644 vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installed.snap delete mode 100644 vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_curated_marketplace.snap delete mode 100644 vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_loading_state.snap delete mode 100644 vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_search_filtered.snap diff --git a/notes/fresh-workspace-handoff.md b/notes/fresh-workspace-handoff.md index 9bbcc267..b3af036d 100644 --- a/notes/fresh-workspace-handoff.md +++ b/notes/fresh-workspace-handoff.md @@ -871,6 +871,14 @@ no longer advertise app config structs, `Feature::Apps` and the legacy exists. MCP tool approval remains live, but it is now named `McpToolApproval` and lives under MCP server config. +The plugin feature and mention residue is gone too. `Feature::Plugins`, +`Feature::RemotePlugin`, `plugin://` structured mentions, plugin instruction +tags, stale plugin popup snapshots, and app/plugin path classification in +`codex-core-skills` were deleted. Live structured mentions are MCP/skill-shaped +only. Do not resurrect plugin product routing or `app://` compatibility to make +old tests feel less lonely; the blessed route is `mcp://` at the MCP edge and +typed CultCache/CultNet documents inside Epiphany. + That husk has now been cut from `codex-core`. The root core crate no longer exports `plugins`, no longer depends on `codex-core-plugins` or `codex-plugin`, and the core plugin manager / marketplace add-remove-sync modules and tests diff --git a/state/ledgers.msgpack b/state/ledgers.msgpack index e75296284e014547f1e9b207d88049f4731bf751..c228c0bbec1d3baf75e3d94923368c20e3935f1e 100644 GIT binary patch delta 392 zcmZvY&q~8U5Qm9}K7-x{#FLF_6RHwVQs_+xA_(4=?4()T>@GXI!CMRJT@btp;u{Ep z2u1MCOwtA~z5eE#Z~i>~43@uxr~RF`*~h_45bWKrg0EE&B(J*=DfwILgj>3V37p(m;y(MuAygZAWgHb zfrkG{D|EQdhZ|uUML^E_ytQ)Zwd5DZXzO|mgj!SWOvmPpcC(Pt#v35T43*k7IXNZ~ zm@y%tt?`E!qTrwh2h@5pN6;@Y}XWC*&w?axf11W0UvL*qu2p7{V R>cEgnW{@8(Kezn!<`3FAj6MJW delta 49 zcmZoT$kw`#ZGtk>ywe+1r!g{0H1A>DzK4;~c&=E(79#^AGhG8yT|?s#BSR}gODhAD FC;+hq4@3X} diff --git a/state/map.yaml b/state/map.yaml index f8b33394..873ad1c2 100644 --- a/state/map.yaml +++ b/state/map.yaml @@ -280,7 +280,7 @@ rejected_paths: reason: making Epiphany cleaner inside Codex still preserves the wrong organ; Codex must be starved down to OpenAI subscription auth/model transport, while Epiphany data and subsystem communication move to typed CultCache/CultNet. current_status: - summary: The Codex starvation pass has five typing receipts, forty-two processor/foundation cuts, a real physical extraction in `epiphany-codex-bridge`, a root `epiphany-state-model` crate for durable Epiphany state, a source-grounded Codex auth spine inventory, the native `epiphany-openai-adapter` document boundary, a buildable Codex auth/model wrapper in `epiphany-openai-codex-spine`, the first native runtime caller in `epiphany-openai-runtime`, native heartbeat launch planning/job opening in `epiphany-core`, native state-update contract/validation/application in `epiphany-core`, native exact retrieval path matching in `epiphany-core`, and the route-facing mutation/view/coordinator projection services in `epiphany-codex-bridge`. `codex-protocol` no longer defines the durable `Epiphany*` state structs; it re-exports the native model for legacy rollout/API compatibility while `epiphany-core` imports the native model directly. `epiphany-core` now has no direct vendored Codex dependency: pressure derivation accepts native `EpiphanyTokenUsageSnapshot`, Codex rollout replay moved to `codex-core::epiphany_rollout`, and exact retrieval search uses Epiphany-owned workspace walking/path scoring instead of `codex-file-search`. The bridge owns Codex-facing Epiphany adapters for scene, jobs, context/planning/graph query, retrieval/indexing projection, result projection, runtime-spine result adaptation, launch/prompt doctrine, mutation document mechanics, mutation service update/promote/role-accept/reorient-accept/role-launch/reorient-launch/job-launch/job-interrupt application, live-state projection, pressure/pre-compaction rendering, freshness/reorientation projection, CRRC/coordinator/role-board projection, watcher invalidation adaptation, full `thread/epiphany/view` response construction, freshness/context/graph-query response construction, role/reorient result response construction, distill/propose patch-response construction, coordinator status/view construction, and acceptance/evidence signal helpers. Vendored app-server no longer retains root Epiphany modules; `codex_message_processor.rs` still contains route dispatch, JSON-RPC response shaping, watcher registration/snapshotting calls, and notification emission, but its root no longer imports the evacuated Epiphany policy/protocol registry or owns the watcher invalidation manager. Codex product surfaces for apps, skills, plugins, marketplace, and external agent config import are now inert in the app-server compatibility path: list routes return empty lists, mutation/detail/import routes report disabled, `externalAgentConfig/detect` returns no import candidates, helper/import modules and stale implementation-shape tests were deleted, runtime feature enablement no longer supports `apps` or `plugins`, config writes no longer emit plugin-toggle analytics, plugin/skill cache invalidation on config writes is gone, plugin startup warmups and app-list refreshes were removed, and app-server no longer directly depends on `codex-plugin`, `codex-chatgpt`, or `codex-core-plugins`. `Config::to_mcp_config` now keeps user-declared MCP servers but no longer accepts `PluginsManager`, folds plugin MCP servers into the runtime, enables Codex apps, enables skill MCP dependency install, or advertises plugin capability summaries; `TurnContext::apps_enabled()` now returns false so model turns cannot awaken Codex Apps through ChatGPT auth or feature flags; session startup and per-turn context no longer load skills, turns receive an empty `SkillLoadOutcome`, internal `Op::ListSkills` returns empty compatibility entries without loading config layers, plugin roots, skill files, or conversion helpers, the Codex skill watcher has been collapsed to a no-op marker with no file watcher, skill-root registration, cache-clear task, or `SkillsUpdateAvailable` session listener, model turns no longer run skill mention collection, skill env-var prompts, skill MCP dependency installation, skill instruction injection, or implicit skill invocation analytics from shell tools, and the turn prompt/router path no longer loads plugin/app capability summaries, injects available-skill/available-plugin/plugin instruction fragments, parses plugin/app mentions, records app/plugin invocation telemetry, or filters MCP tools through Codex app connectors. The TUI app connector product path is also deleted: no `/apps` slash command, app-link view, connector AppEvent variants, app connector cache/popup/refresh loop, app mention insertion, `app://` mention codec support, stale app-popup tests, or TUI browser-opening shim remains. The `app/list` route and `app/list/updated` notification are gone from app-server protocol, generated schemas, app-server dispatch, test helpers, and docs; `AppInfo`/app-list metadata schema structs are deleted; the orphaned `codex-connectors` crate and `core::connectors` shim are deleted from the workspace; Codex app analytics no longer tracks `codex_app_mentioned` / `codex_app_used` facts, events, reducer arms, client APIs, or dedupe cache state; and `[apps.*]`, `Feature::Apps`, `include_apps_instructions`, app config/read schemas, app managed requirements, app prompt tests, and app file-MCP tests are gone. Live MCP tool approval is now named `McpToolApproval`, not `AppToolApproval`, and remains under MCP server config. `codex_message_processor.rs` is about 9,637 lines; root `message_processor.rs` is about 1,292 lines after the external-agent/config-product cuts; `epiphany_read_routes.rs` is about 579 lines after the full view and read-response extractions; `epiphany_mutation_routes.rs` is about 694 lines after route-load/notification helper cuts and product-surface starvation; `epiphany_state_helpers.rs` is down to a 19-line rollout-state loader; and `codex_thread.rs` is about 1,425 lines after state-update law moved native. `epiphany-openai-adapter` defines CultCache `DatabaseEntry` request/event/receipt/auth-status documents with no Codex app-server or generic JSON dependency. `epiphany-openai-codex-spine` owns all direct Codex auth/model-transport imports for the native OpenAI path: it exposes `default_codex_home` and `auth_manager`, projects `AuthManager` / `CodexAuth` into typed `EpiphanyOpenAiAdapterStatus`, maps typed `EpiphanyOpenAiModelRequest` into Codex API `ResponsesApiRequest`, resolves auth/provider through keeper Codex crates, opens HTTP Responses streams through `codex-api`, maps deltas / completion into typed stream events and receipts, and no longer directly depends on `codex-app-server-protocol` just to name auth mode. `epiphany-openai-runtime` no longer depends directly on `codex-login`; it writes OpenAI status/request/stream-event/receipt records plus runtime sessions/jobs/results/events into `epiphany-core::runtime_spine_cache`, can emit the assistant text artifact for legacy result consumers, is now the default executor for startup-only repo birth specialists, and now has `run-worker` to load a durable `EpiphanyRuntimeWorkerLaunchRequest`, call the typed OpenAI runtime through the spine, persist typed `EpiphanyRuntimeRoleWorkerResult` / `EpiphanyRuntimeReorientWorkerResult` documents, and complete the original heartbeat/specialist runtime job without Codex worker execution; `codex exec` survives only as explicit fallback in repo-birth startup. `epiphany-mvp-coordinator` now invokes `epiphany-openai-runtime run-worker` for launched runtime job ids and no longer creates a second coordinator-owned shadow runtime job/result as a compensator. `epiphany-core::plan_runtime_spine_heartbeat_launch` validates launch contracts/conflicts and projects durable job bindings/runtime links; `epiphany-core::open_runtime_spine_heartbeat_job` owns the initialize-runtime/ensure-session/create-job sequence and now persists `EpiphanyRuntimeWorkerLaunchRequest` CultCache records keyed by runtime job id, with indexed kind/contract fields plus MessagePack-encoded typed launch documents instead of discarding work intent after queue receipt creation; `roleResult` and `reorientResult` now prefer typed worker result documents and fall back only to generic job summaries for older receipts; `epiphany-core::EpiphanyStateUpdate`, `epiphany_state_update_validation_errors`, and `apply_epiphany_state_update` own state-update document shape and mutation law while `codex-core` calls them for compatibility. Vendored `CodexThread::epiphany_launch_job` is now mostly revision check, persistence validation, launch request handoff, and rollout/session writeback for the compatibility route. Vendored `codex-core` no longer has `epiphany_distillation`, `epiphany_promotion`, `epiphany_proposal`, or `epiphany_retrieval` husk modules; it re-exports native surfaces from `epiphany-core` directly, and now owns only the real Codex rollout adapter because it is a host seam. `epiphany-runtime-spine` advertises OpenAI adapter status/model-request/stream-event/receipt CultNet schemas and mutation contracts, so the native caller now has a real storage route instead of only JSON-RPC. MCP itself is correctly JSON at its protocol edge; the target is typed Epiphany intent/result/receipt wrappers around MCP, not replacing MCP JSON. The current OpenAI spine still pulls `codex-api` and a large transport dependency stack, so its next cut is dependency starvation after richer live callers move. + summary: The Codex starvation pass has five typing receipts, forty-three processor/foundation cuts, a real physical extraction in `epiphany-codex-bridge`, a root `epiphany-state-model` crate for durable Epiphany state, a source-grounded Codex auth spine inventory, the native `epiphany-openai-adapter` document boundary, a buildable Codex auth/model wrapper in `epiphany-openai-codex-spine`, the first native runtime caller in `epiphany-openai-runtime`, native heartbeat launch planning/job opening in `epiphany-core`, native state-update contract/validation/application in `epiphany-core`, native exact retrieval path matching in `epiphany-core`, and the route-facing mutation/view/coordinator projection services in `epiphany-codex-bridge`. `codex-protocol` no longer defines the durable `Epiphany*` state structs; it re-exports the native model for legacy rollout/API compatibility while `epiphany-core` imports the native model directly. `epiphany-core` now has no direct vendored Codex dependency: pressure derivation accepts native `EpiphanyTokenUsageSnapshot`, Codex rollout replay moved to `codex-core::epiphany_rollout`, and exact retrieval search uses Epiphany-owned workspace walking/path scoring instead of `codex-file-search`. The bridge owns Codex-facing Epiphany adapters for scene, jobs, context/planning/graph query, retrieval/indexing projection, result projection, runtime-spine result adaptation, launch/prompt doctrine, mutation document mechanics, mutation service update/promote/role-accept/reorient-accept/role-launch/reorient-launch/job-launch/job-interrupt application, live-state projection, pressure/pre-compaction rendering, freshness/reorientation projection, CRRC/coordinator/role-board projection, watcher invalidation adaptation, full `thread/epiphany/view` response construction, freshness/context/graph-query response construction, role/reorient result response construction, distill/propose patch-response construction, coordinator status/view construction, and acceptance/evidence signal helpers. Vendored app-server no longer retains root Epiphany modules; `codex_message_processor.rs` still contains route dispatch, JSON-RPC response shaping, watcher registration/snapshotting calls, and notification emission, but its root no longer imports the evacuated Epiphany policy/protocol registry or owns the watcher invalidation manager. Codex product surfaces for apps, skills, plugins, marketplace, and external agent config import are now inert in the app-server compatibility path: list routes return empty lists, mutation/detail/import routes report disabled, `externalAgentConfig/detect` returns no import candidates, helper/import modules and stale implementation-shape tests were deleted, runtime feature enablement no longer supports `apps` or `plugins`, config writes no longer emit plugin-toggle analytics, plugin/skill cache invalidation on config writes is gone, plugin startup warmups and app-list refreshes were removed, and app-server no longer directly depends on `codex-plugin`, `codex-chatgpt`, or `codex-core-plugins`. `Config::to_mcp_config` now keeps user-declared MCP servers but no longer accepts `PluginsManager`, folds plugin MCP servers into the runtime, enables Codex apps, enables skill MCP dependency install, or advertises plugin capability summaries; `TurnContext::apps_enabled()` now returns false so model turns cannot awaken Codex Apps through ChatGPT auth or feature flags; session startup and per-turn context no longer load skills, turns receive an empty `SkillLoadOutcome`, internal `Op::ListSkills` returns empty compatibility entries without loading config layers, plugin roots, skill files, or conversion helpers, the Codex skill watcher has been collapsed to a no-op marker with no file watcher, skill-root registration, cache-clear task, or `SkillsUpdateAvailable` session listener, model turns no longer run skill mention collection, skill env-var prompts, skill MCP dependency installation, skill instruction injection, or implicit skill invocation analytics from shell tools, and the turn prompt/router path no longer loads plugin/app capability summaries, injects available-skill/available-plugin/plugin instruction fragments, parses plugin/app mentions, records app/plugin invocation telemetry, or filters MCP tools through Codex app connectors. The TUI app connector product path is also deleted: no `/apps` slash command, app-link view, connector AppEvent variants, app connector cache/popup/refresh loop, app mention insertion, `app://` mention codec support, stale app-popup tests, or TUI browser-opening shim remains. The `app/list` route and `app/list/updated` notification are gone from app-server protocol, generated schemas, app-server dispatch, test helpers, and docs; `AppInfo`/app-list metadata schema structs are deleted; the orphaned `codex-connectors` crate and `core::connectors` shim are deleted from the workspace; Codex app analytics no longer tracks `codex_app_mentioned` / `codex_app_used` facts, events, reducer arms, client APIs, or dedupe cache state; `[apps.*]`, `Feature::Apps`, `include_apps_instructions`, app config/read schemas, app managed requirements, app prompt tests, and app file-MCP tests are gone; and `Feature::Plugins`, `Feature::RemotePlugin`, `plugin://` structured mentions, plugin instruction tags, and stale plugin popup snapshots are gone too. Live MCP tool approval is now named `McpToolApproval`, not `AppToolApproval`, and remains under MCP server config; live structured tool mentions are MCP/skill-shaped only. `codex_message_processor.rs` is about 9,637 lines; root `message_processor.rs` is about 1,292 lines after the external-agent/config-product cuts; `epiphany_read_routes.rs` is about 579 lines after the full view and read-response extractions; `epiphany_mutation_routes.rs` is about 694 lines after route-load/notification helper cuts and product-surface starvation; `epiphany_state_helpers.rs` is down to a 19-line rollout-state loader; and `codex_thread.rs` is about 1,425 lines after state-update law moved native. `epiphany-openai-adapter` defines CultCache `DatabaseEntry` request/event/receipt/auth-status documents with no Codex app-server or generic JSON dependency. `epiphany-openai-codex-spine` owns all direct Codex auth/model-transport imports for the native OpenAI path: it exposes `default_codex_home` and `auth_manager`, projects `AuthManager` / `CodexAuth` into typed `EpiphanyOpenAiAdapterStatus`, maps typed `EpiphanyOpenAiModelRequest` into Codex API `ResponsesApiRequest`, resolves auth/provider through keeper Codex crates, opens HTTP Responses streams through `codex-api`, maps deltas / completion into typed stream events and receipts, and no longer directly depends on `codex-app-server-protocol` just to name auth mode. `epiphany-openai-runtime` no longer depends directly on `codex-login`; it writes OpenAI status/request/stream-event/receipt records plus runtime sessions/jobs/results/events into `epiphany-core::runtime_spine_cache`, can emit the assistant text artifact for legacy result consumers, is now the default executor for startup-only repo birth specialists, and now has `run-worker` to load a durable `EpiphanyRuntimeWorkerLaunchRequest`, call the typed OpenAI runtime through the spine, persist typed `EpiphanyRuntimeRoleWorkerResult` / `EpiphanyRuntimeReorientWorkerResult` documents, and complete the original heartbeat/specialist runtime job without Codex worker execution; `codex exec` survives only as explicit fallback in repo-birth startup. `epiphany-mvp-coordinator` now invokes `epiphany-openai-runtime run-worker` for launched runtime job ids and no longer creates a second coordinator-owned shadow runtime job/result as a compensator. `epiphany-core::plan_runtime_spine_heartbeat_launch` validates launch contracts/conflicts and projects durable job bindings/runtime links; `epiphany-core::open_runtime_spine_heartbeat_job` owns the initialize-runtime/ensure-session/create-job sequence and now persists `EpiphanyRuntimeWorkerLaunchRequest` CultCache records keyed by runtime job id, with indexed kind/contract fields plus MessagePack-encoded typed launch documents instead of discarding work intent after queue receipt creation; `roleResult` and `reorientResult` now prefer typed worker result documents and fall back only to generic job summaries for older receipts; `epiphany-core::EpiphanyStateUpdate`, `epiphany_state_update_validation_errors`, and `apply_epiphany_state_update` own state-update document shape and mutation law while `codex-core` calls them for compatibility. Vendored `CodexThread::epiphany_launch_job` is now mostly revision check, persistence validation, launch request handoff, and rollout/session writeback for the compatibility route. Vendored `codex-core` no longer has `epiphany_distillation`, `epiphany_promotion`, `epiphany_proposal`, or `epiphany_retrieval` husk modules; it re-exports native surfaces from `epiphany-core` directly, and now owns only the real Codex rollout adapter because it is a host seam. `epiphany-runtime-spine` advertises OpenAI adapter status/model-request/stream-event/receipt CultNet schemas and mutation contracts, so the native caller now has a real storage route instead of only JSON-RPC. MCP itself is correctly JSON at its protocol edge; the target is typed Epiphany intent/result/receipt wrappers around MCP, not replacing MCP JSON. The current OpenAI spine still pulls `codex-api` and a large transport dependency stack, so its next cut is dependency starvation after richer live callers move. latest_cut: > Codex Apps no longer have privileged MCP/runtime treatment in the keeper path. MCP exposure is now uniform: small tool sets are direct, large or @@ -365,6 +365,11 @@ current_status: cache, or tests remain. The app config throne is gone: no `[apps.*]`, `Feature::Apps`, `include_apps_instructions`, app config/read schema, app managed requirements, app prompt tests, or app file-MCP tests remain, - and live MCP approval is named `McpToolApproval`. MCP remains JSON-RPC at - the edge; user-declared MCP servers are the only runtime MCP authority. + and live MCP approval is named `McpToolApproval`. The plugin feature and + mention residue is gone too: no `Feature::Plugins`, + `Feature::RemotePlugin`, `plugin://` structured mention support, plugin + instruction tags, stale plugin popup snapshots, or app/plugin mention path + classification in `codex-core-skills` remain. Live structured mentions are + MCP/skill-shaped only. MCP remains JSON-RPC at the edge; user-declared MCP + servers are the only runtime MCP authority. next_action: Continue starving coordinator/runtime execution and operator surfaces off app-server JSON-RPC and out of `codex_message_processor.rs`; keep the vestigial Codex organ narrowed to subscription auth/model transport. diff --git a/vendor/codex/codex-rs/app-server-protocol/src/protocol/v2.rs b/vendor/codex/codex-rs/app-server-protocol/src/protocol/v2.rs index 51a20193..98ffd41c 100644 --- a/vendor/codex/codex-rs/app-server-protocol/src/protocol/v2.rs +++ b/vendor/codex/codex-rs/app-server-protocol/src/protocol/v2.rs @@ -10633,8 +10633,8 @@ mod tests { path: PathBuf::from("/repo/.codex/skills/skill-creator/SKILL.md"), }, CoreUserInput::Mention { - name: "Demo App".to_string(), - path: "app://demo-app".to_string(), + name: "Docs MCP".to_string(), + path: "mcp://docs".to_string(), }, ], }); @@ -10659,8 +10659,8 @@ mod tests { path: PathBuf::from("/repo/.codex/skills/skill-creator/SKILL.md"), }, UserInput::Mention { - name: "Demo App".to_string(), - path: "app://demo-app".to_string(), + name: "Docs MCP".to_string(), + path: "mcp://docs".to_string(), }, ], } diff --git a/vendor/codex/codex-rs/app-server/README.md b/vendor/codex/codex-rs/app-server/README.md index e74f7171..0d34c6e5 100644 --- a/vendor/codex/codex-rs/app-server/README.md +++ b/vendor/codex/codex-rs/app-server/README.md @@ -604,16 +604,16 @@ Invoke a skill explicitly by including `$` in the text input and add } } } ``` -### Example: Start a turn (invoke an app) +### Example: Start a turn (invoke an MCP server) -Invoke an app by including `$` in the text input and adding a `mention` input item with the app id in `app://` form. +Invoke an MCP server by including a linked mention in the text input and adding a `mention` input item with the server name in `mcp://` form. ```json { "method": "turn/start", "id": 34, "params": { "threadId": "thr_123", "input": [ - { "type": "text", "text": "$demo-app Summarize the latest updates." }, - { "type": "mention", "name": "Demo App", "path": "app://demo-app" } + { "type": "text", "text": "Use [$docs](mcp://docs) to summarize the latest updates." }, + { "type": "mention", "name": "Docs MCP", "path": "mcp://docs" } ] } } { "id": 34, "result": { "turn": { @@ -624,26 +624,6 @@ Invoke an app by including `$` in the text input and adding a `mention } } } ``` -### Example: Start a turn (invoke a plugin) - -Invoke a plugin by including a UI mention token such as `@sample` in the text input and adding a `mention` input item with the exact `plugin://@` path returned by `plugin/list`. - -```json -{ "method": "turn/start", "id": 35, "params": { - "threadId": "thr_123", - "input": [ - { "type": "text", "text": "@sample Summarize the latest updates." }, - { "type": "mention", "name": "Sample Plugin", "path": "plugin://sample@test" } - ] -} } -{ "id": 35, "result": { "turn": { - "id": "turn_459", - "status": "inProgress", - "items": [], - "error": null -} } } -``` - ### Example: Inject raw history items Use `thread/inject_items` to append prebuilt Responses API items to a loaded thread’s prompt history without starting a user turn. These items are persisted to the rollout and included in subsequent model requests. diff --git a/vendor/codex/codex-rs/app-server/tests/suite/v2/mcp_server_elicitation.rs b/vendor/codex/codex-rs/app-server/tests/suite/v2/mcp_server_elicitation.rs index 13ebe0b9..127ae250 100644 --- a/vendor/codex/codex-rs/app-server/tests/suite/v2/mcp_server_elicitation.rs +++ b/vendor/codex/codex-rs/app-server/tests/suite/v2/mcp_server_elicitation.rs @@ -168,7 +168,7 @@ async fn mcp_server_elicitation_round_trip() -> Result<()> { .send_turn_start_request(TurnStartParams { thread_id: thread.id.clone(), input: vec![V2UserInput::Text { - text: "Use [$calendar](app://calendar) to run the calendar tool.".to_string(), + text: "Use [$calendar](mcp://calendar) to run the calendar tool.".to_string(), text_elements: Vec::new(), }], model: Some("mock-model".to_string()), diff --git a/vendor/codex/codex-rs/app-server/tests/suite/v2/turn_start.rs b/vendor/codex/codex-rs/app-server/tests/suite/v2/turn_start.rs index c6eb58a4..ca3747f0 100644 --- a/vendor/codex/codex-rs/app-server/tests/suite/v2/turn_start.rs +++ b/vendor/codex/codex-rs/app-server/tests/suite/v2/turn_start.rs @@ -644,8 +644,8 @@ async fn turn_start_accepts_text_at_limit_with_mention_item() -> Result<()> { text_elements: Vec::new(), }, V2UserInput::Mention { - name: "Demo App".to_string(), - path: "app://demo-app".to_string(), + name: "Docs MCP".to_string(), + path: "mcp://docs".to_string(), }, ], ..Default::default() @@ -2282,7 +2282,6 @@ async fn turn_start_streams_apply_patch_change_updates_v2() -> Result<()> { &BTreeMap::from([ (Feature::ApplyPatchFreeform, true), (Feature::ApplyPatchStreamingEvents, true), - (Feature::Plugins, false), (Feature::RemoteModels, false), (Feature::ShellSnapshot, false), ]), diff --git a/vendor/codex/codex-rs/core-skills/src/injection.rs b/vendor/codex/codex-rs/core-skills/src/injection.rs index f43805e7..ed192a7e 100644 --- a/vendor/codex/codex-rs/core-skills/src/injection.rs +++ b/vendor/codex/codex-rs/core-skills/src/injection.rs @@ -200,26 +200,18 @@ impl<'a> ToolMentions<'a> { #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub enum ToolMentionKind { - App, Mcp, - Plugin, Skill, Other, } -const APP_PATH_PREFIX: &str = "app://"; const MCP_PATH_PREFIX: &str = "mcp://"; -const PLUGIN_PATH_PREFIX: &str = "plugin://"; const SKILL_PATH_PREFIX: &str = "skill://"; const SKILL_FILENAME: &str = "SKILL.md"; pub fn tool_kind_for_path(path: &str) -> ToolMentionKind { - if path.starts_with(APP_PATH_PREFIX) { - ToolMentionKind::App - } else if path.starts_with(MCP_PATH_PREFIX) { + if path.starts_with(MCP_PATH_PREFIX) { ToolMentionKind::Mcp - } else if path.starts_with(PLUGIN_PATH_PREFIX) { - ToolMentionKind::Plugin } else if path.starts_with(SKILL_PATH_PREFIX) || is_skill_filename(path) { ToolMentionKind::Skill } else { @@ -232,16 +224,6 @@ fn is_skill_filename(path: &str) -> bool { file_name.eq_ignore_ascii_case(SKILL_FILENAME) } -pub fn app_id_from_path(path: &str) -> Option<&str> { - path.strip_prefix(APP_PATH_PREFIX) - .filter(|value| !value.is_empty()) -} - -pub fn plugin_config_name_from_path(path: &str) -> Option<&str> { - path.strip_prefix(PLUGIN_PATH_PREFIX) - .filter(|value| !value.is_empty()) -} - pub(crate) fn normalize_skill_path(path: &str) -> &str { path.strip_prefix(SKILL_PATH_PREFIX).unwrap_or(path) } @@ -269,10 +251,7 @@ pub fn extract_tool_mentions_with_sigil(text: &str, sigil: char) -> ToolMentions parse_linked_tool_mention(text, text_bytes, index, sigil) { if !is_common_env_var(name) { - if !matches!( - tool_kind_for_path(path), - ToolMentionKind::App | ToolMentionKind::Mcp | ToolMentionKind::Plugin - ) { + if !matches!(tool_kind_for_path(path), ToolMentionKind::Mcp) { mentioned_names.insert(name); } mentioned_paths.insert(path); @@ -333,12 +312,7 @@ fn select_skills_from_mentions( let mention_skill_paths: HashSet<&str> = mentions .paths() - .filter(|path| { - !matches!( - tool_kind_for_path(path), - ToolMentionKind::App | ToolMentionKind::Mcp | ToolMentionKind::Plugin - ) - }) + .filter(|path| !matches!(tool_kind_for_path(path), ToolMentionKind::Mcp)) .map(normalize_skill_path) .collect(); diff --git a/vendor/codex/codex-rs/core-skills/src/injection_tests.rs b/vendor/codex/codex-rs/core-skills/src/injection_tests.rs index 96273186..1b755e8c 100644 --- a/vendor/codex/codex-rs/core-skills/src/injection_tests.rs +++ b/vendor/codex/codex-rs/core-skills/src/injection_tests.rs @@ -121,7 +121,7 @@ fn extract_tool_mentions_stops_at_non_name_chars() { } #[test] -fn extract_tool_mentions_keeps_plugin_skill_namespaces() { +fn extract_tool_mentions_keeps_tool_style_namespaces() { assert_mentions( "use $slack:search and $alpha", &["alpha", "slack:search"], diff --git a/vendor/codex/codex-rs/core/config.schema.json b/vendor/codex/codex-rs/core/config.schema.json index 873da4fb..976af9d0 100644 --- a/vendor/codex/codex-rs/core/config.schema.json +++ b/vendor/codex/codex-rs/core/config.schema.json @@ -327,9 +327,6 @@ "personality": { "type": "boolean" }, - "plugins": { - "type": "boolean" - }, "prevent_idle_sleep": { "type": "boolean" }, @@ -342,9 +339,6 @@ "remote_models": { "type": "boolean" }, - "remote_plugin": { - "type": "boolean" - }, "request_permissions": { "type": "boolean" }, @@ -2293,9 +2287,6 @@ "personality": { "type": "boolean" }, - "plugins": { - "type": "boolean" - }, "prevent_idle_sleep": { "type": "boolean" }, @@ -2308,9 +2299,6 @@ "remote_models": { "type": "boolean" }, - "remote_plugin": { - "type": "boolean" - }, "request_permissions": { "type": "boolean" }, diff --git a/vendor/codex/codex-rs/core/src/config_loader/tests.rs b/vendor/codex/codex-rs/core/src/config_loader/tests.rs index 3c6530d8..8003e921 100644 --- a/vendor/codex/codex-rs/core/src/config_loader/tests.rs +++ b/vendor/codex/codex-rs/core/src/config_loader/tests.rs @@ -378,11 +378,14 @@ async fn includes_thread_config_layers_in_stack() -> anyhow::Result<()> { LOCAL_FS.as_ref(), tmp.path(), Some(cwd), - &[("features.plugins".to_string(), TomlValue::Boolean(true))], + &[( + "features.multi_agent_v2".to_string(), + TomlValue::Boolean(true), + )], LoaderOverrides::without_managed_config_for_tests(), CloudRequirementsLoader::default(), &StaticThreadConfigLoader::new(vec![ThreadConfigSource::Session(SessionThreadConfig { - features: BTreeMap::from([("plugins".to_string(), false)]), + features: BTreeMap::from([("multi_agent_v2".to_string(), false)]), ..Default::default() })]), /*host_name*/ None, @@ -412,7 +415,7 @@ async fn includes_thread_config_layers_in_stack() -> anyhow::Result<()> { .effective_config() .get("features") .and_then(TomlValue::as_table) - .and_then(|features| features.get("plugins")), + .and_then(|features| features.get("multi_agent_v2")), Some(&TomlValue::Boolean(false)) ); diff --git a/vendor/codex/codex-rs/core/src/guardian/review_session.rs b/vendor/codex/codex-rs/core/src/guardian/review_session.rs index 93478e48..490ca169 100644 --- a/vendor/codex/codex-rs/core/src/guardian/review_session.rs +++ b/vendor/codex/codex-rs/core/src/guardian/review_session.rs @@ -872,7 +872,6 @@ pub(crate) fn build_guardian_review_session_config( for feature in [ Feature::Collab, Feature::CodexHooks, - Feature::Plugins, Feature::WebSearchRequest, Feature::WebSearchCached, ] { diff --git a/vendor/codex/codex-rs/core/src/guardian/tests.rs b/vendor/codex/codex-rs/core/src/guardian/tests.rs index 60359c77..c0a011ca 100644 --- a/vendor/codex/codex-rs/core/src/guardian/tests.rs +++ b/vendor/codex/codex-rs/core/src/guardian/tests.rs @@ -2024,7 +2024,7 @@ async fn guardian_review_session_config_uses_live_network_proxy_state() { } #[tokio::test] -async fn guardian_review_session_config_disables_mcp_and_plugins() { +async fn guardian_review_session_config_disables_mcp() { let mut parent_config = test_config().await; let server: McpServerConfig = toml::from_str("command = \"docs-server\"").expect("deserialize MCP server"); @@ -2032,10 +2032,6 @@ async fn guardian_review_session_config_disables_mcp_and_plugins() { .mcp_servers .set(HashMap::from([("docs".to_string(), server)])) .expect("parent MCP servers are configurable"); - parent_config - .features - .enable(Feature::Plugins) - .expect("plugins feature is configurable"); let guardian_config = build_guardian_review_session_config_for_test( &parent_config, @@ -2046,7 +2042,6 @@ async fn guardian_review_session_config_disables_mcp_and_plugins() { .expect("guardian config"); assert!(guardian_config.mcp_servers.get().is_empty()); - assert!(!guardian_config.features.enabled(Feature::Plugins)); } #[tokio::test] diff --git a/vendor/codex/codex-rs/core/src/tools/handlers/multi_agents_tests.rs b/vendor/codex/codex-rs/core/src/tools/handlers/multi_agents_tests.rs index d7117dcc..5d54b5f5 100644 --- a/vendor/codex/codex-rs/core/src/tools/handlers/multi_agents_tests.rs +++ b/vendor/codex/codex-rs/core/src/tools/handlers/multi_agents_tests.rs @@ -329,7 +329,7 @@ async fn spawn_agent_rejects_when_message_and_items_are_both_set() { "spawn_agent", function_payload(json!({ "message": "hello", - "items": [{"type": "mention", "name": "drive", "path": "app://drive"}] + "items": [{"type": "mention", "name": "docs", "path": "mcp://docs"}] })), ); let Err(err) = SpawnAgentHandler.handle(invocation).await else { @@ -1390,7 +1390,7 @@ async fn multi_agent_v2_send_message_rejects_legacy_items_field() { function_payload(json!({ "target": agent_id.to_string(), "items": [ - {"type": "mention", "name": "drive", "path": "app://google_drive"}, + {"type": "mention", "name": "docs", "path": "mcp://docs"}, {"type": "text", "text": "read the folder"} ] })), @@ -2124,7 +2124,7 @@ async fn send_input_rejects_when_message_and_items_are_both_set() { function_payload(json!({ "target": ThreadId::new().to_string(), "message": "hello", - "items": [{"type": "mention", "name": "drive", "path": "app://drive"}] + "items": [{"type": "mention", "name": "docs", "path": "mcp://docs"}] })), ); let Err(err) = SendInputHandler.handle(invocation).await else { @@ -2231,7 +2231,7 @@ async fn send_input_accepts_structured_items() { function_payload(json!({ "target": agent_id.to_string(), "items": [ - {"type": "mention", "name": "drive", "path": "app://google_drive"}, + {"type": "mention", "name": "docs", "path": "mcp://docs"}, {"type": "text", "text": "read the folder"} ] })), @@ -2246,7 +2246,7 @@ async fn send_input_accepts_structured_items() { items: vec![ UserInput::Mention { name: "drive".to_string(), - path: "app://google_drive".to_string(), + path: "mcp://docs".to_string(), }, UserInput::Text { text: "read the folder".to_string(), diff --git a/vendor/codex/codex-rs/core/tests/common/context_snapshot.rs b/vendor/codex/codex-rs/core/tests/common/context_snapshot.rs index cb899969..d80e9c09 100644 --- a/vendor/codex/codex-rs/core/tests/common/context_snapshot.rs +++ b/vendor/codex/codex-rs/core/tests/common/context_snapshot.rs @@ -4,7 +4,6 @@ use std::sync::OnceLock; use crate::responses::ResponsesRequest; use codex_protocol::protocol::APPS_INSTRUCTIONS_OPEN_TAG; -use codex_protocol::protocol::PLUGINS_INSTRUCTIONS_OPEN_TAG; use codex_protocol::protocol::SKILLS_INSTRUCTIONS_OPEN_TAG; #[derive(Debug, Clone, Copy, Default, PartialEq, Eq)] @@ -278,9 +277,6 @@ fn canonicalize_snapshot_text(text: &str) -> String { if text.starts_with(SKILLS_INSTRUCTIONS_OPEN_TAG) { return "".to_string(); } - if text.starts_with(PLUGINS_INSTRUCTIONS_OPEN_TAG) { - return "".to_string(); - } if text.starts_with("# AGENTS.md instructions for ") { return "".to_string(); } @@ -326,9 +322,7 @@ fn canonicalize_snapshot_text(text: &str) -> String { } fn is_capability_instruction_text(text: &str) -> bool { - text.starts_with(APPS_INSTRUCTIONS_OPEN_TAG) - || text.starts_with(SKILLS_INSTRUCTIONS_OPEN_TAG) - || text.starts_with(PLUGINS_INSTRUCTIONS_OPEN_TAG) + text.starts_with(APPS_INSTRUCTIONS_OPEN_TAG) || text.starts_with(SKILLS_INSTRUCTIONS_OPEN_TAG) } fn normalize_dynamic_snapshot_paths(text: &str) -> String { @@ -423,10 +417,6 @@ mod tests { { "type": "input_text", "text": "\n## Skills\nbody\n" - }, - { - "type": "input_text", - "text": "\n## Plugins\nbody\n" } ] })]; @@ -438,7 +428,7 @@ mod tests { assert_eq!( rendered, - "00:message/developer[3]:\n [01] \n [02] \n [03] " + "00:message/developer[2]:\n [01] \n [02] " ); } @@ -449,8 +439,7 @@ mod tests { "role": "developer", "content": [ { "type": "input_text", "text": "\n..." }, - { "type": "input_text", "text": "\n## Skills\n..." }, - { "type": "input_text", "text": "\n## Plugins\n..." } + { "type": "input_text", "text": "\n## Skills\n..." } ] })]; diff --git a/vendor/codex/codex-rs/core/tests/suite/search_tool.rs b/vendor/codex/codex-rs/core/tests/suite/search_tool.rs index 577b12fd..7b09bf8e 100644 --- a/vendor/codex/codex-rs/core/tests/suite/search_tool.rs +++ b/vendor/codex/codex-rs/core/tests/suite/search_tool.rs @@ -403,7 +403,7 @@ async fn search_tool_hides_apps_tools_without_search() -> Result<()> { } #[tokio::test(flavor = "multi_thread", worker_threads = 2)] -async fn explicit_app_mentions_expose_apps_tools_without_search() -> Result<()> { +async fn explicit_mcp_mentions_expose_mcp_tools_without_search() -> Result<()> { skip_if_no_network!(Ok(())); let server = start_mock_server().await; @@ -422,7 +422,7 @@ async fn explicit_app_mentions_expose_apps_tools_without_search() -> Result<()> let test = builder.build(&server).await?; test.submit_turn_with_policies( - "Use [$calendar](app://calendar) and then call tools.", + "Use [$calendar](mcp://calendar) and then call tools.", AskForApproval::Never, SandboxPolicy::DangerFullAccess, ) @@ -437,11 +437,11 @@ async fn explicit_app_mentions_expose_apps_tools_without_search() -> Result<()> SEARCH_CALENDAR_CREATE_TOOL ) .is_some(), - "expected explicit app mention to expose create tool, got tools: {tools:?}" + "expected explicit MCP mention to expose create tool, got tools: {tools:?}" ); assert!( namespace_child_tool(&body, SEARCH_CALENDAR_NAMESPACE, SEARCH_CALENDAR_LIST_TOOL).is_some(), - "expected explicit app mention to expose list tool, got tools: {tools:?}" + "expected explicit MCP mention to expose list tool, got tools: {tools:?}" ); Ok(()) diff --git a/vendor/codex/codex-rs/docs/protocol_v1.md b/vendor/codex/codex-rs/docs/protocol_v1.md index 9f238b40..e4dc56a6 100644 --- a/vendor/codex/codex-rs/docs/protocol_v1.md +++ b/vendor/codex/codex-rs/docs/protocol_v1.md @@ -95,7 +95,7 @@ Valid `personality` values are `friendly`, `pragmatic`, and `none`. When `none` - `text` – Plain text plus optional UI text elements. - `image` / `local_image` – Image inputs. - `skill` – Explicit skill selection (`name`, `path` to `SKILL.md`). -- `mention` – Explicit app/connector selection (`name`, `path` in `app://{connector_id}` form). +- `mention` – Explicit MCP server selection (`name`, `path` in `mcp://{server_name}` form). Note: For v1 wire compatibility, `EventMsg::TurnStarted` and `EventMsg::TurnComplete` serialize as `task_started` / `task_complete`. The deserializer accepts both `task_*` and `turn_*` tags. diff --git a/vendor/codex/codex-rs/features/src/lib.rs b/vendor/codex/codex-rs/features/src/lib.rs index d52aa550..adea7ec1 100644 --- a/vendor/codex/codex-rs/features/src/lib.rs +++ b/vendor/codex/codex-rs/features/src/lib.rs @@ -148,8 +148,6 @@ pub enum Feature { ToolSearchAlwaysDeferMcpTools, /// Expose placeholder tools for unavailable historical tool calls. UnavailableDummyTools, - /// Enable plugins. - Plugins, /// Allow the in-app browser pane in desktop apps. /// /// Requirements-only gate: this should be set from requirements, not user config. @@ -158,8 +156,6 @@ pub enum Feature { /// /// Requirements-only gate: this should be set from requirements, not user config. BrowserUse, - /// Temporary internal-only flag for PS-backed remote plugin catalog development. - RemotePlugin, /// Show the startup prompt for migrating external agent config into Codex. ExternalMigration, /// Allow the model to invoke the built-in image generation tool. @@ -819,12 +815,6 @@ pub const FEATURES: &[FeatureSpec] = &[ stage: Stage::UnderDevelopment, default_enabled: false, }, - FeatureSpec { - id: Feature::Plugins, - key: "plugins", - stage: Stage::Stable, - default_enabled: true, - }, FeatureSpec { id: Feature::InAppBrowser, key: "in_app_browser", @@ -837,12 +827,6 @@ pub const FEATURES: &[FeatureSpec] = &[ stage: Stage::Stable, default_enabled: true, }, - FeatureSpec { - id: Feature::RemotePlugin, - key: "remote_plugin", - stage: Stage::UnderDevelopment, - default_enabled: false, - }, FeatureSpec { id: Feature::ExternalMigration, key: "external_migration", diff --git a/vendor/codex/codex-rs/features/src/tests.rs b/vendor/codex/codex-rs/features/src/tests.rs index 75ab8312..3fddbbd6 100644 --- a/vendor/codex/codex-rs/features/src/tests.rs +++ b/vendor/codex/codex-rs/features/src/tests.rs @@ -257,7 +257,7 @@ fn multi_agent_is_stable_and_enabled_by_default() { #[test] fn from_sources_applies_base_profile_and_overrides() { let mut base_entries = BTreeMap::new(); - base_entries.insert("plugins".to_string(), true); + base_entries.insert("multi_agent_v2".to_string(), true); let base_features = FeaturesToml { entries: base_entries, ..Default::default() @@ -286,7 +286,7 @@ fn from_sources_applies_base_profile_and_overrides() { }, ); - assert_eq!(features.enabled(Feature::Plugins), true); + assert_eq!(features.enabled(Feature::MultiAgentV2), true); assert_eq!(features.enabled(Feature::CodeModeOnly), true); assert_eq!(features.enabled(Feature::CodeMode), true); assert_eq!(features.enabled(Feature::ApplyPatchFreeform), true); diff --git a/vendor/codex/codex-rs/protocol/src/protocol.rs b/vendor/codex/codex-rs/protocol/src/protocol.rs index e1505484..981a2dbd 100644 --- a/vendor/codex/codex-rs/protocol/src/protocol.rs +++ b/vendor/codex/codex-rs/protocol/src/protocol.rs @@ -96,8 +96,6 @@ pub const APPS_INSTRUCTIONS_OPEN_TAG: &str = ""; pub const APPS_INSTRUCTIONS_CLOSE_TAG: &str = ""; pub const SKILLS_INSTRUCTIONS_OPEN_TAG: &str = ""; pub const SKILLS_INSTRUCTIONS_CLOSE_TAG: &str = ""; -pub const PLUGINS_INSTRUCTIONS_OPEN_TAG: &str = ""; -pub const PLUGINS_INSTRUCTIONS_CLOSE_TAG: &str = ""; pub const COLLABORATION_MODE_OPEN_TAG: &str = ""; pub const COLLABORATION_MODE_CLOSE_TAG: &str = ""; pub const EPIPHANY_STATE_OPEN_TAG: &str = ""; diff --git a/vendor/codex/codex-rs/protocol/src/user_input.rs b/vendor/codex/codex-rs/protocol/src/user_input.rs index 4ed112df..5fdc45e0 100644 --- a/vendor/codex/codex-rs/protocol/src/user_input.rs +++ b/vendor/codex/codex-rs/protocol/src/user_input.rs @@ -35,7 +35,7 @@ pub enum UserInput { /// Explicit structured mention selected by the user. /// /// `path` identifies the exact mention target, for example - /// `app://` or `plugin://@`. + /// `mcp://` or a path to `SKILL.md`. Mention { name: String, path: String }, } diff --git a/vendor/codex/codex-rs/tools/src/agent_tool.rs b/vendor/codex/codex-rs/tools/src/agent_tool.rs index 346eaf8a..e1e936fe 100644 --- a/vendor/codex/codex-rs/tools/src/agent_tool.rs +++ b/vendor/codex/codex-rs/tools/src/agent_tool.rs @@ -490,7 +490,7 @@ fn create_collab_input_items_schema() -> JsonSchema { ( "path".to_string(), JsonSchema::string(Some( - "Path when type is local_image/skill, or structured mention target such as app:// or plugin://@ when type is mention." + "Path when type is local_image/skill, or structured mention target such as mcp:// when type is mention." .to_string(), )), ), @@ -501,7 +501,7 @@ fn create_collab_input_items_schema() -> JsonSchema { ]); JsonSchema::array(JsonSchema::object(properties, /*required*/ None, Some(false.into())), Some( - "Structured input items. Use this to pass explicit mentions (for example app:// connector paths)." + "Structured input items. Use this to pass explicit mentions (for example mcp:// server paths)." .to_string(), )) } diff --git a/vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installable.snap b/vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installable.snap deleted file mode 100644 index b9e5683c..00000000 --- a/vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installable.snap +++ /dev/null @@ -1,17 +0,0 @@ ---- -source: tui/src/chatwidget/tests.rs -expression: popup ---- - Plugins - Figma · Can be installed · ChatGPT Marketplace - Data shared with this app is subject to the app's terms of service and privacy policy. Learn - more. - Turn Figma files into implementation context. - -› 1. Back to plugins Return to the plugin list. - 2. Install plugin Install this plugin now. - Skills design-review, extract-copy - Apps Figma, Slack - MCP Servers figma-mcp, docs-mcp - - Press esc to close. diff --git a/vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installed.snap b/vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installed.snap deleted file mode 100644 index 71ae46d7..00000000 --- a/vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugin_detail_popup_installed.snap +++ /dev/null @@ -1,15 +0,0 @@ ---- -source: tui/src/chatwidget/tests.rs -expression: popup ---- - Plugins - Figma · Installed · ChatGPT Marketplace - Turn Figma files into implementation context. - -› 1. Back to plugins Return to the plugin list. - 2. Uninstall plugin Remove this plugin now. - Skills design-review, extract-copy - Apps Figma, Slack - MCP Servers figma-mcp, docs-mcp - - Press esc to close. diff --git a/vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_curated_marketplace.snap b/vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_curated_marketplace.snap deleted file mode 100644 index e0f99b44..00000000 --- a/vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_curated_marketplace.snap +++ /dev/null @@ -1,17 +0,0 @@ ---- -source: tui/src/chatwidget/tests/popups_and_settings.rs -expression: popup ---- - Plugins - Browse plugins from available marketplaces. - Installed 1 of 4 available plugins. - - [All Plugins] Installed (1) OpenAI Curated Repo Marketplace - - Type to search plugins -› [ ] Alpha Sync Disabled Space to enable; Enter view details. - [-] Bravo Search Available · ChatGPT Marketplace · Search docs and tickets. - [-] Hidden Repo Plugin Available · Repo Marketplace · Should not be shown in /plugins. - [-] Starter Available · ChatGPT Marketplace · Included by default. - - space enable/disable · ←/→ select marketplace · enter view details · esc close diff --git a/vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_loading_state.snap b/vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_loading_state.snap deleted file mode 100644 index 27fbf8f5..00000000 --- a/vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_loading_state.snap +++ /dev/null @@ -1,9 +0,0 @@ ---- -source: tui/src/chatwidget/tests.rs -expression: popup ---- - Plugins - Loading available plugins... - This updates when the marketplace list is ready. - -› Loading plugins... This updates when the marketplace list is ready. diff --git a/vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_search_filtered.snap b/vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_search_filtered.snap deleted file mode 100644 index da1b0913..00000000 --- a/vendor/codex/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__plugins_popup_search_filtered.snap +++ /dev/null @@ -1,14 +0,0 @@ ---- -source: tui/src/chatwidget/tests.rs -expression: popup ---- - Plugins - Browse plugins from available marketplaces. - Installed 0 of 3 available plugins. - - [All Plugins] Installed (0) OpenAI Curated - - sla -› [-] Slack Available Press Enter to view plugin details. - - space enable/disable · ←/→ select marketplace · enter view details · esc close diff --git a/vendor/codex/codex-rs/tui/src/chatwidget/tests/plan_mode.rs b/vendor/codex/codex-rs/tui/src/chatwidget/tests/plan_mode.rs index fd0d3824..7f386e66 100644 --- a/vendor/codex/codex-rs/tui/src/chatwidget/tests/plan_mode.rs +++ b/vendor/codex/codex-rs/tui/src/chatwidget/tests/plan_mode.rs @@ -1080,7 +1080,7 @@ async fn submit_user_message_ignores_plugin_mentions_from_bindings() { text_elements: Vec::new(), mention_bindings: vec![MentionBinding { mention: "sample".to_string(), - path: "plugin://sample@test".to_string(), + path: "skill://sample".to_string(), }], }); diff --git a/vendor/codex/codex-rs/tui/src/mention_codec.rs b/vendor/codex/codex-rs/tui/src/mention_codec.rs index 6335a6a5..078087fa 100644 --- a/vendor/codex/codex-rs/tui/src/mention_codec.rs +++ b/vendor/codex/codex-rs/tui/src/mention_codec.rs @@ -200,7 +200,6 @@ fn is_common_env_var(name: &str) -> bool { fn is_tool_path(path: &str) -> bool { path.starts_with("mcp://") - || path.starts_with("plugin://") || path.starts_with("skill://") || path .rsplit(['/', '\\']) @@ -216,7 +215,7 @@ mod tests { #[test] fn decode_history_mentions_restores_visible_tokens() { let decoded = decode_history_mentions( - "Use [$repo](mcp://repo), [$sample](plugin://sample@test), and [$figma](/tmp/figma/SKILL.md).", + "Use [$repo](mcp://repo), [$sample](skill://sample), and [$figma](/tmp/figma/SKILL.md).", ); assert_eq!(decoded.text, "Use $repo, $sample, and $figma."); assert_eq!( @@ -228,7 +227,7 @@ mod tests { }, LinkedMention { mention: "sample".to_string(), - path: "plugin://sample@test".to_string(), + path: "skill://sample".to_string(), }, LinkedMention { mention: "figma".to_string(), @@ -258,7 +257,7 @@ mod tests { }, LinkedMention { mention: "sample".to_string(), - path: "plugin://sample@test".to_string(), + path: "skill://sample".to_string(), }, LinkedMention { mention: "figma".to_string(), @@ -268,7 +267,7 @@ mod tests { ); assert_eq!( encoded, - "[$figma](mcp://figma) then [$sample](plugin://sample@test) then [$figma](/tmp/figma/SKILL.md) then $other" + "[$figma](mcp://figma) then [$sample](skill://sample) then [$figma](/tmp/figma/SKILL.md) then $other" ); } }