@rynfar/meridian 1.65.2 → 1.66.0

package/README.md

@@ -118,9 +118,15 @@ Prime Agent is reliable through Meridian with one active agent. RLM children hav
 separate session identities and can execute successfully, but concurrent subagent
 orchestration is not yet production-safe. Observed failure modes include overload
 amplification, expensive cache churn after fresh-session replay, loss of child-task
-context during recovery, undelivered tool envelopes, and incomplete parent-to-child
-cancellation. Use a single active Prime Agent for unattended or usage-sensitive work
-until coordinated fixes land in Prime Agent and Meridian.
+context during recovery, and undelivered tool envelopes. Use a single active Prime
+Agent for unattended or usage-sensitive work until coordinated fixes land in Prime
+Agent and Meridian.
+
+Parent-to-child cancellation is handled on the Meridian side: when the extension
+stamps `parent_session_id` alongside the child's session id, aborting a parent's
+in-flight request aborts every live request in the subtree below it and evicts
+each one's session mapping. See
+[Subagent cancellation](docs/agents.md#prime-agent).
 
 Prime Agent can keep Opus on the root session while selecting Sol for an individual
 child. A child inherits its parent's model unless the `rlm` call supplies an exact

package/dist/{cli-pdpry6q0.js → cli-5jxyma6z.js}

@@ -147,13 +147,16 @@ function cooldownCapMs(type) {
   return COOLDOWN_CAP_MS[type];
 }
 function resolveCooldownUntil(windows, now, defaultMs) {
+  return findCooldownReset(windows, now) ?? now + defaultMs;
+}
+function findCooldownReset(windows, now) {
   for (const type of COOLDOWN_WINDOWS) {
     const match = windows.find((w) => w.type === type && w.exhausted && (w.resetsAt ?? 0) > now);
     if (match?.resetsAt) {
       return Math.min(match.resetsAt, now + cooldownCapMs(type));
     }
   }
-  return now + defaultMs;
+  return null;
 }
 
 // src/proxy/profiles.ts
@@ -271,4 +274,4 @@ function listProfiles(profiles, defaultProfile) {
   }));
 }
 
-export { getRoutingMode, getPriorityFailbackPolicy, shouldPromotePriorityAssignment, resolvePriorityOrder, choosePriorityProfile, ProfileExhaustion, AssignmentStore, resolveCooldownUntil, loadProfilesFromDisk, setActiveProfile, getActiveProfileId, resetActiveProfile, restoreActiveProfile, enableDiskProfileDiscovery, getEffectiveProfiles, hasProfiles, resolveProfile, listProfiles };
+export { getRoutingMode, getPriorityFailbackPolicy, shouldPromotePriorityAssignment, resolvePriorityOrder, choosePriorityProfile, ProfileExhaustion, AssignmentStore, resolveCooldownUntil, findCooldownReset, loadProfilesFromDisk, setActiveProfile, getActiveProfileId, resetActiveProfile, restoreActiveProfile, enableDiskProfileDiscovery, getEffectiveProfiles, hasProfiles, resolveProfile, listProfiles };

package/dist/{cli-0ed6j0vk.js → cli-m9wqgk1q.js}

@@ -92,7 +92,7 @@ function supports1mContext(model) {
     return false;
   return true;
 }
-function mapModelToClaudeModel(model, subscriptionType, agentMode, profileId) {
+function mapModelToClaudeModel(model, subscriptionType, agentMode, profileId, sessionKey) {
   if (model.includes("haiku"))
     return "haiku";
   const use1m = supports1mContext(model);
@@ -105,7 +105,7 @@ function mapModelToClaudeModel(model, subscriptionType, agentMode, profileId) {
     if (fableOverrideRaw && fableOverride !== "fable[1m]") {
       warnUnrecognizedTierOverride("FABLE_MODEL", fableOverrideRaw, "fable");
     }
-    if (use1m && !isSubagent && !isExtendedContextKnownUnavailable(profileId))
+    if (use1m && !isSubagent && !isExtendedContextKnownUnavailable(profileId, sessionKey))
       return "fable[1m]";
     return "fable";
   }
@@ -117,13 +117,13 @@ function mapModelToClaudeModel(model, subscriptionType, agentMode, profileId) {
     if (opusOverrideRaw && opusOverride !== "opus[1m]") {
       warnUnrecognizedTierOverride("OPUS_MODEL", opusOverrideRaw, "opus");
     }
-    if (use1m && !isSubagent && !isExtendedContextKnownUnavailable(profileId))
+    if (use1m && !isSubagent && !isExtendedContextKnownUnavailable(profileId, sessionKey))
       return "opus[1m]";
     return "opus";
   }
   const sonnetOverride = process.env.MERIDIAN_SONNET_MODEL ?? process.env.CLAUDE_PROXY_SONNET_MODEL;
   if (sonnetOverride === "sonnet[1m]") {
-    if (!use1m || isSubagent || isExtendedContextKnownUnavailable(profileId))
+    if (!use1m || isSubagent || isExtendedContextKnownUnavailable(profileId, sessionKey))
       return "sonnet";
     return "sonnet[1m]";
   }
@@ -131,33 +131,67 @@ function mapModelToClaudeModel(model, subscriptionType, agentMode, profileId) {
 }
 var EXTRA_USAGE_RETRY_MS = 60 * 60 * 1000;
 var DEFAULT_BENCH_KEY = "__default__";
+var BENCH_MAX_ENTRIES = 5000;
 var extendedContextBenchedUntil = new Map;
-function benchExtendedContext(profileId, until) {
-  if (until <= Date.now())
+function profileBenchKey(profileId) {
+  return profileId || DEFAULT_BENCH_KEY;
+}
+function sessionBenchKey(profileId, sessionKey) {
+  return `${profileBenchKey(profileId)}\x00session:${sessionKey}`;
+}
+function pruneBenchEntries(now) {
+  if (extendedContextBenchedUntil.size < BENCH_MAX_ENTRIES)
+    return;
+  for (const [key, until] of extendedContextBenchedUntil) {
+    if (until <= now)
+      extendedContextBenchedUntil.delete(key);
+  }
+  while (extendedContextBenchedUntil.size >= BENCH_MAX_ENTRIES) {
+    let soonestKey;
+    let soonest = Infinity;
+    for (const [key, until] of extendedContextBenchedUntil) {
+      if (until < soonest) {
+        soonest = until;
+        soonestKey = key;
+      }
+    }
+    if (soonestKey === undefined)
+      return;
+    extendedContextBenchedUntil.delete(soonestKey);
+  }
+}
+function benchExtendedContext(key, until) {
+  const now = Date.now();
+  if (until <= now)
     return;
-  const key = profileId || DEFAULT_BENCH_KEY;
   const existing = extendedContextBenchedUntil.get(key);
   if (existing !== undefined && existing >= until)
     return;
+  pruneBenchEntries(now);
   extendedContextBenchedUntil.set(key, until);
 }
-function recordExtendedContextUnavailable(profileId) {
-  benchExtendedContext(profileId, Date.now() + EXTRA_USAGE_RETRY_MS);
-}
-function recordExtendedContextRateLimited(profileId, until) {
-  benchExtendedContext(profileId, until);
-}
-function isExtendedContextKnownUnavailable(profileId) {
-  const key = profileId || DEFAULT_BENCH_KEY;
+function benchActive(key, now) {
   const until = extendedContextBenchedUntil.get(key);
   if (until === undefined)
     return false;
-  if (until <= Date.now()) {
+  if (until <= now) {
     extendedContextBenchedUntil.delete(key);
     return false;
   }
   return true;
 }
+function recordExtendedContextUnavailable(profileId) {
+  benchExtendedContext(profileBenchKey(profileId), Date.now() + EXTRA_USAGE_RETRY_MS);
+}
+function recordExtendedContextRateLimited(profileId, until, sessionKey) {
+  benchExtendedContext(sessionKey ? sessionBenchKey(profileId, sessionKey) : profileBenchKey(profileId), until);
+}
+function isExtendedContextKnownUnavailable(profileId, sessionKey) {
+  const now = Date.now();
+  if (benchActive(profileBenchKey(profileId), now))
+    return true;
+  return sessionKey ? benchActive(sessionBenchKey(profileId, sessionKey), now) : false;
+}
 function stripExtendedContext(model) {
   if (model === "opus[1m]")
     return "opus";