@morshoto/framekit 0.1.11 → 0.1.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -0
- package/dist-package/adapters/final-cut/typescript/src/analyzers.js +68 -5
- package/dist-package/adapters/final-cut/typescript/src/canonical-recovery.js +31 -0
- package/dist-package/adapters/final-cut/typescript/src/canonical-verification.js +16 -0
- package/dist-package/adapters/final-cut/typescript/src/canonical.js +978 -98
- package/dist-package/adapters/final-cut/typescript/src/fcpxml.js +26 -7
- package/dist-package/adapters/final-cut/typescript/src/index.js +3 -0
- package/dist-package/adapters/final-cut/typescript/src/library-inspection.js +2 -0
- package/dist-package/adapters/final-cut/typescript/src/native.js +321 -19
- package/dist-package/adapters/final-cut/typescript/src/shadow-mutation.js +71 -17
- package/dist-package/adapters/final-cut/typescript/src/sqlite-experiment.js +472 -0
- package/dist-package/adapters/final-cut/typescript/src/sqlite-materialization.js +230 -0
- package/dist-package/apps/mcp-server/src/headless-sessions.js +47 -4
- package/dist-package/apps/mcp-server/src/main.js +33 -1
- package/dist-package/apps/mcp-server/src/routing.js +17 -0
- package/dist-package/apps/mcp-server/src/server.js +87 -28
- package/dist-package/packages/runtime/src/application/media-analysis-service.js +52 -6
- package/dist-package/packages/runtime/src/context/context-engine.js +313 -8
- package/dist-package/packages/runtime/src/context/context-service.js +5 -2
- package/dist-package/packages/runtime/src/context/project-catalog.js +58 -2
- package/dist-package/packages/runtime/src/domain/incremental-sync.js +153 -0
- package/dist-package/packages/runtime/src/domain/index.js +1 -0
- package/dist-package/packages/runtime/src/editing/edit-service.js +8 -2
- package/dist-package/packages/runtime/src/runtime.js +5 -2
- package/dist-package/packages/runtime/src/skills/builtin.js +99 -8
- package/dist-package/packages/runtime/src/skills/runtime.js +1 -0
- package/dist-package/packages/runtime/src/timeline/editing-session.js +13 -0
- package/dist-package/packages/runtime/src/timeline/snapshot-diff.js +169 -10
- package/package.json +9 -5
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { sameRevision } from "../context/revision.js";
|
|
1
2
|
import { FillerDetector } from "../speech/filler-detector.js";
|
|
2
3
|
import { SafeCutResolver } from "../speech/safe-cut-resolver.js";
|
|
3
4
|
import { DIALOGUE_NORMALIZATION_DEFAULTS, planDialogueGain, } from "../audio/dialogue-normalization.js";
|
|
@@ -75,6 +76,7 @@ async function planFillerSkill(context, input) {
|
|
|
75
76
|
const candidates = [];
|
|
76
77
|
const decisions = [];
|
|
77
78
|
const operations = [];
|
|
79
|
+
const analysisProvenance = [];
|
|
78
80
|
for (const clip of context.project.timeline.clips.filter((candidate) => Boolean(candidate.mediaId)
|
|
79
81
|
&& candidate.start < selectedRange.end
|
|
80
82
|
&& candidate.start + candidate.duration > selectedRange.start)) {
|
|
@@ -91,6 +93,13 @@ async function planFillerSkill(context, input) {
|
|
|
91
93
|
end: sourceStart + localRange.end,
|
|
92
94
|
};
|
|
93
95
|
const speech = await context.analyzeSpeech(mediaId, sourceRange);
|
|
96
|
+
analysisProvenance.push({
|
|
97
|
+
mediaId,
|
|
98
|
+
occurrenceId: clip.id,
|
|
99
|
+
sourceRange: structuredClone(sourceRange),
|
|
100
|
+
revision: structuredClone(speech.revision ?? context.baseRevision),
|
|
101
|
+
provider: structuredClone(speech.provider ?? { id: "framekit.speech", provider: "unknown" }),
|
|
102
|
+
});
|
|
94
103
|
const occurrence = {
|
|
95
104
|
occurrenceId: clip.id,
|
|
96
105
|
mediaId,
|
|
@@ -139,6 +148,7 @@ async function planFillerSkill(context, input) {
|
|
|
139
148
|
range: structuredClone(selectedRange),
|
|
140
149
|
candidates: structuredClone(candidates),
|
|
141
150
|
decisions: structuredClone(decisions),
|
|
151
|
+
analysisProvenance: structuredClone(analysisProvenance),
|
|
142
152
|
selectedCandidateIds: [...selectedCandidateIds],
|
|
143
153
|
candidateProvenance: operations.map((operation, operationIndex) => ({
|
|
144
154
|
candidateId: operation.candidateId,
|
|
@@ -398,6 +408,7 @@ function dialogueNormalizationSkill() {
|
|
|
398
408
|
handler: {
|
|
399
409
|
normalize: (input) => ({ ...DIALOGUE_NORMALIZATION_DEFAULTS, ...input }),
|
|
400
410
|
plan: async (context, input) => planDialogueSkill(context, input),
|
|
411
|
+
verify: (context) => verifyDialogueSkill(context),
|
|
401
412
|
},
|
|
402
413
|
};
|
|
403
414
|
}
|
|
@@ -578,14 +589,6 @@ async function planDialogueSkill(context, input) {
|
|
|
578
589
|
const targetGainDb = Number((existingGainDb + plan.clampedGainDb).toFixed(6));
|
|
579
590
|
const verification = plan.decision === "APPLY" ? {
|
|
580
591
|
requireExpectedChange: true,
|
|
581
|
-
maxTruePeakDb: request.maxTruePeakDb,
|
|
582
|
-
assertions: [{
|
|
583
|
-
type: "audio-loudness",
|
|
584
|
-
mediaId: request.mediaId,
|
|
585
|
-
occurrenceId: request.occurrenceId,
|
|
586
|
-
targetLufs: request.targetLufs,
|
|
587
|
-
toleranceDb: request.toleranceDb,
|
|
588
|
-
}],
|
|
589
592
|
} : undefined;
|
|
590
593
|
return {
|
|
591
594
|
operations: plan.decision === "APPLY" ? [{
|
|
@@ -612,3 +615,91 @@ async function planDialogueSkill(context, input) {
|
|
|
612
615
|
},
|
|
613
616
|
};
|
|
614
617
|
}
|
|
618
|
+
async function verifyDialogueSkill(context) {
|
|
619
|
+
const details = context.plan.details;
|
|
620
|
+
const mediaId = typeof details?.mediaId === "string" ? details.mediaId : undefined;
|
|
621
|
+
const occurrenceId = typeof details?.occurrenceId === "string" ? details.occurrenceId : undefined;
|
|
622
|
+
const input = context.plan.normalizedInput;
|
|
623
|
+
if (!mediaId || !occurrenceId || !context.measureAudio) {
|
|
624
|
+
return [{
|
|
625
|
+
name: "dialogue-measurement",
|
|
626
|
+
passed: false,
|
|
627
|
+
status: "unavailable",
|
|
628
|
+
reason: "AUDIO_MEASUREMENT_UNAVAILABLE",
|
|
629
|
+
detail: "selected dialogue occurrence cannot be measured after the write",
|
|
630
|
+
}];
|
|
631
|
+
}
|
|
632
|
+
let measurement;
|
|
633
|
+
try {
|
|
634
|
+
measurement = await context.measureAudio(mediaId, occurrenceId);
|
|
635
|
+
}
|
|
636
|
+
catch (error) {
|
|
637
|
+
return [{
|
|
638
|
+
name: "dialogue-measurement",
|
|
639
|
+
passed: false,
|
|
640
|
+
status: "failed",
|
|
641
|
+
reason: "POST_WRITE_MEASUREMENT_FAILED",
|
|
642
|
+
detail: String(error),
|
|
643
|
+
}];
|
|
644
|
+
}
|
|
645
|
+
const occurrence = context.transaction.attemptedAfter.timeline.clips.find((clip) => clip.id === occurrenceId);
|
|
646
|
+
const expectedRange = occurrence
|
|
647
|
+
? { start: occurrence.sourceStart ?? 0, end: (occurrence.sourceStart ?? 0) + occurrence.duration }
|
|
648
|
+
: undefined;
|
|
649
|
+
const targetBound = measurement.mediaId === mediaId
|
|
650
|
+
&& measurement.occurrenceId === occurrenceId
|
|
651
|
+
&& sameRevision(measurement.revision, context.transaction.attemptedAfter.revision)
|
|
652
|
+
&& Boolean(expectedRange
|
|
653
|
+
&& sameRange(measurement.requestedRange, expectedRange)
|
|
654
|
+
&& sameRange(measurement.measuredRange, expectedRange))
|
|
655
|
+
&& Boolean(measurement.provider?.id && measurement.provider.provider);
|
|
656
|
+
const measurementPassed = measurement.valid && targetBound;
|
|
657
|
+
const measurementCheck = {
|
|
658
|
+
name: "dialogue-measurement",
|
|
659
|
+
passed: measurementPassed,
|
|
660
|
+
status: measurementPassed ? "passed" : "failed",
|
|
661
|
+
expected: {
|
|
662
|
+
mediaId,
|
|
663
|
+
occurrenceId,
|
|
664
|
+
revision: context.transaction.attemptedAfter.revision,
|
|
665
|
+
requestedRange: expectedRange,
|
|
666
|
+
},
|
|
667
|
+
observed: measurement,
|
|
668
|
+
...(measurementPassed ? {} : { reason: measurement.valid ? "MEASUREMENT_TARGET_MISMATCH" : "MEASUREMENT_INVALID" }),
|
|
669
|
+
detail: measurementPassed
|
|
670
|
+
? "post-write dialogue measurement is valid and bound to the selected occurrence"
|
|
671
|
+
: "post-write dialogue measurement is invalid or not bound to the selected occurrence",
|
|
672
|
+
};
|
|
673
|
+
const loudnessPassed = measurementPassed
|
|
674
|
+
&& Math.abs(measurement.integratedLufs - input.targetLufs) <= input.toleranceDb;
|
|
675
|
+
const peakPassed = measurementPassed && measurement.truePeakDb <= input.maxTruePeakDb;
|
|
676
|
+
return [
|
|
677
|
+
measurementCheck,
|
|
678
|
+
{
|
|
679
|
+
name: "dialogue-loudness",
|
|
680
|
+
passed: loudnessPassed,
|
|
681
|
+
status: loudnessPassed ? "passed" : "failed",
|
|
682
|
+
expected: { targetLufs: input.targetLufs, toleranceDb: input.toleranceDb },
|
|
683
|
+
observed: { integratedLufs: measurement.integratedLufs },
|
|
684
|
+
...(loudnessPassed ? {} : { reason: "AUDIO_LOUDNESS_OUT_OF_RANGE" }),
|
|
685
|
+
detail: loudnessPassed
|
|
686
|
+
? "post-write loudness is inside the configured tolerance"
|
|
687
|
+
: "post-write loudness is outside the configured tolerance",
|
|
688
|
+
},
|
|
689
|
+
{
|
|
690
|
+
name: "dialogue-true-peak",
|
|
691
|
+
passed: peakPassed,
|
|
692
|
+
status: peakPassed ? "passed" : "failed",
|
|
693
|
+
expected: { maxTruePeakDb: input.maxTruePeakDb },
|
|
694
|
+
observed: { truePeakDb: measurement.truePeakDb },
|
|
695
|
+
...(peakPassed ? {} : { reason: "AUDIO_TRUE_PEAK_OUT_OF_RANGE" }),
|
|
696
|
+
detail: peakPassed
|
|
697
|
+
? "post-write true peak is within the configured limit"
|
|
698
|
+
: "post-write true peak exceeds the configured limit",
|
|
699
|
+
},
|
|
700
|
+
];
|
|
701
|
+
}
|
|
702
|
+
function sameRange(left, right) {
|
|
703
|
+
return Math.abs(left.start - right.start) <= 0.000001
|
|
704
|
+
&& Math.abs(left.end - right.end) <= 0.000001;
|
|
705
|
+
}
|
|
@@ -139,6 +139,7 @@ export class SkillRuntime {
|
|
|
139
139
|
plan: session.preview.plan,
|
|
140
140
|
...(session.preview.expectedDiff ? { expectedDiff: session.preview.expectedDiff } : {}),
|
|
141
141
|
transaction,
|
|
142
|
+
measureAudio: (mediaId, occurrenceId) => this.analysis.measureAudio(mediaId, occurrenceId),
|
|
142
143
|
});
|
|
143
144
|
verification = {
|
|
144
145
|
passed: Boolean(verification?.passed) && checks.every((check) => check.passed),
|
|
@@ -51,7 +51,15 @@ export class EditingSession {
|
|
|
51
51
|
serialize() {
|
|
52
52
|
return stableJson(this.value);
|
|
53
53
|
}
|
|
54
|
+
observeProviderRevision(providerRevision) {
|
|
55
|
+
if (sameRevision(this.value.base.revision, providerRevision))
|
|
56
|
+
return "unchanged";
|
|
57
|
+
if (this.value.state !== "conflicted")
|
|
58
|
+
this.value.state = "possibly_stale";
|
|
59
|
+
return "changed";
|
|
60
|
+
}
|
|
54
61
|
preview(operations, expectedRevision = this.value.desired.revision) {
|
|
62
|
+
this.assertEditable();
|
|
55
63
|
assertRevision(this.value.desired.revision, expectedRevision);
|
|
56
64
|
const before = structuredClone(this.value.desired);
|
|
57
65
|
const after = this.nextTimeline(before, operations);
|
|
@@ -145,6 +153,11 @@ export class EditingSession {
|
|
|
145
153
|
validateTimelineIr(after);
|
|
146
154
|
return after;
|
|
147
155
|
}
|
|
156
|
+
assertEditable() {
|
|
157
|
+
if (this.value.state === "possibly_stale" || this.value.state === "conflicted") {
|
|
158
|
+
throw new Error("RECONCILIATION_REQUIRED: session must be reconciled before editing");
|
|
159
|
+
}
|
|
160
|
+
}
|
|
148
161
|
}
|
|
149
162
|
export function createTimelineIrFromProjectSnapshot(snapshot, provider) {
|
|
150
163
|
const binding = provider ? (kind, identity) => ({
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { parseRational, subtractRationalTimes } from "./rational-time.js";
|
|
1
2
|
function withoutId(value) {
|
|
2
3
|
const { id: _id, ...content } = value;
|
|
3
4
|
return content;
|
|
@@ -6,6 +7,8 @@ function rangesForClip(clip) {
|
|
|
6
7
|
return clip ? [{ start: clip.start, end: clip.start + clip.duration, startTime: clip.startTime, durationTime: clip.durationTime }] : [];
|
|
7
8
|
}
|
|
8
9
|
function diffByKey(before, after, keyOf, comparable = (item) => item) {
|
|
10
|
+
assertUniqueKeys(before, keyOf, "before");
|
|
11
|
+
assertUniqueKeys(after, keyOf, "after");
|
|
9
12
|
const beforeById = new Map(before.map((item) => [keyOf(item), item]));
|
|
10
13
|
const afterById = new Map(after.map((item) => [keyOf(item), item]));
|
|
11
14
|
return {
|
|
@@ -13,7 +16,7 @@ function diffByKey(before, after, keyOf, comparable = (item) => item) {
|
|
|
13
16
|
removed: [...beforeById.values()].filter((item) => !afterById.has(keyOf(item))),
|
|
14
17
|
modified: [...afterById.values()].filter((item) => {
|
|
15
18
|
const previous = beforeById.get(keyOf(item));
|
|
16
|
-
return previous !== undefined &&
|
|
19
|
+
return previous !== undefined && stableJson(comparable(previous)) !== stableJson(comparable(item));
|
|
17
20
|
}).map((afterItem) => ({ after: afterItem, before: beforeById.get(keyOf(afterItem)) })),
|
|
18
21
|
};
|
|
19
22
|
}
|
|
@@ -29,6 +32,9 @@ function mediaRegistryFields(media) {
|
|
|
29
32
|
};
|
|
30
33
|
}
|
|
31
34
|
export function diffSnapshots(before, after) {
|
|
35
|
+
if (before.projectId !== after.projectId || before.timeline.id !== after.timeline.id) {
|
|
36
|
+
throw new Error("TARGET_MISMATCH: cannot diff snapshots from different project or sequence targets");
|
|
37
|
+
}
|
|
32
38
|
const clips = diffById(before.timeline.clips, after.timeline.clips);
|
|
33
39
|
const added = clips.added.map((clip) => ({ type: "ITEM_ADDED", itemId: clip.id, after: clip }));
|
|
34
40
|
const removed = clips.removed.map((clip) => ({ type: "ITEM_REMOVED", itemId: clip.id, before: clip }));
|
|
@@ -40,10 +46,11 @@ export function diffSnapshots(before, after) {
|
|
|
40
46
|
}));
|
|
41
47
|
const markers = diffById(before.timeline.markers, after.timeline.markers);
|
|
42
48
|
const markerChanges = [
|
|
43
|
-
...markers.added.map((marker) => ({ type: "MARKER_ADDED", marker })),
|
|
44
|
-
...markers.removed.map((marker) => ({ type: "MARKER_REMOVED", marker })),
|
|
49
|
+
...markers.added.map((marker) => ({ type: "MARKER_ADDED", itemId: marker.id, marker, after: marker })),
|
|
50
|
+
...markers.removed.map((marker) => ({ type: "MARKER_REMOVED", itemId: marker.id, marker, before: marker })),
|
|
45
51
|
...markers.modified.map(({ before: previous, after: current }) => ({
|
|
46
52
|
type: "MARKER_MODIFIED",
|
|
53
|
+
itemId: current.id,
|
|
47
54
|
marker: current,
|
|
48
55
|
before: previous,
|
|
49
56
|
after: current,
|
|
@@ -51,10 +58,11 @@ export function diffSnapshots(before, after) {
|
|
|
51
58
|
];
|
|
52
59
|
const captions = diffById(before.timeline.captions, after.timeline.captions);
|
|
53
60
|
const captionChanges = [
|
|
54
|
-
...captions.added.map((caption) => ({ type: "CAPTION_ADDED", caption })),
|
|
55
|
-
...captions.removed.map((caption) => ({ type: "CAPTION_REMOVED", caption })),
|
|
61
|
+
...captions.added.map((caption) => ({ type: "CAPTION_ADDED", itemId: caption.id, caption, after: caption })),
|
|
62
|
+
...captions.removed.map((caption) => ({ type: "CAPTION_REMOVED", itemId: caption.id, caption, before: caption })),
|
|
56
63
|
...captions.modified.map(({ before: previous, after: current }) => ({
|
|
57
64
|
type: "CAPTION_MODIFIED",
|
|
65
|
+
itemId: current.id,
|
|
58
66
|
caption: current,
|
|
59
67
|
before: previous,
|
|
60
68
|
after: current,
|
|
@@ -62,10 +70,11 @@ export function diffSnapshots(before, after) {
|
|
|
62
70
|
];
|
|
63
71
|
const storyElements = diffById(before.timeline.storyElements, after.timeline.storyElements);
|
|
64
72
|
const storyElementChanges = [
|
|
65
|
-
...storyElements.added.map((element) => ({ type: "STORY_ELEMENT_ADDED", element, after: element })),
|
|
66
|
-
...storyElements.removed.map((element) => ({ type: "STORY_ELEMENT_REMOVED", element, before: element })),
|
|
73
|
+
...storyElements.added.map((element) => ({ type: "STORY_ELEMENT_ADDED", itemId: element.id, element, after: element })),
|
|
74
|
+
...storyElements.removed.map((element) => ({ type: "STORY_ELEMENT_REMOVED", itemId: element.id, element, before: element })),
|
|
67
75
|
...storyElements.modified.map(({ before: previous, after: current }) => ({
|
|
68
76
|
type: "STORY_ELEMENT_MODIFIED",
|
|
77
|
+
itemId: current.id,
|
|
69
78
|
element: current,
|
|
70
79
|
before: previous,
|
|
71
80
|
after: current,
|
|
@@ -73,15 +82,81 @@ export function diffSnapshots(before, after) {
|
|
|
73
82
|
];
|
|
74
83
|
const media = diffByKey(before.media, after.media, (item) => item.mediaId, mediaRegistryFields);
|
|
75
84
|
const mediaChanges = [
|
|
76
|
-
...media.added.map((item) => ({ type: "MEDIA_ADDED", media: item, after: item })),
|
|
77
|
-
...media.removed.map((item) => ({ type: "MEDIA_REMOVED", media: item, before: item })),
|
|
85
|
+
...media.added.map((item) => ({ type: "MEDIA_ADDED", itemId: item.mediaId, media: item, after: item })),
|
|
86
|
+
...media.removed.map((item) => ({ type: "MEDIA_REMOVED", itemId: item.mediaId, media: item, before: item })),
|
|
78
87
|
...media.modified.map(({ before: previous, after: current }) => ({
|
|
79
88
|
type: "MEDIA_MODIFIED",
|
|
89
|
+
itemId: current.mediaId,
|
|
80
90
|
media: current,
|
|
81
91
|
before: previous,
|
|
82
92
|
after: current,
|
|
83
93
|
})),
|
|
84
94
|
];
|
|
95
|
+
const changes = [
|
|
96
|
+
...added.map((change) => ({
|
|
97
|
+
scope: "clip",
|
|
98
|
+
type: change.type,
|
|
99
|
+
itemId: change.itemId,
|
|
100
|
+
after: change.after,
|
|
101
|
+
})),
|
|
102
|
+
...removed.map((change) => ({
|
|
103
|
+
scope: "clip",
|
|
104
|
+
type: change.type,
|
|
105
|
+
itemId: change.itemId,
|
|
106
|
+
before: change.before,
|
|
107
|
+
})),
|
|
108
|
+
...modified.map((change) => ({
|
|
109
|
+
scope: "clip",
|
|
110
|
+
type: change.type,
|
|
111
|
+
itemId: change.itemId,
|
|
112
|
+
before: change.before,
|
|
113
|
+
after: change.after,
|
|
114
|
+
})),
|
|
115
|
+
...markerChanges.map((change) => {
|
|
116
|
+
const before = change.before ?? (change.type === "MARKER_REMOVED" ? change.marker : undefined);
|
|
117
|
+
const after = change.after ?? (change.type === "MARKER_ADDED" ? change.marker : undefined);
|
|
118
|
+
return {
|
|
119
|
+
scope: "marker",
|
|
120
|
+
type: change.type,
|
|
121
|
+
itemId: after?.id ?? before?.id ?? change.marker.id,
|
|
122
|
+
...(before ? { before } : {}),
|
|
123
|
+
...(after ? { after } : {}),
|
|
124
|
+
};
|
|
125
|
+
}),
|
|
126
|
+
...captionChanges.map((change) => {
|
|
127
|
+
const before = change.before ?? (change.type === "CAPTION_REMOVED" ? change.caption : undefined);
|
|
128
|
+
const after = change.after ?? (change.type === "CAPTION_ADDED" ? change.caption : undefined);
|
|
129
|
+
return {
|
|
130
|
+
scope: "caption",
|
|
131
|
+
type: change.type,
|
|
132
|
+
itemId: after?.id ?? before?.id ?? change.caption.id,
|
|
133
|
+
...(before ? { before } : {}),
|
|
134
|
+
...(after ? { after } : {}),
|
|
135
|
+
};
|
|
136
|
+
}),
|
|
137
|
+
...storyElementChanges.map((change) => {
|
|
138
|
+
const before = change.before ?? (change.type === "STORY_ELEMENT_REMOVED" ? change.element : undefined);
|
|
139
|
+
const after = change.after ?? (change.type === "STORY_ELEMENT_ADDED" ? change.element : undefined);
|
|
140
|
+
return {
|
|
141
|
+
scope: "story-element",
|
|
142
|
+
type: change.type,
|
|
143
|
+
itemId: after?.id ?? before?.id ?? change.element.id,
|
|
144
|
+
...(before ? { before } : {}),
|
|
145
|
+
...(after ? { after } : {}),
|
|
146
|
+
};
|
|
147
|
+
}),
|
|
148
|
+
...mediaChanges.map((change) => {
|
|
149
|
+
const before = change.before ?? (change.type === "MEDIA_REMOVED" ? change.media : undefined);
|
|
150
|
+
const after = change.after ?? (change.type === "MEDIA_ADDED" ? change.media : undefined);
|
|
151
|
+
return {
|
|
152
|
+
scope: "media",
|
|
153
|
+
type: change.type,
|
|
154
|
+
itemId: after?.mediaId ?? before?.mediaId ?? change.media.mediaId,
|
|
155
|
+
...(before ? { before } : {}),
|
|
156
|
+
...(after ? { after } : {}),
|
|
157
|
+
};
|
|
158
|
+
}),
|
|
159
|
+
].sort(compareTimelineChanges);
|
|
85
160
|
const affectedRanges = uniqueRanges([
|
|
86
161
|
...added.flatMap((change) => rangesForClip(change.after)),
|
|
87
162
|
...removed.flatMap((change) => rangesForClip(change.before)),
|
|
@@ -103,21 +178,105 @@ export function diffSnapshots(before, after) {
|
|
|
103
178
|
end: Math.max(previous ? previous.start + previous.duration : 0, element.start + element.duration),
|
|
104
179
|
}]),
|
|
105
180
|
]);
|
|
181
|
+
const playheadChange = !sameRationalTime(before.playheadTime, after.playheadTime)
|
|
182
|
+
? {
|
|
183
|
+
...(before.playheadTime ? { before: { ...before.playheadTime } } : {}),
|
|
184
|
+
...(after.playheadTime ? { after: { ...after.playheadTime } } : {}),
|
|
185
|
+
}
|
|
186
|
+
: undefined;
|
|
106
187
|
return {
|
|
107
188
|
from: before.revision,
|
|
108
189
|
to: after.revision,
|
|
190
|
+
provenance: {
|
|
191
|
+
source: "project-snapshot",
|
|
192
|
+
projectId: before.projectId,
|
|
193
|
+
sequenceId: before.timeline.id,
|
|
194
|
+
fromRevision: before.revision,
|
|
195
|
+
toRevision: after.revision,
|
|
196
|
+
},
|
|
109
197
|
added,
|
|
110
198
|
removed,
|
|
111
199
|
modified,
|
|
112
200
|
durationDelta: after.timeline.duration - before.timeline.duration,
|
|
113
|
-
durationDeltaTime: decimalToRational(after.timeline.duration
|
|
201
|
+
durationDeltaTime: subtractRationalTimes(after.timeline.durationTime ?? decimalToRational(after.timeline.duration), before.timeline.durationTime ?? decimalToRational(before.timeline.duration), "INVALID_PROJECT_STATE"),
|
|
202
|
+
...(playheadChange ? { playheadChange } : {}),
|
|
114
203
|
markerChanges,
|
|
115
204
|
captionChanges,
|
|
116
205
|
storyElementChanges,
|
|
117
206
|
mediaChanges,
|
|
207
|
+
changes,
|
|
118
208
|
affectedRanges,
|
|
119
209
|
};
|
|
120
210
|
}
|
|
211
|
+
function compareTimelineChanges(left, right) {
|
|
212
|
+
const leftPosition = changePosition(left);
|
|
213
|
+
const rightPosition = changePosition(right);
|
|
214
|
+
if (leftPosition && rightPosition) {
|
|
215
|
+
const comparison = compareRational(leftPosition, rightPosition);
|
|
216
|
+
if (comparison !== 0)
|
|
217
|
+
return comparison;
|
|
218
|
+
}
|
|
219
|
+
else if (leftPosition) {
|
|
220
|
+
return -1;
|
|
221
|
+
}
|
|
222
|
+
else if (rightPosition) {
|
|
223
|
+
return 1;
|
|
224
|
+
}
|
|
225
|
+
const scopeComparison = compareCodePoints(left.scope, right.scope);
|
|
226
|
+
if (scopeComparison !== 0)
|
|
227
|
+
return scopeComparison;
|
|
228
|
+
return compareCodePoints(left.itemId, right.itemId);
|
|
229
|
+
}
|
|
230
|
+
function changePosition(change) {
|
|
231
|
+
const item = change.after ?? change.before;
|
|
232
|
+
if (!item || change.scope === "media")
|
|
233
|
+
return undefined;
|
|
234
|
+
if ("startTime" in item && item.startTime)
|
|
235
|
+
return item.startTime;
|
|
236
|
+
return undefined;
|
|
237
|
+
}
|
|
238
|
+
function compareCodePoints(left, right) {
|
|
239
|
+
const leftPoints = Array.from(left, (character) => character.codePointAt(0));
|
|
240
|
+
const rightPoints = Array.from(right, (character) => character.codePointAt(0));
|
|
241
|
+
const length = Math.min(leftPoints.length, rightPoints.length);
|
|
242
|
+
for (let index = 0; index < length; index += 1) {
|
|
243
|
+
const difference = leftPoints[index] - rightPoints[index];
|
|
244
|
+
if (difference !== 0)
|
|
245
|
+
return difference;
|
|
246
|
+
}
|
|
247
|
+
return leftPoints.length - rightPoints.length;
|
|
248
|
+
}
|
|
249
|
+
function compareRational(left, right) {
|
|
250
|
+
const leftValue = BigInt(left.value) * BigInt(right.timescale);
|
|
251
|
+
const rightValue = BigInt(right.value) * BigInt(left.timescale);
|
|
252
|
+
return leftValue < rightValue ? -1 : leftValue > rightValue ? 1 : 0;
|
|
253
|
+
}
|
|
254
|
+
function assertUniqueKeys(items, keyOf, side) {
|
|
255
|
+
const seen = new Set();
|
|
256
|
+
for (const item of items) {
|
|
257
|
+
const key = keyOf(item);
|
|
258
|
+
if (seen.has(key))
|
|
259
|
+
throw new Error(`AMBIGUOUS_TIMELINE_IDENTITY: duplicate ${side} item ${key}`);
|
|
260
|
+
seen.add(key);
|
|
261
|
+
}
|
|
262
|
+
}
|
|
263
|
+
function stableJson(value) {
|
|
264
|
+
if (Array.isArray(value))
|
|
265
|
+
return `[${value.map(stableJson).join(",")}]`;
|
|
266
|
+
if (value && typeof value === "object") {
|
|
267
|
+
return `{${Object.keys(value).sort()
|
|
268
|
+
.filter((key) => value[key] !== undefined)
|
|
269
|
+
.map((key) => `${JSON.stringify(key)}:${stableJson(value[key])}`).join(",")}}`;
|
|
270
|
+
}
|
|
271
|
+
return value === undefined ? "undefined" : JSON.stringify(value);
|
|
272
|
+
}
|
|
273
|
+
function sameRationalTime(left, right) {
|
|
274
|
+
if (!left || !right)
|
|
275
|
+
return left === right;
|
|
276
|
+
const leftParts = parseRational(left, "INVALID_PROJECT_STATE");
|
|
277
|
+
const rightParts = parseRational(right, "INVALID_PROJECT_STATE");
|
|
278
|
+
return leftParts.value * rightParts.timescale === rightParts.value * leftParts.timescale;
|
|
279
|
+
}
|
|
121
280
|
function uniqueRanges(ranges) {
|
|
122
281
|
const seen = new Set();
|
|
123
282
|
return ranges.filter((range) => {
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@morshoto/framekit",
|
|
3
|
-
"version": "0.1.
|
|
4
|
-
"packageManager": "pnpm@12.
|
|
3
|
+
"version": "0.1.13",
|
|
4
|
+
"packageManager": "pnpm@12.5.1",
|
|
5
5
|
"private": false,
|
|
6
6
|
"type": "module",
|
|
7
7
|
"description": "Agentic video editing runtime and MCP server for Final Cut Pro",
|
|
@@ -29,6 +29,7 @@
|
|
|
29
29
|
"test:golden": "tsx --test tests/golden/*.test.ts",
|
|
30
30
|
"test:release-gate": "tsx --test tests/release-gate/*.test.ts",
|
|
31
31
|
"release-gate": "tsx scripts/run-release-gate.ts",
|
|
32
|
+
"acceptance:v0112": "tsx scripts/run-v0112-acceptance.ts",
|
|
32
33
|
"release-report": "tsx scripts/generate-release-report.ts",
|
|
33
34
|
"verify-release-provenance": "tsx scripts/verify-release-provenance.ts",
|
|
34
35
|
"test:codex-plugin": "node scripts/codex-plugin-smoke.mjs",
|
|
@@ -37,10 +38,12 @@
|
|
|
37
38
|
"test:final-cut-headless": "tsx --test tests/integration/connection.test.ts tests/integration/finalcut-mcp.test.ts tests/integration/native.test.ts",
|
|
38
39
|
"test:final-cut-overlay-headed": "node scripts/final-cut-overlay-headed-e2e.mjs",
|
|
39
40
|
"test:final-cut-canonical-read-headed": "node scripts/final-cut-canonical-read-headed-e2e.mjs",
|
|
41
|
+
"test:final-cut-incremental-sync-headed": "node --import tsx scripts/final-cut-incremental-sync-headed-e2e.mjs",
|
|
40
42
|
"test:final-cut-publisher-headed": "node scripts/final-cut-publisher-headed-e2e.mjs",
|
|
41
43
|
"test:final-cut-project-selection-headed": "node scripts/final-cut-project-selection-headed-e2e.mjs",
|
|
42
44
|
"test:final-cut-canonical-headed": "node scripts/final-cut-canonical-headed-e2e.mjs",
|
|
43
45
|
"test:final-cut-filler-headed": "node scripts/final-cut-filler-removal-headed-e2e.mjs",
|
|
46
|
+
"test:final-cut-dialogue-headed": "node scripts/final-cut-dialogue-normalization-headed-e2e.mjs",
|
|
44
47
|
"test:watch": "tsx --test --watch tests/integration/*.test.ts tests/evaluation/*.test.ts tests/filler-removal/*.test.ts tests/golden/*.test.ts",
|
|
45
48
|
"test:final-cut-disposable-headed": "node scripts/final-cut-disposable-native-headed-e2e.mjs",
|
|
46
49
|
"test:final-cut-transition-headed": "node scripts/final-cut-transition-headed-e2e.mjs",
|
|
@@ -51,6 +54,7 @@
|
|
|
51
54
|
"test:final-cut-background-headed": "node scripts/final-cut-background-regression-headed-e2e.mjs",
|
|
52
55
|
"test:final-cut-fcpxml-console-experiment": "node --import tsx scripts/final-cut-fcpxml-console-experiment.mjs",
|
|
53
56
|
"hooks:install": "node scripts/install-git-hooks.mjs",
|
|
57
|
+
"check:git-config": "node scripts/check-git-config.mjs",
|
|
54
58
|
"mcp": "tsx apps/mcp-server/src/main.ts",
|
|
55
59
|
"framekit": "node ./bin/framekit.mjs",
|
|
56
60
|
"package:final-cut-release": "bash scripts/package-final-cut-release.sh",
|
|
@@ -74,9 +78,9 @@
|
|
|
74
78
|
"zod": "^3.25.76"
|
|
75
79
|
},
|
|
76
80
|
"devDependencies": {
|
|
77
|
-
"@openai/codex": "0.
|
|
78
|
-
"@types/node": "24.13.
|
|
79
|
-
"c8": "
|
|
81
|
+
"@openai/codex": "0.155.1",
|
|
82
|
+
"@types/node": "24.13.6",
|
|
83
|
+
"c8": "12.0.0",
|
|
80
84
|
"tsc-alias": "1.9.5",
|
|
81
85
|
"tsx": "4.23.13",
|
|
82
86
|
"typescript": "7.0.2"
|