Skip to content

Improve apply_patch one-shot matching #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yyjeqhc merged 3 commits into from
Sep 5, 2026
Merged

Improve apply_patch one-shot matching #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0878b19
Improve apply_patch one-shot matching
yyjeqhc Sep 5, 2026
c83b9ce
Fix apply_patch one-shot matching edges
yyjeqhc Sep 5, 2026
828d98f
Reject legacy apply_patch strict matching at ingress
yyjeqhc Sep 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
564 changes: 507 additions & 57 deletions crates/webcodex-core/src/apply_patch_shared.rs
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 16 additions & 4 deletions crates/webcodex-core/src/runner_protocol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,15 @@ pub const RUNNER_CAPABILITY_APPLY_PATCH: &str = "apply_patch";
/// current Server must reject apply_patch before dispatch rather than accepting a
/// legacy success shape.
pub const RUNNER_CAPABILITY_APPLY_PATCH_MATCH_METADATA: &str = "apply_patch_match_metadata";
/// The Runner understands the 0.4 model-facing apply_patch matching_mode enum
/// (`first_match`, `unique`, `exact_unique`) and returns metadata bound to the
/// requested mode. Missing on older Runners is false; current Servers fail
/// closed instead of silently falling back to legacy permissive positioning.
pub const RUNNER_CAPABILITY_APPLY_PATCH_MATCHING_MODE: &str = "apply_patch_matching_mode";
/// The Runner understands `strict_matching=true` for apply_patch and rejects
/// any update chunk whose positioning is not exact and unique before writing.
/// Missing on older Runners is false and is never inferred from apply_patch or
/// apply_patch_match_metadata.
/// This legacy wire capability is retained only so older Servers can roll
/// against a current Runner; current model-facing contracts use matching_mode.
pub const RUNNER_CAPABILITY_APPLY_PATCH_STRICT_MATCHING: &str = "apply_patch_strict_matching";
pub const RUNNER_CAPABILITY_GIT: &str = "git";
pub const RUNNER_CAPABILITY_JOBS: &str = "jobs";
Expand Down Expand Up @@ -404,6 +409,7 @@ pub const RUNNER_CAPABILITY_NAMES: &[&str] = &[
RUNNER_CAPABILITY_APPLY_TEXT_EDIT_LINE_SCOPE,
RUNNER_CAPABILITY_APPLY_PATCH,
RUNNER_CAPABILITY_APPLY_PATCH_MATCH_METADATA,
RUNNER_CAPABILITY_APPLY_PATCH_MATCHING_MODE,
RUNNER_CAPABILITY_APPLY_PATCH_STRICT_MATCHING,
RUNNER_CAPABILITY_GIT,
RUNNER_CAPABILITY_JOBS,
Expand Down Expand Up @@ -527,9 +533,13 @@ pub struct RunnerCapabilities {
/// results. Missing on older Runners is false and never follows from apply_patch.
#[serde(default, skip_serializing_if = "is_false")]
pub apply_patch_match_metadata: bool,
/// Current enum-based apply_patch positioning semantics. Missing on older
/// Runners is false and must fail closed for current model-facing requests.
#[serde(default, skip_serializing_if = "is_false")]
pub apply_patch_matching_mode: bool,
/// Fail-closed exact-and-unique positioning for apply_patch requests that
/// explicitly opt into strict_matching. Missing on older Runners is false and
/// requires the current match-metadata success contract.
/// arrive from a legacy Server as strict_matching=true. New Servers do not
/// use this bool as model-facing authority.
#[serde(default, skip_serializing_if = "is_false")]
pub apply_patch_strict_matching: bool,
#[serde(default)]
Expand Down Expand Up @@ -892,6 +902,7 @@ impl Default for RunnerCapabilities {
apply_text_edit_line_scope: false,
apply_patch: false,
apply_patch_match_metadata: false,
apply_patch_matching_mode: false,
apply_patch_strict_matching: false,
git: false,
jobs: false,
Expand Down Expand Up @@ -3655,6 +3666,7 @@ mod envelope_tests {
apply_text_edit_line_scope: false,
apply_patch: false,
apply_patch_match_metadata: false,
apply_patch_matching_mode: false,
apply_patch_strict_matching: false,
git: false,
jobs: true,
Expand Down
Loading
Loading