diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98ecb9a..c8eadb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ All notable changes to this project are documented here. The project follows
- Big networks no longer freeze for a moment at every new game day, above all with a NOC intern on duty. The intern now plans cache boxes, router ports and PNIs for every POP in one pass. On a network of 190 POPs the intern's shift held the page for about a tenth of a second on a computer and half a second on a phone; it now takes a few thousandths, and a whole day holds the page a quarter as long. The game plays exactly as before.
- A low-latency boutique with a lot of its own fiber no longer stalls every day while it times its finance routes. On a big fiber network that check held the page for about a third of a second and now takes a few hundredths; checking customers who want a path without subsea or under a latency limit got quicker too. The game plays exactly as before.
- The NOC intern no longer holds a big network for more than half a second each time it weighs taking out a spare wave. Before it decides, it checks every customer promised diverse paths, no subsea or a latency limit, and on a network of 390 POPs that check now takes a few hundredths of a second. Spotting new sovereign cloud and trading offers is about ten times quicker too, and the game plays exactly as before.
-- You can now move a customer to another path between the same two POPs, with the most diverse options listed first. Alien waves and leased fiber pairs move to another fiber, and circuits can be pinned to a path of your choice, falling back to normal routing while a link on it is down.
+- You can now move a customer to another path between the same two POPs, with the most diverse options listed first. Waves and leased fiber pairs move to another fiber with room for them, leaving alone what you keep back for your own traffic, and circuits can be pinned to a path of your choice, falling back to normal routing while a link on it is down.
## [3.2.0] — 2026-11-07
diff --git a/site/i18n/de.js b/site/i18n/de.js
index 39c300f..3d0e0a9 100644
--- a/site/i18n/de.js
+++ b/site/i18n/de.js
@@ -1770,9 +1770,12 @@
"customer_paths.name_follows_routing_again":"{name} folgt wieder dem Routing.",
"customer_paths.name_moved_to_fiber":"{name} ist auf {fiber} umgezogen.",
"customer_paths.name_now_rides_path":"{name} läuft jetzt über {path}.",
+"customer_paths.needs_a_g_channel":"Braucht einen Kanal mit {g} oder mehr",
"customer_paths.no_other_path":"Zwischen {a} und {b} gibt es gerade keinen anderen funktionierenden Pfad.",
"customer_paths.no_other_working_fiber":"Zwischen {a} und {b} gibt es keine andere funktionierende Glasfaser. Bau eine, dann kannst du diesen Kunden darauf umziehen.",
"customer_paths.not_enough_free_channels":"Zu wenig freie Kanäle: {free} frei, {n} nötig",
+"customer_paths.not_enough_spare_capacity":"Zu wenig freie Kapazität: {free} übrig nach deinem eigenen Traffic und den {hold} %, die du zurückhältst, {g} nötig",
+"customer_paths.not_enough_spare_channels":"Zu wenig freie Kanäle: {free} übrig nach den {hold} %, die du für deinen eigenen Traffic zurückhältst, {n} nötig",
"customer_paths.now_on":"Aktuell auf",
"customer_paths.only_your_own_fiber_rents_pairs":"Nur deine eigene Glasfaser kann Paare vermieten",
"customer_paths.over_the_ms_budget":"Über dem Budget von {ms} ms",
diff --git a/site/i18n/es.js b/site/i18n/es.js
index 06a6d27..4348512 100644
--- a/site/i18n/es.js
+++ b/site/i18n/es.js
@@ -1768,9 +1768,12 @@
"customer_paths.name_follows_routing_again":"{name} vuelve a seguir el enrutamiento.",
"customer_paths.name_moved_to_fiber":"{name} se ha movido a {fiber}.",
"customer_paths.name_now_rides_path":"{name} ahora va por {path}.",
+"customer_paths.needs_a_g_channel":"Necesita un canal iluminado a {g} o más",
"customer_paths.no_other_path":"Ahora mismo no hay otra ruta operativa entre {a} y {b}.",
"customer_paths.no_other_working_fiber":"No hay otra fibra operativa entre {a} y {b}. Construye una y podrás mover a este cliente a ella.",
"customer_paths.not_enough_free_channels":"No hay canales libres suficientes: {free} libres, necesita {n}",
+"customer_paths.not_enough_spare_capacity":"No hay capacidad libre suficiente: quedan {free} tras tu propio tráfico y el {hold} % que reservas, necesita {g}",
+"customer_paths.not_enough_spare_channels":"No hay canales libres suficientes: quedan {free} tras el {hold} % que reservas para tu propio tráfico, necesita {n}",
"customer_paths.now_on":"Ahora en",
"customer_paths.only_your_own_fiber_rents_pairs":"Solo tu propia fibra puede alquilar pares",
"customer_paths.over_the_ms_budget":"Supera el presupuesto de {ms} ms",
diff --git a/site/i18n/fr.js b/site/i18n/fr.js
index 2d7fb90..a3c7813 100644
--- a/site/i18n/fr.js
+++ b/site/i18n/fr.js
@@ -1768,9 +1768,12 @@
"customer_paths.name_follows_routing_again":"{name} suit de nouveau le routage.",
"customer_paths.name_moved_to_fiber":"{name} a été déplacé vers {fiber}.",
"customer_paths.name_now_rides_path":"{name} passe maintenant par {path}.",
+"customer_paths.needs_a_g_channel":"Il faut un canal allumé à {g} ou plus",
"customer_paths.no_other_path":"Il n'y a pas d'autre chemin en service entre {a} et {b} pour le moment.",
"customer_paths.no_other_working_fiber":"Il n'y a pas d'autre fibre en service entre {a} et {b}. Construis-en une et tu pourras y déplacer ce client.",
"customer_paths.not_enough_free_channels":"Pas assez de canaux libres : {free} libres, il en faut {n}",
+"customer_paths.not_enough_spare_capacity":"Pas assez de capacité libre : il reste {free} après ton propre trafic et les {hold} % que tu gardes de côté, il en faut {g}",
+"customer_paths.not_enough_spare_channels":"Pas assez de canaux libres : il en reste {free} après les {hold} % que tu gardes pour ton propre trafic, il en faut {n}",
"customer_paths.now_on":"Actuellement sur",
"customer_paths.only_your_own_fiber_rents_pairs":"Seule ta propre fibre peut louer des paires",
"customer_paths.over_the_ms_budget":"Au-delà du budget de {ms} ms",
diff --git a/site/i18n/it.js b/site/i18n/it.js
index 5497bfb..0c57513 100644
--- a/site/i18n/it.js
+++ b/site/i18n/it.js
@@ -1768,9 +1768,12 @@
"customer_paths.name_follows_routing_again":"{name} segue di nuovo il routing.",
"customer_paths.name_moved_to_fiber":"{name} spostato su {fiber}.",
"customer_paths.name_now_rides_path":"{name} ora passa per {path}.",
+"customer_paths.needs_a_g_channel":"Serve un canale acceso a {g} o più",
"customer_paths.no_other_path":"Al momento non c'è un altro percorso funzionante tra {a} e {b}.",
"customer_paths.no_other_working_fiber":"Non c'è un'altra fibra funzionante tra {a} e {b}. Costruiscine una e potrai spostarci questo cliente.",
"customer_paths.not_enough_free_channels":"Canali liberi insufficienti: {free} liberi, ne servono {n}",
+"customer_paths.not_enough_spare_capacity":"Capacità libera insufficiente: restano {free} dopo il tuo traffico e il {hold}% che tieni da parte, ne servono {g}",
+"customer_paths.not_enough_spare_channels":"Canali liberi insufficienti: ne restano {free} dopo il {hold}% che tieni da parte per il tuo traffico, ne servono {n}",
"customer_paths.now_on":"Ora su",
"customer_paths.only_your_own_fiber_rents_pairs":"Solo la tua fibra può affittare coppie",
"customer_paths.over_the_ms_budget":"Oltre il budget di {ms} ms",
diff --git a/site/i18n/pt.js b/site/i18n/pt.js
index 46bb3fc..f915c74 100644
--- a/site/i18n/pt.js
+++ b/site/i18n/pt.js
@@ -1768,9 +1768,12 @@
"customer_paths.name_follows_routing_again":"{name} volta a seguir o roteamento.",
"customer_paths.name_moved_to_fiber":"{name} movido para {fiber}.",
"customer_paths.name_now_rides_path":"{name} agora passa por {path}.",
+"customer_paths.needs_a_g_channel":"Precisa de um canal aceso a {g} ou mais",
"customer_paths.no_other_path":"Agora não há outro caminho funcionando entre {a} e {b}.",
"customer_paths.no_other_working_fiber":"Não há outra fibra funcionando entre {a} e {b}. Construa uma e você poderá mover este cliente para ela.",
"customer_paths.not_enough_free_channels":"Canais livres insuficientes: {free} livres, precisa de {n}",
+"customer_paths.not_enough_spare_capacity":"Capacidade livre insuficiente: sobram {free} depois do seu próprio tráfego e dos {hold}% que você reserva, precisa de {g}",
+"customer_paths.not_enough_spare_channels":"Canais livres insuficientes: sobram {free} depois dos {hold}% que você reserva para o seu próprio tráfego, precisa de {n}",
"customer_paths.now_on":"Agora em",
"customer_paths.only_your_own_fiber_rents_pairs":"Só a sua própria fibra pode alugar pares",
"customer_paths.over_the_ms_budget":"Acima do orçamento de {ms} ms",
diff --git a/src/game/60-features/37-customer-paths.js b/src/game/60-features/37-customer-paths.js
index 8a0510a..e6eb4ae 100644
--- a/src/game/60-features/37-customer-paths.js
+++ b/src/game/60-features/37-customer-paths.js
@@ -8,8 +8,13 @@ const trenchOf=l=>l.kind==='vxc'?'fab:'+l.prov:(l.trench||l.id);
const pathCity=c=>CITY[c].name,pathStr=p=>p.map(pathCity).join(' → ');
const samePair=(l,a,b)=>(l.a===a&&l.b===b)||(l.a===b&&l.b===a);
const fibLab=l=>tr('customer_paths.fiber_label',{name:l.cname?esc(l.cname):capName(l),km:Math.round(l.km).toLocaleString()});
-// Why this fiber cannot take this customer, in the same terms as the offers for it.
-function fiberNo(b,l){if(b.type==='wwave'){const n=b.slots||1,free=freeCh(l);return free>=n?'':tr('customer_paths.not_enough_free_channels',{free:Math.max(0,free),n});}
+// Why this fiber cannot take this customer, in the same terms as the market that sold it: waves only where the broker
+// could sell them, after the share kept back for your own traffic.
+function fiberNo(b,l){const n=b.slots||1,hold=S.cm.hold;
+ if(b.type==='wwave'){const free=freeCh(l),spare=cmSpare(l,'spec');return spare>=n?'':free=n*g?'':tr('customer_paths.not_enough_spare_capacity',{free:fmtCap(free),g:fmtCap(n*g),hold});}
if(!l.own)return tr('customer_paths.only_your_own_fiber_rents_pairs');
if(b.type==='dfpair')return pairFree(l)?'':tr('customer_paths.its_spare_pairs_are_taken');
return S.biz.some(x=>x!==b&&x.link===l.id&&['pairs','capfib','dfpair'].includes(x.type))?tr('customer_paths.its_spare_pairs_are_taken'):'';}
@@ -28,7 +33,10 @@ function pathWalk(G,a,b,cost){const dist={[a]:0},prev={},done=new Set();for(;;){
for(const e of G.N[u]||[]){const v=e.a===u?e.b:e.a,nd=ud+cost(e);if(nd<(dist[v]??Infinity)){dist[v]=nd;prev[v]=u;}}}
if(dist[b]===undefined)return null;const p=[b];while(p[0]!==a)p.unshift(prev[p[0]]);return p;}
const pathHops=(G,p)=>{const o=[];for(let i=1;i!!pathHops(pathEdges(),b.pin);
+// The panels ask for every pinned customer: one graph per routing (a new R), not one per customer.
+let PIN_G=null;
+const pinG=()=>{const c=PIN_G;if(!c||c.R!==R||c.S!==S||c.d!==S.day||c.n!==S.links.length)PIN_G={R,S,d:S.day,n:S.links.length,G:pathEdges()};return PIN_G.G;};
+const pinUp=b=>!!pathHops(pinG(),b.pin);
// Where the circuit runs today. Scenic circuits remember it; the others take the shortest path of their kind.
function pathNow(b,G){if(b.pin&&pathHops(G,b.pin))return b.pin;
const r=R.l2route&&R.l2route[b.id+'>'+b.city+'>'+b.city2];if(r&&r[0]){const p=r[0].ns.slice();if(p[0]!==b.city)p.reverse();if(pathHops(G,p))return p;}
diff --git a/src/game/90-actions/53-customer-paths.js b/src/game/90-actions/53-customer-paths.js
index c362a64..8f723e7 100644
--- a/src/game/90-actions/53-customer-paths.js
+++ b/src/game/90-actions/53-customer-paths.js
@@ -1,10 +1,12 @@
Object.assign(ACT,{
pathOpen:({id})=>{const b=S.biz.find(x=>x.id===id);if(b&&pathKind(b))pathModal(b);},
pathMove:({id,link})=>{const b=S.biz.find(x=>x.id===id),l=b&&pathKind(b)==='fiber'&&fiberTargets(b).find(t=>t.l.id===link&&!t.no);if(!l)return;
- // A carrier already renting waves on that fiber: one contract, as when it orders more there.
- const more=b.type==='wwave'&&S.biz.find(x=>x!==b&&x.type==='wwave'&&x.link===link&&x.name===b.name);
- if(more){more.slots=(more.slots||0)+(b.slots||0);more.rate+=b.rate;more.since=Math.min(more.since??0,b.since??0);more.mood=Math.min(more.mood??100,b.mood??100);more.what=wwWhat(l.l,more.slots);S.biz=S.biz.filter(x=>x!==b);}
- else{b.link=link;if(b.type==='wwave')b.what=wwWhat(l.l,b.slots||1);}
+ // A carrier already renting waves of that kind (and size) on that fiber: one contract, as when it orders more there.
+ const wv=b.type==='wwave'||b.type==='mwave',what=(x,n)=>b.type==='wwave'?wwWhat(l.l,n):cmWhat(l.l,cmWP(x.g),n);
+ const more=wv&&S.biz.find(x=>x!==b&&x.type===b.type&&x.link===link&&x.name===b.name&&x.g===b.g);
+ if(more){more.slots=(more.slots||0)+(b.slots||0);more.rate+=b.rate;more.since=Math.min(more.since??0,b.since??0);more.mood=Math.min(more.mood??100,b.mood??100);more.what=what(more,more.slots);S.biz=S.biz.filter(x=>x!==b);}
+ else{b.link=link;if(wv)b.what=what(b,b.slots||1);}
+ CM_V++; // managed waves come off their fiber's capacity (mwG()), which caches by fiber
closeModal();toast(tr('customer_paths.name_moved_to_fiber',{name:esc(b.name),fiber:fibLab(l.l)}),'good');sfx('build');after();},
pathPin:({id,via})=>{const b=S.biz.find(x=>x.id===id);if(!b||pathKind(b)!=='circuit'||typeof via!=='string')return;const p=via.split(',');
if(p.length<2||p[0]!==b.city||p[p.length-1]!==b.city2||new Set(p).size!==p.length||!pathHops(pathEdges(),p))return;
diff --git a/src/i18n/en.js b/src/i18n/en.js
index 3f82fb1..89e662f 100644
--- a/src/i18n/en.js
+++ b/src/i18n/en.js
@@ -1769,9 +1769,12 @@
"customer_paths.name_follows_routing_again":"{name} follows routing again.",
"customer_paths.name_moved_to_fiber":"{name} moved to {fiber}.",
"customer_paths.name_now_rides_path":"{name} now rides {path}.",
+"customer_paths.needs_a_g_channel":"Needs a channel lit at {g} or more",
"customer_paths.no_other_path":"There is no other working path between {a} and {b} right now.",
"customer_paths.no_other_working_fiber":"There is no other working fiber between {a} and {b}. Build one, and you can move this customer onto it.",
"customer_paths.not_enough_free_channels":"Not enough free channels: {free} free, needs {n}",
+"customer_paths.not_enough_spare_capacity":"Not enough spare capacity: {free} left after your own traffic and the {hold}% you keep back, needs {g}",
+"customer_paths.not_enough_spare_channels":"Not enough spare channels: {free} left after the {hold}% you keep back for your own traffic, needs {n}",
"customer_paths.now_on":"Now on",
"customer_paths.only_your_own_fiber_rents_pairs":"Only your own fiber can rent out pairs",
"customer_paths.over_the_ms_budget":"Over the {ms} ms budget",
diff --git a/tests/customer-paths.test.js b/tests/customer-paths.test.js
index 2b6c3d2..01d5aae 100644
--- a/tests/customer-paths.test.js
+++ b/tests/customer-paths.test.js
@@ -55,6 +55,66 @@ test('a carrier already renting waves on the new fiber ends up with one contract
assert.deepEqual(errors, []);
});
+test('a wave leaves alone the channels kept back for your own traffic', (t) => {
+ // 47 channels lit of 64: 17 free, but a quarter of the fiber is kept back, so 1 spare.
+ const { ev, errors } = game(t, wave + "S.cm.hold=25;S.links.find(l=>l.id==='c').ch=Array(47).fill('zr4');");
+ assert.match(ev("fiberTargets(S.biz[0]).find(x=>x.l.id==='c').no"), /1 left after the 25% you keep back.*needs 2/);
+ ev("ACT.pathMove({id:'w',link:'c'})");
+ assert.equal(biz(ev, 'w', 'link'), 'a', 'refused');
+ ev("S.cm.hold=0;ACT.pathMove({id:'w',link:'c'})");
+ assert.equal(biz(ev, 'w', 'link'), 'c', 'nothing kept back: it fits');
+ assert.deepEqual(errors, []);
+});
+
+// Four managed 400G waves, 1.6T in all, carved out of fiber a's lit capacity.
+const mwave = (id = 'm', link = 'a', g = 400, slots = 4) => `S.biz.push({id:'${id}',type:'mwave',g:${g},name:'Photon Express',city:'nyc',city2:'ash',link:'${link}',slots:${slots},bw:1,rate:5000,reqs:[],mood:80,since:0,day:0,route:'normal',what:'x'});`;
+
+test('managed waves need that much spare lit capacity on the new fiber, on leased fiber too, and their capacity moves with them', (t) => {
+ // c has 1.6T lit, but a quarter is kept back: 1.2T spare, room for three of the four. b has 3.2T: 2.4T spare.
+ const { ev, errors } = game(t, mwave() + "S.cm.hold=25;S.links.find(l=>l.id==='c').ch=Array(4).fill('zr4');");
+ const no = () => JSON.parse(ev("JSON.stringify(Object.fromEntries(fiberTargets(S.biz[0]).map(x=>[x.l.id,x.no])))"));
+ assert.match(no().c, /Not enough spare capacity/);
+ assert.equal(no().b, '');
+ ev("ACT.pathMove({id:'m',link:'c'})");
+ assert.equal(biz(ev, 'm', 'link'), 'a', '1.6T does not fit in 1.2T');
+ // A leased fiber is lit capacity like any other: the reason is the room, not whose glass it is.
+ ev("S.links.find(l=>l.id==='b').own=false;S.links.find(l=>l.id==='c').own=false;");
+ assert.equal(no().b, '');
+ assert.doesNotMatch(no().c, /own fiber/);
+ assert.match(no().c, /spare capacity/);
+ // What the fiber gives your own traffic follows the waves, at once.
+ assert.equal(ev("mwG(S.links.find(l=>l.id==='a'))"), 1600);
+ ev("ACT.pathMove({id:'m',link:'b'})");
+ assert.equal(biz(ev, 'm', 'link'), 'b');
+ assert.equal(ev("mwG(S.links.find(l=>l.id==='a'))"), 0);
+ assert.equal(ev("mwG(S.links.find(l=>l.id==='b'))"), 1600);
+ assert.equal(ev("dfCap0(S.links.find(l=>l.id==='a'))"), 3200);
+ assert.equal(ev("dfCap0(S.links.find(l=>l.id==='b'))"), 1600);
+ assert.match(biz(ev, 'm', 'what'), /4/);
+ assert.deepEqual(errors, []);
+});
+
+test('a managed wave needs a channel as big as it is; a carrier renting the same size there gets one contract, another size does not', (t) => {
+ { const { ev, errors } = game(t, mwave('m', 'a', 800, 1) + "S.cm.hold=0;");
+ assert.match(ev("fiberTargets(S.biz[0]).find(x=>x.l.id==='c').no"), /Needs a channel lit at/, '400G optics only');
+ ev("S.links.find(l=>l.id==='c').ch=Array(8).fill('zr8');");
+ assert.equal(ev("fiberTargets(S.biz[0]).find(x=>x.l.id==='c').no"), '');
+ assert.deepEqual(errors, []); }
+ { const { ev, errors } = game(t, mwave() + mwave('m2', 'b', 100, 2) + "S.cm.hold=0;");
+ ev("ACT.pathMove({id:'m',link:'b'})");
+ assert.equal(ev("S.biz.filter(b=>b.type==='mwave'&&b.link==='b').length"), 2, '400G and 100G waves stay apart');
+ assert.equal(biz(ev, 'm2', 'slots'), 2);
+ assert.equal(ev("mwG(S.links.find(l=>l.id==='b'))"), 1800);
+ assert.deepEqual(errors, []); }
+ { const { ev, errors } = game(t, mwave() + mwave('m2', 'b', 400, 2) + "S.cm.hold=0;");
+ ev("ACT.pathMove({id:'m',link:'b'})");
+ assert.equal(ev("S.biz.filter(b=>b.type==='mwave').length"), 1);
+ assert.equal(biz(ev, 'm2', 'slots'), 6); assert.equal(biz(ev, 'm2', 'rate'), 10000); assert.equal(biz(ev, 'm2', 'g'), 400);
+ assert.match(biz(ev, 'm2', 'what'), /6/);
+ assert.equal(ev("mwG(S.links.find(l=>l.id==='b'))"), 2400);
+ assert.deepEqual(errors, []); }
+});
+
test('fiber pairs follow the same rules as signing them: your own fiber, and pairs still free', (t) => {
for (const type of ['dfpair', 'pairs', 'capfib']) {
const { ev, errors } = game(t, pair(type) + pair('pairs', 'q', 'b') + "S.links.find(l=>l.id==='e').x=1;");