@mrrlin-dev/mcp 0.4.67 → 0.4.71

package/dist/bin.cjs

@@ -37201,22 +37201,35 @@ var openApiOperationIds = {
 };
 
 // ../../packages/schemas/dist/session.js
+var sessionEmailSchema = external_exports.string().email();
 var operatorSessionSchema = external_exports.object({
-  emails: external_exports.array(external_exports.string().email()).default([]),
+  emails: external_exports.array(sessionEmailSchema).default([]),
   expiresAt: external_exports.number().int().positive(),
   handle: external_exports.string().regex(/^@.+/),
   issuedAt: external_exports.number().int().positive(),
   kind: external_exports.enum(["web", "agent"]).default("web"),
   login: external_exports.string().min(1),
   projectSlug: external_exports.string().min(1).optional(),
-  provider: external_exports.literal("github"),
+  provider: external_exports.enum(["github", "firebase"]),
   repo: external_exports.string().min(1).nullable(),
   // ADR 0016: `scope` distinguishes project-pinned agent tokens (legacy, default) from
   // operator-scoped agent tokens. Only relevant for kind:"agent". `web` sessions ignore it.
   // Default 'project' for backward-compat: tokens minted before this field existed parse
   // cleanly into the project branch of the middleware (which mirrors today's behavior).
-  scope: external_exports.enum(["project", "operator"]).default("project")
+  scope: external_exports.enum(["project", "operator"]).default("project"),
+  // Billing entitlement carried on the session. Optional because a GitHub session never has one
+  // and a Firebase session has one only once the claims exist. `determinedAt` is what makes it
+  // falsifiable: the token lives for 7 days, so a value that can go stale needs a freshness bound
+  // enforced by the reader (readEffectivePlan), not by the cookie.
+  entitlement: external_exports.object({
+    plan: external_exports.string(),
+    status: external_exports.enum(["active", "none"]),
+    determinedAt: external_exports.number()
+  }).optional()
 });
+var WEB_SESSION_TTL_MS = 1e3 * 60 * 60 * 24 * 7;
+var WEB_SESSION_TTL_SECONDS = WEB_SESSION_TTL_MS / 1e3;
+var ENTITLEMENT_FRESHNESS_MS = 1e3 * 60 * 60;
 var AGENT_SESSION_TTL_MS = 1e3 * 60 * 15;
 
 // ../../packages/schemas/dist/github-state.js
@@ -37295,7 +37308,10 @@ var agentPoolResponseSchema = external_exports.object({
 });
 var agentCapabilitiesSchema = external_exports.object({
   listsModels: external_exports.boolean(),
-  readsRateLimits: external_exports.boolean(),
+  // claude-rate-limit-percent design.md D1/D2 — split from a single `readsRateLimits`, which
+  // conflated "has a quota pull RPC" with "turn stream pushes a renderable numeric snapshot".
+  pullsRateLimits: external_exports.boolean(),
+  pushesRateLimits: external_exports.boolean(),
   models: external_exports.array(external_exports.string()),
   // Picker entries for a provider that has no model-listing RPC (`listsModels: false`): the alias
   // the CLI accepts as `id`, a human label carrying the version the alias resolves to, and that
@@ -37307,7 +37323,8 @@ var agentCapabilitiesSchema = external_exports.object({
 var AGENT_CAPABILITIES = {
   codex: {
     listsModels: true,
-    readsRateLimits: true,
+    pullsRateLimits: true,
+    pushesRateLimits: true,
     models: [],
     modelCatalog: [],
     sandboxModes: ["read-only", "workspace-write", "danger-full-access"],
@@ -37315,7 +37332,8 @@ var AGENT_CAPABILITIES = {
   },
   claude: {
     listsModels: false,
-    readsRateLimits: false,
+    pullsRateLimits: false,
+    pushesRateLimits: true,
     // Aliases the Claude CLI documents for `--model` (`claude --help`), and what each resolved to
     // on 2026-09-04 per the CLI's own `system.init.model` frame. Keep in step with
     // packages/agent-client/src/providers/claude/models.ts — the parity test enforces equality.
@@ -37331,7 +37349,8 @@ var AGENT_CAPABILITIES = {
   },
   agy: {
     listsModels: true,
-    readsRateLimits: false,
+    pullsRateLimits: false,
+    pushesRateLimits: false,
     models: [
       "gemini-3.8-flash-high",
       "gemini-3.8-flash-medium",
@@ -39950,7 +39969,8 @@ var CodexProviderAdapter = class {
   capabilities() {
     return {
       listsModels: true,
-      readsRateLimits: true,
+      pullsRateLimits: true,
+      pushesRateLimits: true,
       models: [],
       modelCatalog: [],
       sandboxModes: ["read-only", "workspace-write", "danger-full-access"],
@@ -40337,7 +40357,8 @@ var ClaudeProviderAdapter = class {
   capabilities() {
     return {
       listsModels: false,
-      readsRateLimits: false,
+      pullsRateLimits: false,
+      pushesRateLimits: true,
       models: [...CLAUDE_MODELS],
       modelCatalog: claudeModelCatalog(),
       // The neutral 3-value vocabulary every startThread/startTurn caller speaks; permissionModeFor
@@ -40779,10 +40800,8 @@ function parseAgyModelsOutput(output3) {
     if (/^(Fetching|Warning|Error)/i.test(line))
       continue;
     const parts = line.split(/\t+|\s{2,}/).map((p) => p.trim()).filter(Boolean);
-    if (parts.length < 1)
-      continue;
     const id = parts[0];
-    if (!MODEL_ID_REGEX2.test(id)) {
+    if (!id || !MODEL_ID_REGEX2.test(id)) {
       console.warn(`[agy:models] skipping malformed model id: ${id}`);
       continue;
     }
@@ -41269,40 +41288,45 @@ function runAgentExec(input, deps, persistedProvider) {
 }
 
 // ../../packages/agent-client/dist/resolved-seat.js
-var CODEX_STRONG_MODEL_CONSTANT = "gpt-5.6-terra";
-var CLAUDE_STRONG_MODEL_CONSTANT = "sonnet";
-var AGY_STRONG_MODEL_CONSTANT = "gemini-3.1-pro-high";
-var CODEX_WEAK_MODEL_CONSTANT = "codex-gpt-5.4-mini";
-var CLAUDE_WEAK_MODEL_CONSTANT = "haiku";
-var AGY_WEAK_MODEL_CONSTANT = "gemini-3.6-flash-low";
+var CODEX_DEFAULT_MODEL_CONSTANT = "gpt-5.6-terra";
+var CLAUDE_DEFAULT_MODEL_CONSTANT = "sonnet";
+var AGY_DEFAULT_MODEL_CONSTANT = "gemini-3.1-pro-high";
+var CODEX_DEFAULT_MODEL_ENV = "MRRLIN_CODEX_DEFAULT_MODEL";
 var CODEX_STRONG_MODEL_ENV = "MRRLIN_CODEX_STRONG_MODEL";
+var CLAUDE_DEFAULT_MODEL_ENV = "MRRLIN_CLAUDE_DEFAULT_MODEL";
 var CLAUDE_STRONG_MODEL_ENV = "MRRLIN_CLAUDE_STRONG_MODEL";
+var AGY_DEFAULT_MODEL_ENV = "MRRLIN_AGY_DEFAULT_MODEL";
 var AGY_STRONG_MODEL_ENV = "MRRLIN_AGY_STRONG_MODEL";
-function strongConstantFor(providerId) {
+var CODEX_WEAK_MODEL_ENV = "MRRLIN_CODEX_WEAK_MODEL";
+var CLAUDE_WEAK_MODEL_ENV = "MRRLIN_CLAUDE_WEAK_MODEL";
+var AGY_WEAK_MODEL_ENV = "MRRLIN_AGY_WEAK_MODEL";
+function weakEnvVarFor(providerId) {
   if (providerId === "codex")
-    return CODEX_STRONG_MODEL_CONSTANT;
+    return CODEX_WEAK_MODEL_ENV;
   if (providerId === "claude")
-    return CLAUDE_STRONG_MODEL_CONSTANT;
-  return AGY_STRONG_MODEL_CONSTANT;
+    return CLAUDE_WEAK_MODEL_ENV;
+  return AGY_WEAK_MODEL_ENV;
 }
-function weakConstantFor(providerId) {
+function defaultConstantFor(providerId) {
   if (providerId === "codex")
-    return CODEX_WEAK_MODEL_CONSTANT;
+    return CODEX_DEFAULT_MODEL_CONSTANT;
   if (providerId === "claude")
-    return CLAUDE_WEAK_MODEL_CONSTANT;
-  return AGY_WEAK_MODEL_CONSTANT;
+    return CLAUDE_DEFAULT_MODEL_CONSTANT;
+  return AGY_DEFAULT_MODEL_CONSTANT;
 }
-function strongEnvVarFor(providerId) {
-  if (providerId === "codex")
-    return CODEX_STRONG_MODEL_ENV;
-  if (providerId === "claude")
-    return CLAUDE_STRONG_MODEL_ENV;
-  return AGY_STRONG_MODEL_ENV;
+function readModelEnv(providerId) {
+  if (providerId === "codex") {
+    return process.env[CODEX_DEFAULT_MODEL_ENV]?.trim() || process.env[CODEX_STRONG_MODEL_ENV]?.trim();
+  }
+  if (providerId === "claude") {
+    return process.env[CLAUDE_DEFAULT_MODEL_ENV]?.trim() || process.env[CLAUDE_STRONG_MODEL_ENV]?.trim();
+  }
+  return process.env[AGY_DEFAULT_MODEL_ENV]?.trim() || process.env[AGY_STRONG_MODEL_ENV]?.trim();
 }
 function logFallback(providerId, tier, source, value) {
   console.error(`[resolved-seat] provider=${providerId} ${tier}=${value} (source: ${source})`);
 }
-function pickStrongModelFromList(models) {
+function pickDefaultModelFromList(models) {
   const defaultModel = models.find((m) => m.isDefault === true);
   if (defaultModel)
     return defaultModel.id;
@@ -41311,96 +41335,66 @@ function pickStrongModelFromList(models) {
     return nonHidden.id;
   return models[0]?.id ?? null;
 }
-function pickWeakModelFromList(models, strongModel) {
-  const preferredWeak = models.find((m) => {
-    const id = m.id.toLowerCase();
-    if (id === strongModel.toLowerCase())
-      return false;
-    return /(^|[-_])(mini|weak|small)([-_]|$)/i.test(id) || id.includes("flash-low") || /(^|[-_])flash([-_]|$)/i.test(id);
-  });
-  if (preferredWeak)
-    return preferredWeak.id;
-  const fallbackLow = models.find((m) => {
-    const id = m.id.toLowerCase();
-    if (id === strongModel.toLowerCase())
-      return false;
-    return /(^|[-_])low([-_]|$)/i.test(id);
-  });
-  if (fallbackLow)
-    return fallbackLow.id;
-  return null;
-}
+var warnedEnvVars = /* @__PURE__ */ new Set();
 async function mintResolvedSeat(provider, opts) {
   const capabilities = provider.capabilities();
   const providerId = provider.id;
-  let strongModel;
-  let weakModel;
+  let model;
   let pinRetired;
   let retiredPin;
-  const strongEnvVar = strongEnvVarFor(providerId);
-  const strongEnvValue = process.env[strongEnvVar]?.trim();
+  const weakEnvVar = weakEnvVarFor(providerId);
+  if (process.env[weakEnvVar] && !warnedEnvVars.has(weakEnvVar)) {
+    warnedEnvVars.add(weakEnvVar);
+    console.warn(`[resolved-seat] ${weakEnvVar} is deprecated; weak model tier has been unified into default model`);
+  }
+  const envValue = readModelEnv(providerId);
   if (opts?.handle && capabilities.listsModels) {
     try {
       const models = await opts.handle.listModels();
-      if (strongEnvValue && models.some((m) => m.id === strongEnvValue)) {
-        strongModel = strongEnvValue;
-        logFallback(providerId, "strong", "env", strongModel);
+      if (models.length === 0) {
+        throw new Error("empty model list");
+      }
+      if (envValue && models.some((m) => m.id === envValue)) {
+        model = envValue;
+        logFallback(providerId, "default", "env", model);
       } else {
-        const picked = pickStrongModelFromList(models);
+        const picked = pickDefaultModelFromList(models);
         if (picked) {
-          strongModel = picked;
-          if (strongEnvValue) {
-            logFallback(providerId, "strong", "live-default (env pin retired)", strongModel);
+          model = picked;
+          if (envValue) {
+            logFallback(providerId, "default", "live-default (env pin retired)", model);
             pinRetired = true;
-            retiredPin = strongEnvValue;
+            retiredPin = envValue;
           }
         } else {
           throw new Error("empty model list");
         }
       }
     } catch {
-      if (strongEnvValue) {
-        strongModel = strongEnvValue;
-        logFallback(providerId, "strong", "env", strongModel);
+      if (envValue) {
+        model = envValue;
+        logFallback(providerId, "default", "env", model);
       } else {
-        strongModel = strongConstantFor(providerId);
-        logFallback(providerId, "strong", "constant", strongModel);
+        model = defaultConstantFor(providerId);
+        logFallback(providerId, "default", "constant", model);
       }
     }
-  } else if (strongEnvValue) {
-    strongModel = strongEnvValue;
-    logFallback(providerId, "strong", "env", strongModel);
+  } else if (envValue) {
+    model = envValue;
+    logFallback(providerId, "default", "env", model);
   } else {
-    strongModel = strongConstantFor(providerId);
-    logFallback(providerId, "strong", "constant", strongModel);
-  }
-  if (providerId === "claude") {
-    weakModel = CLAUDE_WEAK_MODEL_CONSTANT;
-    logFallback(providerId, "weak", "constant", weakModel);
-  } else {
-    if (opts?.handle && capabilities.listsModels) {
-      try {
-        const models = await opts.handle.listModels();
-        const picked = pickWeakModelFromList(models, strongModel);
-        if (picked) {
-          weakModel = picked;
-        } else {
-          weakModel = strongModel;
-          logFallback(providerId, "weak", "degenerate (weak=strong)", weakModel);
-        }
-      } catch {
-        weakModel = weakConstantFor(providerId);
-        logFallback(providerId, "weak", "constant", weakModel);
-      }
-    } else {
-      weakModel = weakConstantFor(providerId);
-      logFallback(providerId, "weak", "constant", weakModel);
-    }
+    model = defaultConstantFor(providerId);
+    logFallback(providerId, "default", "constant", model);
   }
   return {
     id: providerId,
     capabilities,
-    models: { strong: strongModel, weak: weakModel },
+    model,
+    models: {
+      strong: model,
+      weak: model,
+      default: model
+    },
     ...pinRetired ? { pinRetired: true, retiredPin } : {}
   };
 }
@@ -43467,7 +43461,7 @@ Do NOT derail the current task - if the operator has an in-flight question, answ
 }
 
 // src/_generated/version.ts
-var PKG_VERSION = "0.4.67";
+var PKG_VERSION = "0.4.71";
 
 // src/api-base-url-migrate.ts
 var import_node_fs5 = __toESM(require("node:fs"), 1);
@@ -45869,11 +45863,11 @@ ${artifact}`,
           sandbox: "read-only",
           codexExecutable,
           // model-tier-planning-and-arbiter task 2.5 (D1): the arbiter is pinned to the seat's
-          // strongest model.
-          model: seat?.models.strong
+          // default model.
+          model: seat?.model ?? seat?.models?.strong
         }
       );
-      recordCost("arbiter", "arbiter", seat?.models.strong ?? null, startedAt, result);
+      recordCost("arbiter", "arbiter", seat?.model ?? seat?.models?.strong ?? null, startedAt, result);
       return result;
     },
     async runReviser(artifact, accepted) {
@@ -46035,10 +46029,10 @@ ${artifact}`,
         sandbox: "read-only",
         codexExecutable,
         // model-tier-planning-and-arbiter task 2.5 (D1): the arbiter is pinned to the seat's
-        // strongest model.
-        model: seat?.models.strong
+        // default model.
+        model: seat?.model ?? seat?.models?.strong
       });
-      recordCost("arbiter", "arbiter", seat?.models.strong ?? null, startedAt, result);
+      recordCost("arbiter", "arbiter", seat?.model ?? seat?.models?.strong ?? null, startedAt, result);
       return result;
     },
     async runReviser(artifact, accepted) {
@@ -46166,10 +46160,10 @@ ${persona}`,
         sandbox: "read-only",
         codexExecutable,
         // model-tier-planning-and-arbiter task 2.5 (D1): the arbiter is pinned to the seat's
-        // strongest model.
-        model: seat?.models.strong
+        // default model.
+        model: seat?.model ?? seat?.models?.strong
       });
-      recordCost("arbiter", "arbiter", seat?.models.strong ?? null, startedAt, result);
+      recordCost("arbiter", "arbiter", seat?.model ?? seat?.models?.strong ?? null, startedAt, result);
       return result;
     },
     async runReviser(artifact, accepted) {
@@ -47256,10 +47250,10 @@ async function runDraftSpec(ctx, input, deps) {
     timeoutMs: draftSpecTimeoutMs(),
     sandbox: "read-only",
     codexExecutable: ctx.codexExecutable,
-    // model-tier-planning-and-arbiter task 2.4 (D1): planning is pinned to the seat's strongest
+    // model-tier-planning-and-arbiter task 2.4 (D1): planning is pinned to the seat's primary
     // model. Absent when ctx carries no seat (e.g. a hand-built test ctx) — runExec reproduces
     // today's argv byte-for-byte in that case (task 2.3).
-    model: ctx.seat?.models.strong
+    model: ctx.seat?.model ?? ctx.seat?.models?.strong
   });
   if (!exec.ok) {
     return { kind: "retry", failureReason: "provider_unavailable", error: `spec authoring failed: ${exec.error}` };
@@ -49342,7 +49336,7 @@ async function driveRun(deps, projectSlug, runId) {
     resolvedProviderId = claimed.agentSeat;
   } else {
     const seat = await mintResolvedSeat(resolveProvider(process.env, getSelectedProvider()));
-    void notifyPinRetirementIfRetired(seat, { projectSlug });
+    void notifyPinRetirementIfRetired(seat);
     resolvedProviderId = seat.id;
     await deps.client.updateExecutionRun(projectSlug, runId, { agentSeat: seat.id }).catch((err) => {
       console.warn(
@@ -51391,6 +51385,10 @@ async function compactChat(input, deps) {
     "",
     "Summary:"
   ].join("\n");
+  const targetModel = input.model ?? input.weakModel;
+  if (!targetModel) {
+    throw new Error("CompactionInput requires either 'model' or 'weakModel'");
+  }
   const exec = await runExec(
     {
       prompt,
@@ -51399,7 +51397,7 @@ async function compactChat(input, deps) {
       timeoutMs: input.timeoutMs,
       sandbox: "read-only",
       codexExecutable: input.codexExecutable,
-      model: input.weakModel
+      model: targetModel
     },
     void 0,
     input.provider
@@ -57412,6 +57410,9 @@ function describeZeroOutputLimit(signal) {
     resetAt: signal.resetAt
   };
 }
+function shouldForwardRateLimits(capabilities) {
+  return capabilities.pushesRateLimits;
+}
 var BOOTSTRAP_SEAT_REFRESH_TIMEOUT_MS = 3e3;
 function createBridgeMessageHandler(deps) {
   const tombstones = deps.tombstones ?? /* @__PURE__ */ new Map();
@@ -57715,7 +57716,7 @@ function createBridgeMessageHandler(deps) {
         const result = await deps.runCompaction({
           history,
           provider: compactionSeat.id,
-          weakModel: compactionSeat.models.weak
+          model: compactionSeat.model
         });
         const rawSeed = result.kind === "no-seed" ? result.note : result.seed;
         const seed = rawSeed.trim().length > 0 ? rawSeed : "No prior context could be carried forward.";
@@ -57920,7 +57921,7 @@ function createBridgeMessageHandler(deps) {
             }
             models = staticModels.size > 0 ? [...staticModels.values()] : null;
           }
-          const needsHandle = bootstrapCapabilities.listsModels || bootstrapCapabilities.readsRateLimits;
+          const needsHandle = bootstrapCapabilities.listsModels || bootstrapCapabilities.pullsRateLimits;
           const codexClient2 = needsHandle ? await deps.acquireCodex(bootstrapProviderId) : null;
           try {
             if (codexClient2 && bootstrapCapabilities.listsModels) try {
@@ -57949,7 +57950,7 @@ function createBridgeMessageHandler(deps) {
               bootstrapError = error51 instanceof Error ? error51.message : String(error51);
               models = fallbackModels.length > 0 ? fallbackModels : null;
             }
-            if (codexClient2 && bootstrapCapabilities.readsRateLimits) {
+            if (codexClient2 && bootstrapCapabilities.pullsRateLimits) {
               try {
                 rateLimits = await codexClient2.readRateLimits();
               } catch (error51) {
@@ -58323,7 +58324,7 @@ function createBridgeMessageHandler(deps) {
             else if (event.type === "tool_result") toolBusy.end(event.tool.id);
             forward(event);
             if (event.type === "rate_limits") {
-              if (turnProviderCapabilities.readsRateLimits) {
+              if (shouldForwardRateLimits(turnProviderCapabilities)) {
                 sendInTurn({ type: "rateLimits", directorSessionId, rateLimits: event.snapshot });
               }
               const signal = detectExhaustedProviderLimit(event.snapshot, Date.now());
@@ -59151,10 +59152,11 @@ async function startDirectorBridge() {
     runExternalAgentsCli: (args, opts) => runExternalAgentsCli(args, { ...opts, envCliPath: process.env["EXTERNAL_AGENTS_CLI"] }),
     // Compaction runner for `compact-request` (agent-seat-surfaces task 2.5). Closes over `config`
     // (in scope here, unlike inside the handler) for cwd/executable, and the module-level budget +
-    // timeout constants. The handler supplies only the resolved seat's provider + weak model.
+    // timeout constants. The handler supplies only the resolved seat's provider + default model.
     runCompaction: (args) => compactChat({
       history: args.history,
       provider: args.provider,
+      model: args.model ?? args.weakModel,
       weakModel: args.weakModel,
       budgetBytes: DEFAULT_COMPACTION_SEED_BUDGET_BYTES,
       cwd: config2.codexCwd ?? process.cwd(),
@@ -67303,9 +67305,9 @@ async function runIntentCheck(ctx, input) {
     timeoutMs: intentCheckTimeoutMs(),
     sandbox: "read-only",
     codexExecutable: ctx.codexExecutable,
-    // model-tier-planning-and-arbiter task 2.6 (D1): the judge is pinned to the seat's strongest
+    // model-tier-planning-and-arbiter task 2.6 (D1): the judge is pinned to the seat's primary
     // model.
-    model: ctx.seat?.models.strong
+    model: ctx.seat?.model ?? ctx.seat?.models?.strong
   });
   if (!exec.ok) {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrrlin-dev/mcp",
-  "version": "0.4.67",
+  "version": "0.4.71",
   "type": "module",
   "bin": {
     "mrrlin-mcp": "dist/bin.cjs"