instar 1.3.272 → 1.3.274

package/dist/commands/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/commands/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AA4SH,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAqxDD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAi/QtE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDzE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5E"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/commands/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AA4SH,UAAU,YAAY;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;2DACuD;IACvD,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAqxDD,wBAAsB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAgjRtE;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDzE;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5E"}

package/dist/commands/server.js

@@ -8640,6 +8640,27 @@ export async function startServer(options) {
             // child (CPU-flat) from a working one, so an idle MCP child no longer
             // holds an otherwise-reapable session hostage under host load.
             descendantCpuSeconds: (s) => sessionManager.descendantCpuSeconds(s),
+            // Post-transfer closeout (2026-06-05): the OTHER machine that owns this
+            // topic per the session-pool ownership registry, as a display identifier
+            // (nickname when resolvable). Late-binds the pool objects — they are
+            // constructed AFTER the reaper in this function; until the mesh block
+            // wires them (and on single-machine installs forever) this returns null
+            // and the rule is inert. try/catch also absorbs the TDZ window.
+            topicOwnerElsewhere: (topicId) => {
+                try {
+                    const reg = sessionOwnershipRegistry;
+                    const self = _meshSelfId;
+                    if (!reg || !self)
+                        return null;
+                    const owner = reg.ownerOf(String(topicId));
+                    if (!owner || owner === self)
+                        return null;
+                    return machinePoolRegistry?.getCapacity(owner)?.nickname ?? owner;
+                }
+                catch {
+                    return null; /* @silent-fallback-ok — pool not wired yet → rule inert */
+                }
+            },
             audit: reaperAuditSink(config.stateDir),
         }, 
         // developmentAgent gate (standard_development_agent_dark_feature_gate):
@@ -9039,12 +9060,39 @@ export async function startServer(options) {
                         poolIdMgr.recordSelfHardware(poolSelfId, poolMod.captureHardware());
                     }
                     catch { /* best-effort hardware self-attest */ }
+                    // Quota-aware placement (2026-06-05): self-report whether a NEW
+                    // session on THIS machine could work right now. Blocked = a provider
+                    // block is in effect (blockedUntil in the future) or the 5-hour
+                    // window is exhausted (>= 95%, the same bar QuotaTracker.canRunJob
+                    // uses to block all spawns). Sourced from THIS machine's own
+                    // QuotaTracker — never another machine's file (the gemini
+                    // quota-conflation lesson). Absent/unreadable state = not blocked.
+                    const selfQuotaState = () => {
+                        try {
+                            const q = quotaTracker?.getState();
+                            if (!q)
+                                return undefined;
+                            const blockActive = !!q.blockedUntil && Date.parse(q.blockedUntil) > Date.now();
+                            const fiveHourExhausted = (q.fiveHourPercent ?? 0) >= 95;
+                            if (!blockActive && !fiveHourExhausted)
+                                return { blocked: false };
+                            return {
+                                blocked: true,
+                                blockedUntil: q.blockedUntil,
+                                reason: q.blockReason ?? (fiveHourExhausted ? `5-hour window at ${q.fiveHourPercent}%` : 'provider block'),
+                            };
+                        }
+                        catch {
+                            return undefined; /* unknown ≠ blocked */
+                        }
+                    };
                     const refreshPool = () => {
                         try {
                             machinePoolRegistry.recordHeartbeat({
                                 machineId: poolSelfId,
                                 selfReportedLastSeen: new Date().toISOString(),
                                 loadAvg: osMod.loadavg()[0],
+                                quotaState: selfQuotaState(),
                             });
                             const hbApi = machineHeartbeat?.api;
                             if (hbApi) {
@@ -9626,6 +9674,28 @@ export async function startServer(options) {
                                 }
                             }
                             catch { /* best-effort; route() re-places regardless once the owner is cleared */ }
+                            // ── Post-transfer closeout, immediate half (2026-06-05) ───────
+                            // The user's explicit move means this machine's topic session is
+                            // now a leftover — left running it does duplicate work alongside
+                            // the target machine's session. Close it NOW (origin 'operator':
+                            // this executes the user's direct command, arrived through the
+                            // authed Telegram pipeline; disposition 'recovery-bounce' keeps
+                            // the §P3 notifier silent — the user already got the "Moving…"
+                            // reply, and the conversation continues on the target). Protected
+                            // sessions are never auto-closed (skipped here AND vetoed in the
+                            // reaper sweeper that backstops non-explicit move paths).
+                            if (plan.action === 'transfer' && target !== meshSelfId) {
+                                try {
+                                    const tmuxName = telegram?.getSessionForTopic(topicId);
+                                    const rec = tmuxName ? sessionManager.listRunningSessions().find((s) => s.tmuxSession === tmuxName) : undefined;
+                                    if (rec && !sessionManager.getProtectedSessions().includes(rec.tmuxSession)) {
+                                        void sessionManager.terminateSession(rec.id, `topic ${topicId} moved to ${cmd.nickname} (user-commanded transfer) — closing the leftover local session`, { origin: 'operator', disposition: 'recovery-bounce' }).then((r) => {
+                                            console.log(pc.dim(`  [session-pool] post-transfer closeout: ${rec.tmuxSession} → ${r.terminated ? 'closed' : `skipped (${r.skipped})`}`));
+                                        });
+                                    }
+                                }
+                                catch { /* @silent-fallback-ok — the reaper's topic-moved sweeper backstops this */ }
+                            }
                             await telegram?.sendToTopic(topicId, plan.action === 'noop'
                                 ? (plan.detail === 'already-on-target'
                                     ? `This conversation is already running on ${cmd.nickname} — nothing to move.`