@mrrlin-dev/mcp 0.4.45 → 0.4.47

package/dist/bin.cjs

@@ -40132,8 +40132,21 @@ var ClaudeAgentHandle = class {
 };
 
 // ../../packages/agent-client/dist/registry.js
+var KNOWN_PROVIDERS = { codex: true, claude: true };
+var KNOWN_PROVIDER_IDS = Object.keys(KNOWN_PROVIDERS);
+function readProviderFromEnv(env) {
+  const raw = env.MRRLIN_AGENT_PROVIDER;
+  if (raw === void 0)
+    return null;
+  const normalized = raw.trim().toLowerCase();
+  if (!normalized)
+    return null;
+  if (Object.hasOwn(KNOWN_PROVIDERS, normalized))
+    return normalized;
+  throw new Error(`MRRLIN_AGENT_PROVIDER is set to ${JSON.stringify(raw.slice(0, 64))}, which is not an agent provider this build can run. Valid values: ${KNOWN_PROVIDER_IDS.join(", ")}. Unset the variable to use the operator's persisted choice.`);
+}
 function resolveProvider(env, persisted) {
-  const id = env.MRRLIN_AGENT_PROVIDER ?? persisted ?? "codex";
+  const id = readProviderFromEnv(env) ?? persisted ?? "codex";
   if (id === "codex") {
     return new CodexProviderAdapter();
   }
@@ -42295,7 +42308,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.45";
+var PKG_VERSION = "0.4.47";
 
 // src/api-base-url-migrate.ts
 var import_node_fs3 = __toESM(require("node:fs"), 1);
@@ -55918,6 +55931,7 @@ function describeZeroOutputLimit(signal) {
     resetAt: signal.resetAt
   };
 }
+var BOOTSTRAP_SEAT_REFRESH_TIMEOUT_MS = 3e3;
 function createBridgeMessageHandler(deps) {
   const tombstones = deps.tombstones ?? /* @__PURE__ */ new Map();
   const pendingTurnSessions = deps.pendingTurnSessions ?? /* @__PURE__ */ new Set();
@@ -56390,6 +56404,14 @@ function createBridgeMessageHandler(deps) {
         let bootstrapError;
         const fallbackModels = readCodexFallbackModels();
         try {
+          if (deps.refreshSelectedProvider) {
+            await withTimeout2(
+              deps.refreshSelectedProvider(),
+              deps.seatRefreshTimeoutMs ?? BOOTSTRAP_SEAT_REFRESH_TIMEOUT_MS,
+              "seat refresh timed out"
+            ).catch(() => {
+            });
+          }
           const bootstrapProviderId = resolveProvider(process.env, getSelectedProvider()).id;
           const codexClient2 = await deps.acquireCodex(bootstrapProviderId);
           try {
@@ -57084,20 +57106,18 @@ function checkTelemetryDefaultProject(env, warn) {
 }
 function createSelectedProviderRefresher(deps) {
   let lastError = null;
-  return () => {
-    deps.read().then((config2) => {
-      lastError = null;
-      deps.apply(config2.agentProvider);
-    }).catch((error51) => {
-      const message = error51 instanceof Error ? error51.message : String(error51);
-      if (message !== lastError) {
-        lastError = message;
-        deps.warn(
-          `[mrrlin-mcp director-bridge] agent-provider refresh failed; keeping the held seat: ${message}`
-        );
-      }
-    });
-  };
+  return () => deps.read().then((config2) => {
+    lastError = null;
+    deps.apply(config2.agentProvider);
+  }).catch((error51) => {
+    const message = error51 instanceof Error ? error51.message : String(error51);
+    if (message !== lastError) {
+      lastError = message;
+      deps.warn(
+        `[mrrlin-mcp director-bridge] agent-provider refresh failed; keeping the held seat: ${message}`
+      );
+    }
+  });
 }
 async function startDirectorBridge() {
   const config2 = parseConfig();
@@ -57545,10 +57565,20 @@ async function startDirectorBridge() {
     });
     return block.text;
   };
+  let refreshSelectedProvider = null;
+  if (tokenProvider) {
+    refreshSelectedProvider = createSelectedProviderRefresher({
+      read: () => client.getAgentProviderConfig(),
+      apply: setSelectedProvider,
+      warn: (m) => process.stderr.write(`${m}
+`)
+    });
+  }
   const sharedHandlerDeps = {
     acquireCodex: (providerId) => agentKeepalive.acquire(providerId),
     releaseCodex: (providerId) => agentKeepalive.release(providerId),
     refreshCodex: () => agentKeepalive.refreshNow(resolveProvider(process.env, getSelectedProvider()).id),
+    ...refreshSelectedProvider ? { refreshSelectedProvider } : {},
     run: wrappedTurnLock.run,
     suspendedMs: () => suspensionDetector.suspendedMs(),
     buildStartParams: (msg, desiredModel) => buildThreadStartParams(msg, config2, desiredModel),
@@ -57875,15 +57905,10 @@ async function startDirectorBridge() {
     );
   }
   let selectedProviderTimer = null;
-  if (tokenProvider) {
-    const refreshSelectedProvider = createSelectedProviderRefresher({
-      read: () => client.getAgentProviderConfig(),
-      apply: setSelectedProvider,
-      warn: (m) => process.stderr.write(`${m}
-`)
-    });
-    refreshSelectedProvider();
-    selectedProviderTimer = setInterval(refreshSelectedProvider, 6e4);
+  if (refreshSelectedProvider) {
+    const refresh = refreshSelectedProvider;
+    void refresh();
+    selectedProviderTimer = setInterval(() => void refresh(), 6e4);
     selectedProviderTimer.unref?.();
   }
   let agentPoolLoopHandle = null;
@@ -62045,11 +62070,24 @@ async function runShadowPanel(input, deps) {
         const res = await built.runner.runHead(persona, input.artifact, "");
         if (res.ok) {
           const parsed = parseVerdict(res.text);
-          return { persona, agent, verdict: parsed.verdict, ok: true };
+          return {
+            persona,
+            agent,
+            verdict: parsed.verdict,
+            ok: true,
+            // The optional chain is required by the TYPE, not left over from not knowing the
+            // invariant: `MultiHeadRunResult.usage` is declared `usage?: ExecTokenUsage | null`
+            // (optional so the shape stays assignable to the gate's older `RunResult`), even though
+            // `parseDispatch` always sets it. `?? null` therefore covers both "no usage key" and
+            // "usage was null" — and covers neither zero: a reported 0 is a measurement and
+            // survives, which is the distinction this whole field exists to preserve.
+            inputTokens: res.usage?.inputTokens ?? null,
+            outputTokens: res.usage?.outputTokens ?? null
+          };
         }
       } catch {
       }
-      return { persona, agent, verdict: "ERROR", ok: false };
+      return { persona, agent, verdict: "ERROR", ok: false, inputTokens: null, outputTokens: null };
     })
   );
   for (const h of perHead) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrrlin-dev/mcp",
-  "version": "0.4.45",
+  "version": "0.4.47",
   "type": "module",
   "bin": {
     "mrrlin-mcp": "dist/bin.cjs"
@@ -21,12 +21,12 @@
     "@types/ws": "^8.18.1",
     "esbuild": "^0.24.0",
     "tsx": "^4.22.3",
-    "@mrrlin/agent-client": "0.0.0",
-    "@mrrlin/tsconfig": "0.0.0",
-    "@mrrlin/wiki": "0.0.0",
     "@mrrlin/client": "0.0.0",
+    "@mrrlin/agent-client": "0.0.0",
     "@mrrlin/director-e2e": "0.0.0",
-    "@mrrlin/schemas": "0.0.0"
+    "@mrrlin/schemas": "0.0.0",
+    "@mrrlin/tsconfig": "0.0.0",
+    "@mrrlin/wiki": "0.0.0"
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",