@map-audio/pam-mcp-server 1.25.0 → 1.28.0

package/dist/midiFile.js

@@ -1,10 +1,10 @@
-// Standard MIDI File (type 1) writer for export_midi — pure Node over the
-// pattern state, mirroring PAMPluginProcessor::exportMidi's tiling and channel rule.
+// Standard MIDI File (type 1) writer for export_midi — pure Node over the events PAM renders
+// (notes and CC out), with a drawn-grid tiling fallback for builds that predate that route.
 export const MIDI_PPQ = 480;
 /** Must match syncUtils::patternSpeedMultipliers (modules/dsp-core/SyncUtils.h). */
 export const PATTERN_SPEED_MULTIPLIERS = [
     1 / 32, 1 / 16, 1 / 12, 1 / 8, 1 / 6, 1 / 5, 1 / 4, 1 / 3, 1 / 2, 1,
-    1.33, 1.5, 1.66, 2, 3, 4, 5, 6, 8, 12,
+    4 / 3, 1.5, 5 / 3, 2, 3, 4, 5, 6, 8, 12,
 ];
 export const patternSpeedMultiplier = (index) => {
     const i = Math.round(Number(index));
@@ -61,27 +61,34 @@ function chunk(type, body) {
     header.writeUInt32BE(body.length, 4);
     return Buffer.concat([header, Buffer.from(body)]);
 }
-function metaTrack(bpm, name) {
+/** Quarter-note beats in one bar of `meter`. */
+export const beatsPerBar = ({ numerator, denominator }) => (numerator * 4) / denominator;
+function metaTrack(bpm, name, meter) {
     const usPerQuarter = Math.round(60_000_000 / Math.max(1, bpm));
     const nameBytes = [...Buffer.from(name, "utf8")];
     const body = [
         ...varLen(0), 0xff, 0x03, ...varLen(nameBytes.length), ...nameBytes,
         ...varLen(0), 0xff, 0x51, 0x03, (usPerQuarter >> 16) & 0xff, (usPerQuarter >> 8) & 0xff, usPerQuarter & 0xff,
-        ...varLen(0), 0xff, 0x58, 0x04, 4, 2, 24, 8,
+        ...varLen(0), 0xff, 0x58, 0x04, meter.numerator, Math.round(Math.log2(meter.denominator)), 24, 8,
         ...varLen(0), 0xff, 0x2f, 0x00,
     ];
     return chunk("MTrk", body);
 }
-function noteTrack(name, events) {
+const channelBits = (channel) => Math.max(0, Math.min(15, Math.round(channel) - 1));
+const dataByte = (value) => Math.max(0, Math.min(127, Math.round(value)));
+function eventTrack({ name, events, cc = [] }, lengthBeats) {
     const messages = [];
+    // At one tick: note-offs (a retrigger is not swallowed), then controllers (a lane lock lands
+    // before its note), then note-ons, as PAM's MIDI out orders them.
     for (const e of events) {
-        const status = Math.max(0, Math.min(15, e.channel - 1));
+        const status = channelBits(e.channel);
         const on = Math.round(e.startBeats * MIDI_PPQ);
         const off = Math.max(on + 1, Math.round((e.startBeats + e.durationBeats) * MIDI_PPQ));
-        // Note-offs sort before note-ons at the same tick so a retrigger is not swallowed.
         messages.push({ tick: off, order: 0, bytes: [0x80 | status, e.note, 0] });
-        messages.push({ tick: on, order: 1, bytes: [0x90 | status, e.note, e.velocity] });
+        messages.push({ tick: on, order: 2, bytes: [0x90 | status, e.note, e.velocity] });
     }
+    for (const e of cc)
+        messages.push({ tick: Math.max(0, Math.round(e.beats * MIDI_PPQ)), order: 1, bytes: [0xb0 | channelBits(e.channel), dataByte(e.controller), dataByte(e.value)] });
     messages.sort((a, b) => a.tick - b.tick || a.order - b.order);
     const nameBytes = [...Buffer.from(name, "utf8")];
     const body = [...varLen(0), 0xff, 0x03, ...varLen(nameBytes.length), ...nameBytes];
@@ -90,19 +97,20 @@ function noteTrack(name, events) {
         body.push(...varLen(m.tick - last), ...m.bytes);
         last = m.tick;
     }
-    body.push(...varLen(0), 0xff, 0x2f, 0x00);
+    // End of Track at the export length, so a re-import loops at it rather than at the last note-off.
+    body.push(...varLen(Math.max(0, Math.round(lengthBeats * MIDI_PPQ) - last)), 0xff, 0x2f, 0x00);
     return chunk("MTrk", body);
 }
-/** A type-1 SMF: one tempo track plus one named track per entry. */
-export function buildMidiFile(bpm, tracks, title = "PAM") {
+/** A type-1 SMF: one tempo and meter track plus one named track per entry. */
+export function buildMidiFile(bpm, tracks, title = "PAM", meter = { numerator: 4, denominator: 4 }, lengthBeats = 0) {
     const header = Buffer.alloc(6);
     header.writeUInt16BE(1, 0);
     header.writeUInt16BE(tracks.length + 1, 2);
     header.writeUInt16BE(MIDI_PPQ, 4);
     return Buffer.concat([
         chunk("MThd", [...header]),
-        metaTrack(bpm, title),
-        ...tracks.map((track) => noteTrack(track.name, track.events)),
+        metaTrack(bpm, title, meter),
+        ...tracks.map((track) => eventTrack(track, lengthBeats)),
     ]);
 }
 //# sourceMappingURL=midiFile.js.map

package/dist/midiFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"midiFile.js","sourceRoot":"","sources":["../src/midiFile.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"midiFile.js","sourceRoot":"","sources":["../src/midiFile.ts"],"names":[],"mappings":"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"}

package/dist/mixAssist.d.ts

@@ -14,6 +14,7 @@ export interface CellStemAnalysis {
     onsetDensity: number;
     seconds: number;
     barkDb: number[];
+    coactivity?: Record<number, number>;
 }
 export interface MixAnalysis {
     epoch: number;
@@ -35,6 +36,8 @@ export interface CellContext {
     eqMidGain: number;
     eqHighGain: number;
     eqEnabled: boolean;
+    eqLowMidFreq?: number;
+    eqMidHighFreq?: number;
     compressorEnabled: boolean;
     compressorThreshold: number;
     compressorRatioAmount: number;
@@ -106,6 +109,7 @@ export declare const MAX_EQ_CUT_DB = 3;
 export declare const MAX_EQ_LOW_CUT_DB = 1.5;
 export declare const MAX_EQ_CUTS = 2;
 export declare const EQ_EPSILON_DB = 0.3;
+export declare const MIN_EQ_CUT_SCORE = 0.2;
 export declare const CREST_ENGAGE_DB = 14;
 export declare const COMP_RATIO_MIN = 1.5;
 export declare const COMP_RATIO_MAX = 4;
@@ -113,16 +117,37 @@ export declare const COMP_EPSILON = 0.05;
 export declare const PERCUSSIVITY_FULL_ONSET_DENSITY = 8;
 export declare const MIX_PARAM_DEFAULTS: Record<string, number>;
 export declare function mixParamDefault(key: string): number;
+export type RbjBiquadType = 'peaking' | 'lowshelf' | 'highshelf' | 'highpass' | 'lowpass' | 'notch';
+export declare const gainToDb: (gain: number) => number;
+/** |H(e^jw)| for one normalized RBJ biquad section. */
+export declare function rbjBiquadMagnitude(frequencyHz: number, sampleRate: number, type: RbjBiquadType, centerHz: number, gainDb: number, q: number): number;
+export declare const EQ_DEFAULT_LOW_MID_HZ = 880;
+export declare const EQ_DEFAULT_MID_HZ = 2100;
+export declare const EQ_DEFAULT_MID_HIGH_HZ = 5000;
+export declare const EQ_LOW_MID_MIN_HZ = 80;
+export declare const EQ_LOW_MID_MAX_HZ = 2000;
+export declare const EQ_MID_HIGH_MIN_HZ = 2000;
+export declare const EQ_MID_HIGH_MAX_HZ = 12000;
+export declare const EQ_SAMPLE_RATE = 48000;
+export declare const EQ_SHELF_Q = 0.5;
+export declare const EQ_MID_Q = 0.7071;
+export declare function eqMidFrequencyHz(lowMidHz: number, midHighHz: number): number;
+/** Exact magnitude response of the native three cascaded Biquads. */
+export declare function eqResponseDb(hz: number, lowGainDb: number, midGainDb: number, highGainDb: number, lowMidHz?: number, midHighHz?: number, sampleRate?: number): number;
 export declare const BARK_BAND_COUNT = 25;
 export declare const BARK_BAND_EDGES_HZ: readonly number[];
 export declare function bandForFrequency(hz: number): number;
 export declare function barkBandCenterHz(band: number): number;
 export declare const dbToPower: (db: number) => number;
+export declare const BARK_K_WEIGHT: readonly number[];
+export declare function weightedBandPower(barkDb: readonly number[], band: number): number;
 export declare function barkCentroidHz(barkDb: readonly number[]): number;
 export declare function lowFraction(barkDb: readonly number[], belowHz?: number): number;
 export declare function maskingOverlap(aDb: readonly number[], bDb: readonly number[]): number;
 export declare function spectralShapeOverlap(aDb: readonly number[], bDb: readonly number[]): number;
 export declare function maskingMatrix(barkDbByCell: readonly (readonly number[])[]): number[][];
+export declare function coactivity(cell: CellStemAnalysis, otherCellId: number): number;
+export declare function effectiveMaskingMatrix(cells: readonly CellStemAnalysis[]): number[][];
 export type OverlapRegion = 'low' | 'mid' | 'high';
 export declare function dominantOverlapRegion(aDb: readonly number[], bDb: readonly number[]): OverlapRegion;
 export declare function parseMixAnalysisPayload(raw: unknown): MixAnalysis | null;
@@ -158,4 +183,14 @@ export declare function classifyCellRole(a: CellStemAnalysis): CellRole;
 export declare function normalizeMovesToBus(deltasDb: number[], lufs: number[]): number[];
 export declare function normalizeMovesToBusBounded(rawDeltasDb: number[], lufs: number[], currentVolumes: number[]): number[];
 export declare function maskerWeight(pLufs: number, qLufs: number): number;
+type EqKnob = 'eqLowGain' | 'eqMidGain' | 'eqHighGain';
+export interface EqCutPlan {
+    key: EqKnob;
+    region: OverlapRegion;
+    label: string;
+    centerHz: number;
+    score: number;
+}
+export declare function planEqCut(maskedDb: readonly number[], maskerDb: readonly number[], lowMidHz?: number, midHighHz?: number): EqCutPlan | null;
 export declare function suggestMix(m: MixMeasurement, options: MixAssistOptions, current?: CurrentFlatState): MixSuggestion;
+export {};

package/dist/mixAssist.js

@@ -1,6 +1,6 @@
 // GENERATED FILE — do not edit by hand.
 // Vendored from shared/mixAssist/ (server rootDir cannot import outside src/;
-// the fgemma-format.ts precedent). Regenerate with:
+// the functiongemma-format.ts precedent). Regenerate with:
 //   node scripts/sync-mixassist.mjs
 // Parity is pinned by interface/test/mixAssistServerParity.test.ts.
 /* eslint-disable */
@@ -85,6 +85,8 @@ export const MAX_EQ_CUT_DB = 3; // Hafezi bound
 export const MAX_EQ_LOW_CUT_DB = 1.5; // preserve low-end weight on non-bass maskers
 export const MAX_EQ_CUTS = 2;
 export const EQ_EPSILON_DB = 0.3;
+// planEqCut score below which no EQ3 knob reaches the conflict usefully.
+export const MIN_EQ_CUT_SCORE = 0.2;
 // --- dynamics (comp) stage ---
 export const CREST_ENGAGE_DB = 14; // plr above this makes a cell comp-eligible
 export const COMP_RATIO_MIN = 1.5;
@@ -111,6 +113,120 @@ export function mixParamDefault(key) {
     const suffix = key.replace(/^cell\d+_/, '');
     return MIX_PARAM_DEFAULTS[suffix] ?? 0;
 }
+export const gainToDb = (gain) => 20 * Math.log10(Math.max(gain, 1e-9));
+/** |H(e^jw)| for one normalized RBJ biquad section. */
+export function rbjBiquadMagnitude(frequencyHz, sampleRate, type, centerHz, gainDb, q) {
+    const w = (2 * Math.PI * Math.min(Math.max(frequencyHz, 1e-6), sampleRate * 0.4999)) / sampleRate;
+    const w0 = (2 * Math.PI * Math.min(Math.max(centerHz, 1e-3), sampleRate * 0.4999)) / sampleRate;
+    const cos0 = Math.cos(w0);
+    const sin0 = Math.sin(w0);
+    const A = Math.pow(10, (gainDb || 0) / 40);
+    const alpha0 = sin0 / (2 * Math.max(1e-6, q));
+    let b0 = 1;
+    let b1 = 0;
+    let b2 = 0;
+    let a0 = 1;
+    let a1 = 0;
+    let a2 = 0;
+    switch (type) {
+        case 'peaking':
+            b0 = 1 + alpha0 * A;
+            b1 = -2 * cos0;
+            b2 = 1 - alpha0 * A;
+            a0 = 1 + alpha0 / A;
+            a1 = -2 * cos0;
+            a2 = 1 - alpha0 / A;
+            break;
+        case 'lowshelf': {
+            const sqrtA = Math.sqrt(A);
+            const two = 2 * sqrtA * alpha0;
+            b0 = A * (A + 1 - (A - 1) * cos0 + two);
+            b1 = 2 * A * (A - 1 - (A + 1) * cos0);
+            b2 = A * (A + 1 - (A - 1) * cos0 - two);
+            a0 = A + 1 + (A - 1) * cos0 + two;
+            a1 = -2 * (A - 1 + (A + 1) * cos0);
+            a2 = A + 1 + (A - 1) * cos0 - two;
+            break;
+        }
+        case 'highshelf': {
+            const sqrtA = Math.sqrt(A);
+            const two = 2 * sqrtA * alpha0;
+            b0 = A * (A + 1 + (A - 1) * cos0 + two);
+            b1 = -2 * A * (A - 1 + (A + 1) * cos0);
+            b2 = A * (A + 1 + (A - 1) * cos0 - two);
+            a0 = A + 1 - (A - 1) * cos0 + two;
+            a1 = 2 * (A - 1 - (A + 1) * cos0);
+            a2 = A + 1 - (A - 1) * cos0 - two;
+            break;
+        }
+        case 'lowpass':
+            b0 = (1 - cos0) / 2;
+            b1 = 1 - cos0;
+            b2 = (1 - cos0) / 2;
+            a0 = 1 + alpha0;
+            a1 = -2 * cos0;
+            a2 = 1 - alpha0;
+            break;
+        case 'highpass':
+            b0 = (1 + cos0) / 2;
+            b1 = -(1 + cos0);
+            b2 = (1 + cos0) / 2;
+            a0 = 1 + alpha0;
+            a1 = -2 * cos0;
+            a2 = 1 - alpha0;
+            break;
+        case 'notch':
+            b0 = 1;
+            b1 = -2 * cos0;
+            b2 = 1;
+            a0 = 1 + alpha0;
+            a1 = -2 * cos0;
+            a2 = 1 - alpha0;
+            break;
+    }
+    const bz0 = b0 / a0;
+    const bz1 = b1 / a0;
+    const bz2 = b2 / a0;
+    const az1 = a1 / a0;
+    const az2 = a2 / a0;
+    const cosw = Math.cos(w);
+    const sinw = Math.sin(w);
+    const cos2w = Math.cos(2 * w);
+    const sin2w = Math.sin(2 * w);
+    const numerator = (bz0 + bz1 * cosw + bz2 * cos2w) ** 2 + (bz1 * sinw + bz2 * sin2w) ** 2;
+    const denominator = (1 + az1 * cosw + az2 * cos2w) ** 2 + (az1 * sinw + az2 * sin2w) ** 2;
+    return Math.sqrt(numerator / Math.max(denominator, 1e-24));
+}
+// ---------------- EQ3 (the per-cell mixer EQ) ----------------
+// Exact twins of modules/eq/EQ.h. The old engine was fixed at these frequencies;
+// they remain the parameter defaults so old presets keep their sound.
+export const EQ_DEFAULT_LOW_MID_HZ = 880;
+export const EQ_DEFAULT_MID_HZ = 2100;
+export const EQ_DEFAULT_MID_HIGH_HZ = 5000;
+export const EQ_LOW_MID_MIN_HZ = 80;
+export const EQ_LOW_MID_MAX_HZ = 2000;
+export const EQ_MID_HIGH_MIN_HZ = 2000;
+export const EQ_MID_HIGH_MAX_HZ = 12000;
+export const EQ_SAMPLE_RATE = 48000;
+export const EQ_SHELF_Q = 0.5;
+export const EQ_MID_Q = 0.7071;
+const clampHz = (v, lo, hi) => Math.max(lo, Math.min(hi, v));
+export function eqMidFrequencyHz(lowMidHz, midHighHz) {
+    const low = clampHz(lowMidHz, EQ_LOW_MID_MIN_HZ, EQ_LOW_MID_MAX_HZ);
+    const high = clampHz(midHighHz, EQ_MID_HIGH_MIN_HZ, EQ_MID_HIGH_MAX_HZ);
+    if (low === EQ_DEFAULT_LOW_MID_HZ && high === EQ_DEFAULT_MID_HIGH_HZ)
+        return EQ_DEFAULT_MID_HZ;
+    return EQ_DEFAULT_MID_HZ * Math.sqrt((low / EQ_DEFAULT_LOW_MID_HZ) * (high / EQ_DEFAULT_MID_HIGH_HZ));
+}
+/** Exact magnitude response of the native three cascaded Biquads. */
+export function eqResponseDb(hz, lowGainDb, midGainDb, highGainDb, lowMidHz = EQ_DEFAULT_LOW_MID_HZ, midHighHz = EQ_DEFAULT_MID_HIGH_HZ, sampleRate = EQ_SAMPLE_RATE) {
+    const low = clampHz(lowMidHz, EQ_LOW_MID_MIN_HZ, EQ_LOW_MID_MAX_HZ);
+    const high = clampHz(midHighHz, EQ_MID_HIGH_MIN_HZ, EQ_MID_HIGH_MAX_HZ);
+    const magnitude = rbjBiquadMagnitude(hz, sampleRate, 'lowshelf', low, lowGainDb, EQ_SHELF_Q) *
+        rbjBiquadMagnitude(hz, sampleRate, 'peaking', eqMidFrequencyHz(low, high), midGainDb, EQ_MID_Q) *
+        rbjBiquadMagnitude(hz, sampleRate, 'highshelf', high, highGainDb, EQ_SHELF_Q);
+    return gainToDb(magnitude);
+}
 // ===== shared/mixAssist/bark.ts =====
 // Bark band model — the TS mirror of modules/analysis/BarkScale.h. The 26
 // edge literals MUST match the C++ table verbatim; parity is pinned by
@@ -137,6 +253,33 @@ export function barkBandCenterHz(band) {
     return Math.sqrt(BARK_BAND_EDGES_HZ[b] * BARK_BAND_EDGES_HZ[b + 1]);
 }
 export const dbToPower = (db) => Math.pow(10, db / 10);
+// BS.1770 K-weighting power gain per Bark band (48 kHz pre-filter + RLB
+// high-pass), averaged over the band in log frequency. Masking decisions weigh
+// band energy in the same domain the LUFS readings use, so raw sub-bass power
+// cannot outvote what the ear hears in the mids.
+function kWeightPowerAt(hz) {
+    const w = (2 * Math.PI * hz) / 48000;
+    const section = (b0, b1, b2, a1, a2) => {
+        const num = (b0 + b1 * Math.cos(w) + b2 * Math.cos(2 * w)) ** 2 + (b1 * Math.sin(w) + b2 * Math.sin(2 * w)) ** 2;
+        const den = (1 + a1 * Math.cos(w) + a2 * Math.cos(2 * w)) ** 2 + (a1 * Math.sin(w) + a2 * Math.sin(2 * w)) ** 2;
+        return num / den;
+    };
+    return (section(1.53512485958697, -2.69169618940638, 1.19839281085285, -1.69065929318241, 0.73248077421585) *
+        section(1, -2, 1, -1.99004745483398, 0.99007225036621));
+}
+export const BARK_K_WEIGHT = Array.from({ length: BARK_BAND_COUNT }, (_, b) => {
+    const lo = Math.log(BARK_BAND_EDGES_HZ[b]);
+    const hi = Math.log(BARK_BAND_EDGES_HZ[b + 1]);
+    const points = 16;
+    let sum = 0;
+    for (let i = 0; i < points; i++)
+        sum += kWeightPowerAt(Math.exp(lo + ((i + 0.5) / points) * (hi - lo)));
+    return sum / points;
+});
+// Band power as the loudness meter hears it (K-weighted), linear.
+export function weightedBandPower(barkDb, band) {
+    return dbToPower(barkDb[band]) * BARK_K_WEIGHT[band];
+}
 // Power-weighted spectral centroid over band centers, Hz. 0 when silent.
 export function barkCentroidHz(barkDb) {
     let power = 0;
@@ -148,7 +291,8 @@ export function barkCentroidHz(barkDb) {
     }
     return power > 0 ? weighted / power : 0;
 }
-// Fraction of LINEAR power in bands wholly below `belowHz`. 0 when silent.
+// Fraction of LINEAR power in bands wholly below `belowHz`. 0 only at zero power: the analyzer's
+// -120 dB silence floor (`kBarkFloorDb`) reads 2/25.
 export function lowFraction(barkDb, belowHz = 200) {
     let total = 0;
     let low = 0;
@@ -164,7 +308,7 @@ export function lowFraction(barkDb, belowHz = 200) {
 // Cross-cell Bark-band masking overlap (AutoMix M1). Deliberately simple:
 // textbook objective masking models track perceived masking poorly (Hafezi &
 // Reiss, JAES 2015) — a bounded band-overlap fraction works better as a rule
-// input than a psychoacoustic model.
+// input than a psychoacoustic model. Band energy is K-weighted (bark.ts).
 // Fraction of A's energy that B overlaps: sum_b min(Pa, Pb) / sum_b Pa.
 // Asymmetric (a quiet cell under a loud one reads ~1; the loud one reads
 // less). 0 when A is silent.
@@ -173,8 +317,8 @@ export function maskingOverlap(aDb, bDb) {
     let shared = 0;
     const n = Math.min(aDb.length, bDb.length, BARK_BAND_COUNT);
     for (let b = 0; b < n; b++) {
-        const pa = dbToPower(aDb[b]);
-        const pb = dbToPower(bDb[b]);
+        const pa = weightedBandPower(aDb, b);
+        const pb = weightedBandPower(bDb, b);
         sumA += pa;
         shared += Math.min(pa, pb);
     }
@@ -197,14 +341,14 @@ export function spectralShapeOverlap(aDb, bDb) {
     let sumA = 0;
     let sumB = 0;
     for (let b = 0; b < n; b++) {
-        sumA += dbToPower(aDb[b]);
-        sumB += dbToPower(bDb[b]);
+        sumA += weightedBandPower(aDb, b);
+        sumB += weightedBandPower(bDb, b);
     }
     if (sumA <= 0 || sumB <= 0)
         return 0;
     let shared = 0;
     for (let b = 0; b < n; b++) {
-        shared += Math.min(dbToPower(aDb[b]) / sumA, dbToPower(bDb[b]) / sumB);
+        shared += Math.min(weightedBandPower(aDb, b) / sumA, weightedBandPower(bDb, b) / sumB);
     }
     return shared;
 }
@@ -221,16 +365,34 @@ export function maskingMatrix(barkDbByCell) {
     }
     return m;
 }
+// Fraction of `cell`'s sounding frames in which `otherCellId` also sounds.
+// Payloads without the map read 1, the old always-simultaneous assumption.
+export function coactivity(cell, otherCellId) {
+    const v = cell.coactivity?.[otherCellId];
+    return v === undefined ? 1 : Math.min(1, Math.max(0, v));
+}
+// maskingMatrix gated by co-activity: two parts that never sound together do
+// not mask each other, however alike their long-term spectra are.
+export function effectiveMaskingMatrix(cells) {
+    const m = maskingMatrix(cells.map((c) => c.barkDb));
+    for (let i = 0; i < cells.length; i++) {
+        for (let j = 0; j < cells.length; j++) {
+            if (i !== j)
+                m[i][j] *= coactivity(cells[i], cells[j].cellId);
+        }
+    }
+    return m;
+}
 // Region carrying the largest shared power between two stems, split at
-// 300 Hz / 5 kHz — the mixer 3-band EQ's split, so a cut lands on the right
-// knob. Band membership by log-center.
+// 300 Hz / 5 kHz by log-center. PAN reads it to keep bass-range conflicts
+// centred; EQ cuts pick their knob from the real EQ3 curve instead.
 export function dominantOverlapRegion(aDb, bDb) {
     const shared = { low: 0, mid: 0, high: 0 };
     const n = Math.min(aDb.length, bDb.length, BARK_BAND_COUNT);
     for (let b = 0; b < n; b++) {
         const center = barkBandCenterHz(b);
         const region = center < 300 ? 'low' : center >= 5000 ? 'high' : 'mid';
-        shared[region] += Math.min(dbToPower(aDb[b]), dbToPower(bDb[b]));
+        shared[region] += Math.min(weightedBandPower(aDb, b), weightedBandPower(bDb, b));
     }
     if (shared.low >= shared.mid && shared.low >= shared.high)
         return 'low';
@@ -240,6 +402,18 @@ export function dominantOverlapRegion(aDb, bDb) {
 }
 // ===== shared/mixAssist/parse.ts =====
 const num = (v) => typeof v === 'number' && Number.isFinite(v) ? v : undefined;
+function parseCoactivity(raw) {
+    if (typeof raw !== 'object' || raw === null || Array.isArray(raw))
+        return undefined;
+    const out = {};
+    for (const [key, value] of Object.entries(raw)) {
+        const id = Number(key);
+        const v = num(value);
+        if (Number.isInteger(id) && v !== undefined)
+            out[id] = Math.min(1, Math.max(0, v));
+    }
+    return out;
+}
 function parseStem(raw) {
     // Number.isFinite per band: one NaN/Infinity entry would silently poison the
     // masking matrix (dbToPower propagates it through every overlap sum).
@@ -263,6 +437,7 @@ function parseStem(raw) {
         onsetDensity: num(raw.onsetDensity) ?? 0,
         seconds: num(raw.secs) ?? 0,
         barkDb: bark,
+        coactivity: parseCoactivity(raw.coact),
     };
 }
 // Maps the native analyzeMixStems payload (short keys, sentinel fields
@@ -353,6 +528,8 @@ export function buildMixMeasurementFromState(analysis, flatState, mods = {}, opt
             eqMidGain: numOr(k('eqMidGain'), 0),
             eqHighGain: numOr(k('eqHighGain'), 0),
             eqEnabled: numOr(k('eqEnabled'), 0) > 0.5,
+            eqLowMidFreq: numOr(k('eqLowMidFreq'), EQ_DEFAULT_LOW_MID_HZ),
+            eqMidHighFreq: numOr(k('eqMidHighFreq'), EQ_DEFAULT_MID_HIGH_HZ),
             compressorEnabled: numOr(k('compressorEnabled'), 0) > 0.5,
             compressorThreshold: numOr(k('compressorThreshold'), 0),
             compressorRatioAmount: numOr(k('compressorRatioAmount'), 2),
@@ -474,6 +651,53 @@ export function normalizeMovesToBusBounded(rawDeltasDb, lufs, currentVolumes) {
 export function maskerWeight(pLufs, qLufs) {
     return 1 / (1 + Math.pow(10, (pLufs - qLufs) / 10));
 }
+const EQ_KNOBS = [
+    { key: 'eqLowGain', region: 'low', label: 'low shelf' },
+    { key: 'eqMidGain', region: 'mid', label: 'mid band' },
+    { key: 'eqHighGain', region: 'high', label: 'high shelf' },
+];
+// Picks the masker's EQ3 knob from its REAL curve at this cell's crossovers.
+// coverage = how hard a probe cut hits the shared (conflict) energy, collateral =
+// how hard it hits the masker overall; score = coverage * min(1, coverage/collateral).
+export function planEqCut(maskedDb, maskerDb, lowMidHz = EQ_DEFAULT_LOW_MID_HZ, midHighHz = EQ_DEFAULT_MID_HIGH_HZ) {
+    const n = Math.min(maskedDb.length, maskerDb.length, BARK_BAND_COUNT);
+    const shared = [];
+    const own = [];
+    let sharedSum = 0;
+    let ownSum = 0;
+    let logCenter = 0;
+    for (let b = 0; b < n; b++) {
+        const pk = weightedBandPower(maskerDb, b);
+        const s = Math.min(weightedBandPower(maskedDb, b), pk);
+        shared.push(s);
+        own.push(pk);
+        sharedSum += s;
+        ownSum += pk;
+        logCenter += s * Math.log(barkBandCenterHz(b));
+    }
+    if (sharedSum <= 0 || ownSum <= 0)
+        return null;
+    const probeDb = -MAX_EQ_CUT_DB;
+    const probeRemoval = 1 - Math.pow(10, probeDb / 10);
+    let best = null;
+    for (const knob of EQ_KNOBS) {
+        let hitShared = 0;
+        let hitOwn = 0;
+        for (let b = 0; b < n; b++) {
+            const responseDb = eqResponseDb(barkBandCenterHz(b), knob.key === 'eqLowGain' ? probeDb : 0, knob.key === 'eqMidGain' ? probeDb : 0, knob.key === 'eqHighGain' ? probeDb : 0, lowMidHz, midHighHz);
+            const removal = 1 - Math.pow(10, responseDb / 10);
+            hitShared += shared[b] * removal;
+            hitOwn += own[b] * removal;
+        }
+        const coverage = hitShared / (sharedSum * probeRemoval);
+        const collateral = hitOwn / (ownSum * probeRemoval);
+        const score = coverage * Math.min(1, coverage / Math.max(collateral, 1e-9));
+        if (!best || score > best.score) {
+            best = { key: knob.key, region: knob.region, label: knob.label, centerHz: Math.exp(logCenter / sharedSum), score };
+        }
+    }
+    return best;
+}
 export function suggestMix(m, options, current = {}) {
     const moves = [];
     const guardsHit = [];
@@ -524,14 +748,15 @@ export function suggestMix(m, options, current = {}) {
     // feeding it into effectiveLufs made the quietest cell take the deepest
     // penalty and the largest compensating lift. spectralShapeOverlap answers
     // only "do they collide", and maskerWeight scales that by the level gap.
-    const matrix = maskingMatrix(participants.map((p) => p.cell.analysis.barkDb));
+    const matrix = effectiveMaskingMatrix(participants.map((p) => p.cell.analysis));
     for (const p of participants) {
         let masked = 0;
         for (const q of participants) {
             if (q.index === p.index)
                 continue;
             const shape = spectralShapeOverlap(p.cell.analysis.barkDb, q.cell.analysis.barkDb);
-            masked = Math.max(masked, shape * maskerWeight(p.lufs, q.lufs));
+            const together = coactivity(p.cell.analysis, q.cell.context.cellId);
+            masked = Math.max(masked, shape * maskerWeight(p.lufs, q.lufs) * together);
         }
         p.maskedFraction = masked;
         p.effectiveLufs = p.lufs - MASK_PENALTY_DB_PER_UNIT * masked;
@@ -646,23 +871,24 @@ export function suggestMix(m, options, current = {}) {
                 guardsHit.push(`cell ${id} mixer EQ is modulated — no masking cut`);
                 continue;
             }
-            const region = dominantOverlapRegion(c.masked.cell.analysis.barkDb, c.masker.cell.analysis.barkDb);
+            const plan = planEqCut(c.masked.cell.analysis.barkDb, c.masker.cell.analysis.barkDb, maskerCtx.eqLowMidFreq, maskerCtx.eqMidHighFreq);
+            if (!plan || plan.score < MIN_EQ_CUT_SCORE) {
+                guardsHit.push(`cell ${id} EQ cannot reach the conflict with cell ${c.masked.cell.context.cellId}`);
+                continue;
+            }
             // Never carve the fundamental of a low-dominant source. Kick and bass
             // conflicts belong to balance or sidechain, not a broad static low cut.
-            // Non-low-dominant sources can still be trimmed gently when their low
-            // spill masks another cell.
-            if (region === 'low' && c.masker.lowDominant) {
+            if (plan.region === 'low' && c.masker.lowDominant) {
                 guardsHit.push(`cell ${id} is low-dominant — its low band is left alone`);
                 continue;
             }
-            const band = region === 'low' ? 'eqLowGain' : region === 'high' ? 'eqHighGain' : 'eqMidGain';
-            const key = `cell${id}_${band}`;
-            const maxCutDb = region === 'low' ? MAX_EQ_LOW_CUT_DB : MAX_EQ_CUT_DB;
+            const key = `cell${id}_${plan.key}`;
+            const maxCutDb = plan.region === 'low' ? MAX_EQ_LOW_CUT_DB : MAX_EQ_CUT_DB;
             const cutDb = Math.min(maxCutDb, 6 * c.overlap - 2);
             if (cutDb <= EQ_EPSILON_DB)
                 continue;
             const value = round1(cur(key) - cutDb);
-            propose(id, key, value, `cell ${id} covers cell ${c.masked.cell.context.cellId} in the ${region} band — cut ${round1(cutDb)} dB`, EQ_EPSILON_DB);
+            propose(id, key, value, `cell ${id} covers cell ${c.masked.cell.context.cellId} around ${formatHz(plan.centerHz)} — cut ${round1(cutDb)} dB on the ${plan.label}`, EQ_EPSILON_DB);
             if (flat[key] !== undefined && !maskerCtx.eqEnabled) {
                 flat[`cell${id}_eqEnabled`] = 1;
                 guardsHit.push(`cell ${id} mixer EQ enabled for the cut`);
@@ -734,4 +960,7 @@ export function suggestMix(m, options, current = {}) {
 function cellId(p) {
     return p.cell.context.cellId;
 }
+function formatHz(hz) {
+    return hz >= 1000 ? `${round1(hz / 1000)} kHz` : `${Math.round(hz / 10) * 10} Hz`;
+}
 //# sourceMappingURL=mixAssist.js.map