@remnic/server 9.54.5 → 9.54.7

package/dist/index.js

@@ -3,7 +3,7 @@
 // src/index.ts
 import fs from "fs";
 import path from "path";
-import { parseConfig, isOpenaiApiKeyDisabled, resolveRemnicConfigRecord, Orchestrator, EngramAccessService, EngramAccessHttpServer, initLogger, log as log3, getAllValidTokens, getAllValidTokenEntriesCached, loadTokenStore, expandTildePath } from "@remnic/core";
+import { parseConfig, isOpenaiApiKeyDisabled, resolveRemnicConfigRecord, Orchestrator, EngramAccessHttpServer, initLogger, log as log3, getAllValidTokens, getAllValidTokenEntriesCached, loadTokenStore, expandTildePath } from "@remnic/core";
 import { probeBetterSqlite3Driver } from "@remnic/core/runtime/better-sqlite";
 
 // src/oauth.ts
@@ -879,6 +879,23 @@ async function completeStartupReadiness(options) {
   }
 }
 
+// src/support-passport-runtime.ts
+import {
+  EngramAccessService,
+  SupportPassportModelBridge,
+  composeSupportPassportExternalRequestHandlers
+} from "@remnic/core";
+function createSupportPassportServerRuntime(orchestrator, config, fallbackHandler) {
+  const bridge = config.supportPassport.enabled ? new SupportPassportModelBridge() : null;
+  return {
+    service: new EngramAccessService(orchestrator, {
+      supportPassportGatewayRoute: bridge?.route
+    }),
+    externalRequestHandler: composeSupportPassportExternalRequestHandlers(bridge?.requestHandler, fallbackHandler),
+    close: () => bridge?.close()
+  };
+}
+
 // src/index.ts
 function parseServerPort(value, source) {
   const port = typeof value === "string" ? Number(value.trim()) : value;
@@ -1458,7 +1475,6 @@ async function startServer(options) {
   log3.debug(`debug logging enabled from config (${resolvedConfigPath.source})`);
   const orchestrator = new Orchestrator(config);
   await orchestrator.initialize();
-  const service = new EngramAccessService(orchestrator);
   const readiness = { ready: false, warmupAttempts: 0, lastError: null, degraded: false };
   const authToken = parsedServerConfig.authToken ?? readCompatEnv("REMNIC_AUTH_TOKEN", "ENGRAM_AUTH_TOKEN") ?? "";
   if (!authToken && getAllValidTokens().length === 0) {
@@ -1466,6 +1482,7 @@ async function startServer(options) {
   }
   const oauthConfig = applyOAuthEnvOverrides(serverConfig.oauth);
   const oauthRequestHandler = buildOAuthRequestHandler(oauthConfig);
+  const supportPassportRuntime = createSupportPassportServerRuntime(orchestrator, config, oauthRequestHandler), { service } = supportPassportRuntime;
   const httpServer = new EngramAccessHttpServer({
     service,
     host: parsedServerConfig.host,
@@ -1490,8 +1507,8 @@ async function startServer(options) {
     citationsEnabled: config.citationsEnabled,
     citationsAutoDetect: config.citationsAutoDetect,
     emitLegacyTools: config.emitLegacyTools,
+    externalRequestHandler: supportPassportRuntime.externalRequestHandler,
     ...oauthConfig.enabled ? {
-      externalRequestHandler: oauthRequestHandler,
       resourceMetadataUrl: new URL(
         "/.well-known/oauth-protected-resource/mcp",
         oauthConfig.issuerUrl
@@ -1556,6 +1573,7 @@ async function startServer(options) {
     stopPromise = (async () => {
       startupSyncAbort.abort();
       readinessAbort.abort();
+      supportPassportRuntime.close();
       orchestrator.abortDeferredInit();
       try {
         await originalStop();