sisyphi 1.2.24 → 1.2.25

package/dist/daemon.js

@@ -11238,13 +11238,22 @@ var Compositor = class {
 
 // src/daemon/segments/sessions.ts
 function orderSessions(sessions, order) {
-  if (order.length === 0) return [...sessions].sort();
-  const orderMap = new Map(order.map((name, idx) => [name, idx]));
+  const dividerIdx = order.indexOf("---");
+  const front = dividerIdx === -1 ? order : order.slice(0, dividerIdx);
+  const back = dividerIdx === -1 ? [] : order.slice(dividerIdx + 1);
+  const frontMap = new Map(front.map((name, idx) => [name, idx]));
+  const backMap = new Map(back.map((name, idx) => [name, idx]));
+  const rank = (name) => {
+    if (frontMap.has(name)) return { bucket: 0, idx: frontMap.get(name) };
+    if (backMap.has(name)) return { bucket: 2, idx: backMap.get(name) };
+    return { bucket: 1, idx: 0 };
+  };
   return [...sessions].sort((a, b) => {
-    const aIdx = orderMap.get(a) ?? Infinity;
-    const bIdx = orderMap.get(b) ?? Infinity;
-    if (aIdx !== bIdx) return aIdx - bIdx;
-    return a.localeCompare(b);
+    const ra = rank(a);
+    const rb = rank(b);
+    if (ra.bucket !== rb.bucket) return ra.bucket - rb.bucket;
+    if (ra.bucket === 1) return a.localeCompare(b);
+    return ra.idx - rb.idx;
   });
 }
 function renderNormalSession(name, color, activeBg, activeText, inactiveText, sectionBg, isActive) {