@north-light/crouter 0.3.341 → 0.3.343

package/dist/builtin-pi-packages/pi-crtr-extensions/extensions/provider-rotation.js

@@ -435,7 +435,7 @@ async function streamProviderAttempt(state, providerId, model, context, options,
             },
         };
         const provider = state.runtimeContext?.modelRegistry.getProvider?.(model.provider);
-        const inner = credential
+        const inner = isManagedProvider(providerId)
             ? streamForProvider(model, context, streamOptions)
             : state.delegatedProviderStreams.get(providerId)?.(model, context, streamOptions)
                 ?? provider?.streamSimple(model, context, streamOptions)
@@ -598,7 +598,14 @@ async function runManagedProvider(state, model, context, options, stream) {
     const isLiveRoute = (candidate) => candidate.providerId === model.provider && candidate.model.id === model.id && candidate.thinkingLevel === liveThinking;
     // A cooling or unauthenticated managed route contributes its diagnostic and may
     // later re-enter when a credential becomes ready, but it is never selected now.
-    const candidates = routeCandidates.filter((candidate) => isLiveRoute(candidate) || !isManagedProvider(candidate.providerId) || readSubscriptionPool(candidate.providerId).some((entry) => entry.authFailure === undefined && (entry.rateLimitedUntil || 0) <= Date.now()));
+    const candidates = routeCandidates.filter((candidate) => {
+        if (isLiveRoute(candidate) || !isManagedProvider(candidate.providerId))
+            return true;
+        const pool = readSubscriptionPool(candidate.providerId);
+        return pool.length === 0
+            ? state.runtimeContext.modelRegistry.hasConfiguredAuth(candidate.model)
+            : pool.some((entry) => entry.authFailure === undefined && (entry.rateLimitedUntil || 0) <= Date.now());
+    });
     if (!candidates.some(isLiveRoute)) {
         candidates.unshift({ routeId: `live:${model.provider}/${model.id}`, credentialSource: 'live', rank: liveRank, providerId: model.provider, model, thinkingLevel: liveThinking });
     }
@@ -625,8 +632,25 @@ async function runManagedProvider(state, model, context, options, stream) {
             emitTerminalError(stream, candidateModel, `Provider route ${routeId} is unavailable: failed to select ${providerId}/${candidateModel.id}`);
             return;
         }
-        if (!isManagedProvider(providerId)) {
-            const result = await streamProviderAttempt(state, providerId, candidateModel, context, options, undefined, stream);
+        const rawPool = isManagedProvider(providerId) ? readSubscriptionPool(providerId) : [];
+        if (!isManagedProvider(providerId) || rawPool.length === 0) {
+            const liveKey = isLiveRoute(candidate) ? options?.apiKey : undefined;
+            if (isManagedProvider(providerId) && !liveKey && !state.runtimeContext.modelRegistry.hasConfiguredAuth(candidateModel))
+                continue;
+            const auth = isManagedProvider(providerId) && !liveKey
+                ? await state.runtimeContext.modelRegistry.getApiKeyAndHeaders(candidateModel)
+                : undefined;
+            if (isManagedProvider(providerId) && !liveKey && (!auth?.ok || !auth.apiKey))
+                continue;
+            const headers = { ...options?.headers };
+            for (const [name, value] of Object.entries(auth?.ok ? auth.headers ?? {} : {})) {
+                for (const existing of Object.keys(headers))
+                    if (existing.toLowerCase() === name.toLowerCase())
+                        delete headers[existing];
+                headers[name] = value;
+            }
+            const attemptOptions = auth?.ok ? { ...options, apiKey: auth.apiKey, headers } : options;
+            const result = await streamProviderAttempt(state, providerId, candidateModel, context, attemptOptions, undefined, stream);
             if (result.result === 'success' || result.result === 'fatal') {
                 state.transportOnlyExhaustedPasses = 0;
                 stream.end();
@@ -641,7 +665,6 @@ async function runManagedProvider(state, model, context, options, stream) {
             logRouteQueueAdvance(candidate, candidates[0], result);
             continue;
         }
-        const rawPool = readSubscriptionPool(providerId);
         for (const entry of rawPool)
             if (entry.authFailure === 'invalid_grant')
                 authFailures.add(`${providerId}/${entry.label}`);

package/dist/builtin-pi-packages/pi-crtr-extensions/extensions/provider-rotation.ts

@@ -600,7 +600,7 @@ async function streamProviderAttempt(
       },
     };
     const provider = state.runtimeContext?.modelRegistry.getProvider?.(model.provider);
-    const inner = credential
+    const inner = isManagedProvider(providerId)
       ? streamForProvider(model, context, streamOptions)
       : state.delegatedProviderStreams.get(providerId)?.(model, context, streamOptions)
         ?? provider?.streamSimple(model, context, streamOptions)
@@ -802,7 +802,13 @@ async function runManagedProvider(
     candidate.providerId === model.provider && candidate.model.id === model.id && candidate.thinkingLevel === liveThinking;
   // A cooling or unauthenticated managed route contributes its diagnostic and may
   // later re-enter when a credential becomes ready, but it is never selected now.
-  const candidates = routeCandidates.filter((candidate) => isLiveRoute(candidate) || !isManagedProvider(candidate.providerId) || readSubscriptionPool(candidate.providerId).some((entry) => entry.authFailure === undefined && (entry.rateLimitedUntil || 0) <= Date.now()));
+  const candidates = routeCandidates.filter((candidate) => {
+    if (isLiveRoute(candidate) || !isManagedProvider(candidate.providerId)) return true;
+    const pool = readSubscriptionPool(candidate.providerId);
+    return pool.length === 0
+      ? state.runtimeContext!.modelRegistry.hasConfiguredAuth(candidate.model)
+      : pool.some((entry) => entry.authFailure === undefined && (entry.rateLimitedUntil || 0) <= Date.now());
+  });
   if (!candidates.some(isLiveRoute)) {
     candidates.unshift({ routeId: `live:${model.provider}/${model.id}`, credentialSource: 'live', rank: liveRank, providerId: model.provider, model, thinkingLevel: liveThinking });
   }
@@ -833,8 +839,21 @@ async function runManagedProvider(
       return;
     }
 
-    if (!isManagedProvider(providerId)) {
-      const result = await streamProviderAttempt(state, providerId, candidateModel, context, options, undefined, stream);
+    const rawPool = isManagedProvider(providerId) ? readSubscriptionPool(providerId) : [];
+    if (!isManagedProvider(providerId) || rawPool.length === 0) {
+      const liveKey = isLiveRoute(candidate) ? options?.apiKey : undefined;
+      if (isManagedProvider(providerId) && !liveKey && !state.runtimeContext!.modelRegistry.hasConfiguredAuth(candidateModel)) continue;
+      const auth = isManagedProvider(providerId) && !liveKey
+        ? await state.runtimeContext!.modelRegistry.getApiKeyAndHeaders(candidateModel)
+        : undefined;
+      if (isManagedProvider(providerId) && !liveKey && (!auth?.ok || !auth.apiKey)) continue;
+      const headers = { ...options?.headers };
+      for (const [name, value] of Object.entries(auth?.ok ? auth.headers ?? {} : {})) {
+        for (const existing of Object.keys(headers)) if (existing.toLowerCase() === name.toLowerCase()) delete headers[existing];
+        headers[name] = value;
+      }
+      const attemptOptions = auth?.ok ? { ...options, apiKey: auth.apiKey, headers } : options;
+      const result = await streamProviderAttempt(state, providerId, candidateModel, context, attemptOptions, undefined, stream);
       if (result.result === 'success' || result.result === 'fatal') { state.transportOnlyExhaustedPasses = 0; stream.end(); return; }
       if (result.result === 'rate_limited' || result.classification?.status !== undefined || result.classification?.hadRetryAfterHeader === true) sawHttpEvidence = true;
       const cooldownMs = result.result === 'rate_limited' ? result.retryAfterMs ?? DEFAULT_RATE_LIMIT_BACKOFF_MS : TRANSIENT_ROTATE_COOLDOWN_MS;
@@ -843,8 +862,6 @@ async function runManagedProvider(
       logRouteQueueAdvance(candidate, candidates[0], result);
       continue;
     }
-
-    const rawPool = readSubscriptionPool(providerId);
     for (const entry of rawPool) if (entry.authFailure === 'invalid_grant') authFailures.add(`${providerId}/${entry.label}`);
     const available = rawPool.filter((entry) => entry.authFailure === undefined && (!entry.rateLimitedUntil || entry.rateLimitedUntil <= Date.now()));
     const seenLabels = seenReadyLabels.get(routeId) ?? new Set<string>();