maxpool 1.24.45 → 1.24.47
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/package.json +1 -1
- package/src/server.js +6 -2
- package/src/tui.js +9 -1
package/package.json
CHANGED
package/src/server.js
CHANGED
|
@@ -788,9 +788,13 @@ async function forwardRequest(
|
|
|
788
788
|
};
|
|
789
789
|
try {
|
|
790
790
|
// P4a: a blackholed link must not hang the request (and hold a lease) for
|
|
791
|
-
// minutes — bound time-to-headers like the direct path's TTFB guard.
|
|
791
|
+
// minutes — bound time-to-headers like the direct path's TTFB guard. GLM
|
|
792
|
+
// thinking turns regularly sit silent 20-60s before headers, so the link
|
|
793
|
+
// TTFB must match the direct path's UPSTREAM_TTFB_MS (120s default), not a
|
|
794
|
+
// flat 15s (owner report 2026-10-30: every pinned GLM turn 502-aborted).
|
|
795
|
+
const linkTtfbMs = Math.max(15_000, Number(process.env.MAXPOOL_LINK_TTFB_MS) || UPSTREAM_TTFB_MS);
|
|
792
796
|
const linkCtl = new AbortController();
|
|
793
|
-
const linkTtfb = setTimeout(() => linkCtl.abort(),
|
|
797
|
+
const linkTtfb = setTimeout(() => linkCtl.abort(), linkTtfbMs);
|
|
794
798
|
res.once('close', () => linkCtl.abort());
|
|
795
799
|
let upRes;
|
|
796
800
|
try {
|
package/src/tui.js
CHANGED
|
@@ -1344,7 +1344,11 @@ export class TUI {
|
|
|
1344
1344
|
familyFirstSeen.get(fam).push(idx);
|
|
1345
1345
|
}
|
|
1346
1346
|
const provGrouped = [...familyFirstSeen.values()].flat();
|
|
1347
|
-
|
|
1347
|
+
// Owner 2026-10-29: Where is the PRIMARY grouping — local rows first, cloud rows
|
|
1348
|
+
// after — and the existing ordering (providers grouped by family, OAuth as-added)
|
|
1349
|
+
// stays intact WITHIN each group.
|
|
1350
|
+
const all = [...nonProv, ...provGrouped];
|
|
1351
|
+
return [...all.filter(i => !this.am.accounts[i].remote), ...all.filter(i => this.am.accounts[i].remote)];
|
|
1348
1352
|
}
|
|
1349
1353
|
|
|
1350
1354
|
_selectableIndexes(action) {
|
|
@@ -2036,6 +2040,10 @@ export class TUI {
|
|
|
2036
2040
|
let hidden = 0;
|
|
2037
2041
|
for (const i of this._displayOrder()) {
|
|
2038
2042
|
if (this.hideDisabled && this.am.accounts[i]?.enabled === false) { hidden++; continue; }
|
|
2043
|
+
// Same key also hides local copies guarded by the duplicate guard — they are
|
|
2044
|
+
// effectively off (owner 2026-10-29: "should it hide the local ones that are
|
|
2045
|
+
// in the cloud... they're effectively disabled as well"). No separate key.
|
|
2046
|
+
if (this.hideDisabled && this.am.accounts[i]?.poolBenchedBy) { hidden++; continue; }
|
|
2039
2047
|
// The legacy single team-pool row is superseded by per-account cloud rows.
|
|
2040
2048
|
if (this.am.accounts[i]?.type === 'pool') continue;
|
|
2041
2049
|
lines.push(this._renderAcct(i, bw, showBoth));
|