Skip to content

[codex] Fix changed clip ID merge contract #26

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
explicit09 merged 1 commit into from
May 21, 2026
Merged

[codex] Fix changed clip ID merge contract #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
151 changes: 105 additions & 46 deletions crates/vedit-core/src/merge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,17 +91,21 @@ pub enum Side {
}

pub fn changed_clip_ids(base: Option<&Timeline>, after: &Timeline) -> Vec<String> {
let after_clips = clips_by_id(after);
let after_clips = clip_infos_by_id(after);
let mut changed = BTreeSet::new();

let Some(base) = base else {
return after_clips.keys().cloned().collect();
};

let base_clips = clips_by_id(base);
for (id, after_clip) in &after_clips {
let base_clips = clip_infos_by_id(base);
for (id, after_info) in &after_clips {
match base_clips.get(id) {
Some(base_clip) if *base_clip == *after_clip => {}
Some(base_info)
if base_info.clip == after_info.clip
&& base_info.track_name == after_info.track_name
&& base_info.track_kind == after_info.track_kind
&& base_info.clip_index == after_info.clip_index => {}
_ => {
changed.insert(id.clone());
}
Expand Down Expand Up @@ -321,14 +325,31 @@ fn diff_track(before: &Track, after: &Track) -> Vec<crate::diff::Change> {
diff(&before_tl, &after_tl)
}

fn clips_by_id(timeline: &Timeline) -> BTreeMap<String, &Clip> {
struct ClipInfo<'a> {
clip: &'a Clip,
track_name: String,
track_kind: TrackKind,
clip_index: usize,
}

fn clip_infos_by_id(timeline: &Timeline) -> BTreeMap<String, ClipInfo<'_>> {
let mut out = BTreeMap::new();
for track in &timeline.tracks {
let mut clip_index = 0;
for child in &track.children {
if let TrackChild::Clip(clip) = child
&& let Some(id) = &clip.clip_id
{
Comment on lines 340 to 342

@chatgpt-codex-connector chatgpt-codex-connector Bot May 21, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Count all clip positions when detecting clip moves

Move detection misses cases where an identified clip changes position relative to clips without IDs, because clip_index is only tracked for TrackChild::Clip values that already have clip_id. If a no-ID clip is inserted/moved before an identified clip, that identified clip keeps the same computed index and is treated as unchanged, so source-side reorder edits can be silently dropped during changed-clip-ID merges.

Useful? React with 👍 / 👎.

out.insert(id.clone(), clip);
out.insert(
id.clone(),
ClipInfo {
clip,
track_name: track.name.clone(),
track_kind: track.kind,
clip_index,
},
);
clip_index += 1;
}
}
}
Expand All @@ -341,73 +362,111 @@ fn overlay_clip_id_changes(
source_changed: &[String],
) -> Timeline {
let source_changed: BTreeSet<String> = source_changed.iter().cloned().collect();
let source_clips = clips_by_id(source);
let mut merged = target.clone();
let mut applied = BTreeSet::new();

for track in &mut merged.tracks {
for child in &mut track.children {
if let TrackChild::Clip(target_clip) = child
&& let Some(id) = target_clip.clip_id.clone()
&& source_changed.contains(&id)
&& let Some(source_clip) = source_clips.get(&id)
{
*target_clip = (*source_clip).clone();
applied.insert(id);
}
}
track.children.retain(|child| match child {
TrackChild::Clip(clip) => clip
.clip_id
.as_ref()
.is_none_or(|id| !source_changed.contains(id)),
_ => true,
Comment on lines +369 to +373

@chatgpt-codex-connector chatgpt-codex-connector Bot May 21, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Drop stale transitions and gaps with removed changed clips

This retain pass removes changed clips but always keeps non-clip children, so source-side clip deletions can leave dangling transitions/gaps from the target timeline. For example, deleting a changed clip that had an adjacent transition preserves that transition even though one side of it is gone, producing an invalid or semantically corrupted track ordering after an otherwise “clean” merge.

Useful? React with 👍 / 👎.

});
}

for source_track in &source.tracks {
let source_additions: Vec<TrackChild> = source_track
let source_changes: Vec<Clip> = source_track
.children
.iter()
.filter_map(|child| match child {
TrackChild::Clip(clip)
if clip
.clip_id
.as_ref()
.is_some_and(|id| source_changed.contains(id) && !applied.contains(id)) =>
.is_some_and(|id| source_changed.contains(id)) =>
{
Some(TrackChild::Clip(clip.clone()))
Some(clip.clone())
}
_ => None,
})
.collect();
if source_additions.is_empty() {
if source_changes.is_empty() {
continue;
}

if let Some(target_track) = merged
.tracks
.iter_mut()
.find(|track| track.name == source_track.name && track.kind == source_track.kind)
{
for child in source_additions {
if let TrackChild::Clip(clip) = &child
&& let Some(id) = &clip.clip_id
{
applied.insert(id.clone());
}
target_track.children.push(child);
}
} else {
let mut track = source_track.clone();
track.children = source_additions;
for child in &track.children {
if let TrackChild::Clip(clip) = child
&& let Some(id) = &clip.clip_id
{
applied.insert(id.clone());
}
}
merged.tracks.push(track);
let target_track = ensure_track(&mut merged, source_track);
for clip in source_changes {
let insert_at =
source_insertion_index(source_track, target_track, &source_changed, &clip)
.unwrap_or(target_track.children.len());
target_track
.children
.insert(insert_at, TrackChild::Clip(clip));
}
}

merged
}

fn ensure_track<'a>(timeline: &'a mut Timeline, source_track: &Track) -> &'a mut Track {
if let Some(index) = timeline
.tracks
.iter()
.position(|track| track.name == source_track.name && track.kind == source_track.kind)
{
return &mut timeline.tracks[index];
}

timeline.tracks.push(Track {
name: source_track.name.clone(),
kind: source_track.kind,
children: Vec::new(),
});
timeline.tracks.last_mut().unwrap()
}

fn source_insertion_index(
source_track: &Track,
target_track: &Track,
source_changed: &BTreeSet<String>,
clip: &Clip,
) -> Option<usize> {
let source_pos = source_track.children.iter().position(
|child| matches!(child, TrackChild::Clip(candidate) if candidate.clip_id == clip.clip_id),
)?;

for child in source_track.children.iter().skip(source_pos + 1) {
if let TrackChild::Clip(anchor) = child
&& let Some(anchor_id) = &anchor.clip_id
&& !source_changed.contains(anchor_id)
&& let Some(index) = target_clip_index(target_track, anchor_id)
{
return Some(index);
}
}

for child in source_track.children[..source_pos].iter().rev() {
if let TrackChild::Clip(anchor) = child
&& let Some(anchor_id) = &anchor.clip_id
&& !source_changed.contains(anchor_id)
&& let Some(index) = target_clip_index(target_track, anchor_id)
{
return Some(index + 1);
}
Comment on lines +449 to +455

@chatgpt-codex-connector chatgpt-codex-connector Bot May 21, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Preserve order of adjacent trailing source changes

When multiple changed clips appear consecutively at the end of a source track, this insertion logic can reverse their order in the merged result. In source_insertion_index, each trailing clip anchors to the same unchanged predecessor (index + 1), so later clips are inserted before earlier ones (e.g., source x,a,b with a,b changed merges as x,b,a). This produces an incorrect timeline ordering even for non-overlapping merges.

Useful? React with 👍 / 👎.

}

None
}

fn target_clip_index(track: &Track, clip_id: &str) -> Option<usize> {
track.children.iter().position(|child| {
matches!(
child,
TrackChild::Clip(clip) if clip.clip_id.as_deref() == Some(clip_id)
)
})
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down
11 changes: 9 additions & 2 deletions crates/vedit-core/src/repo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,8 +491,15 @@ impl Repo {
message.to_string(),
);
let commit_hash = self.write_timeline(&serde_json::to_value(&commit)?)?;
if self.branch_target(target_ref)?.is_some() {
self.set_branch_target(target_ref, &commit_hash)?;
let target_branch = if target_ref == "HEAD" {
self.current_branch()?
} else if self.branch_target(target_ref)?.is_some() {
Some(target_ref.to_string())
} else {
None
};
if let Some(branch) = target_branch {
self.set_branch_target(&branch, &commit_hash)?;
}

Ok(ChangedClipIdMergeOutcome::Clean(ChangedClipIdMergeClean {
Expand Down
Loading
Loading